From 0a756105b1bc748fd43c0b851ef1d3dc52d0331f Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Sat, 22 Nov 2014 14:42:28 +0000 Subject: [PATCH 1/4] Update travis to always use the latest release --- .travis.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdcc170..a9061e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,14 @@ language: node_js node_js: - - "0.10" + - 0.10 env: - - PATH=$HOME/bin:$PATH purescript_datadir=$HOME/.local/share/purescript -before_install: - - mkdir -p $HOME/bin - - mkdir -p $HOME/.local/share/purescript/prelude + - PATH=$HOME/purescript:$PATH install: - - wget -O $HOME/bin/psc https://github.com/purescript/purescript/releases/download/0.5.6.2/psc - - wget -O $HOME/bin/psci https://github.com/purescript/purescript/releases/download/0.5.6.2/psci - - wget -O $HOME/bin/psc-make https://github.com/purescript/purescript/releases/download/0.5.6.2/psc-make - - wget -O $HOME/bin/docgen https://github.com/purescript/purescript/releases/download/0.5.6.2/docgen - - wget -O $HOME/bin/hierarchy https://github.com/purescript/purescript/releases/download/0.5.6.2/hierarchy - - wget -O $purescript_datadir/prelude/prelude.purs https://github.com/purescript/purescript/releases/download/0.5.6.2/prelude.purs - - chmod a+x $HOME/bin/psc - - chmod a+x $HOME/bin/psci - - chmod a+x $HOME/bin/psc-make - - chmod a+x $HOME/bin/docgen - - chmod a+x $HOME/bin/hierarchy - - "npm install bower gulp -g" - - "npm install && bower install" + - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p') + - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz + - tar -xvf $HOME/purescript.tar.gz -C $HOME/ + - chmod a+x $HOME/purescript + - npm install bower gulp -g + - npm install && bower install script: - - "gulp" + - gulp From 27afd05306ce60c37c33074cbb9369bea478d649 Mon Sep 17 00:00:00 2001 From: joneshf Date: Sat, 22 Nov 2014 10:07:25 -0800 Subject: [PATCH 2/4] Install to `/usr/local/bin`. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9061e2..1539906 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,11 @@ language: node_js node_js: - 0.10 env: - - PATH=$HOME/purescript:$PATH + - TAG=v0.6.1.1 install: - - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p') - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz - - tar -xvf $HOME/purescript.tar.gz -C $HOME/ - - chmod a+x $HOME/purescript + - tar zxvf $HOME/purescript.tar.gz -C /usr/local/bin purescript/psc{,i,-docs,-make} --strip-components=1 + - chmod a+x /usr/local/bin/psc{,i,-docs,-make} - npm install bower gulp -g - npm install && bower install script: From c4eefc4d0d965c8527380266bc03e41167a9be34 Mon Sep 17 00:00:00 2001 From: Hardy Jones Date: Sat, 22 Nov 2014 12:15:13 -0800 Subject: [PATCH 3/4] Use sudo for `/usr/local` stuff. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1539906..3275b8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ env: - TAG=v0.6.1.1 install: - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz - - tar zxvf $HOME/purescript.tar.gz -C /usr/local/bin purescript/psc{,i,-docs,-make} --strip-components=1 - - chmod a+x /usr/local/bin/psc{,i,-docs,-make} + - sudo tar zxvf $HOME/purescript.tar.gz -C /usr/local/bin purescript/psc{,i,-docs,-make} --strip-components=1 + - sudo chmod a+x /usr/local/bin/psc{,i,-docs,-make} - npm install bower gulp -g - npm install && bower install script: From cb1c3ce1486df18d015c65db8947b4a8784d761c Mon Sep 17 00:00:00 2001 From: joneshf Date: Sat, 22 Nov 2014 13:25:10 -0800 Subject: [PATCH 4/4] Update `gulp-purescript`. --- gulpfile.js | 8 ++++---- package.json | 2 +- src/Data/Argonaut/README.md | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index bff4062..f13ce2f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -46,13 +46,13 @@ function compile (compiler, src, opts) { function docs (target) { return function() { - var docgen = purescript.docgen(); - docgen.on('error', function(e) { + var pscDocs = purescript.pscDocs(); + pscDocs.on('error', function(e) { console.error(e.message); - docgen.end(); + pscDocs.end(); }); return gulp.src(paths.docs[target].src) - .pipe(docgen) + .pipe(pscDocs) .pipe(gulp.dest(paths.docs[target].dest)); } } diff --git a/package.json b/package.json index b7319a3..6aa701a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "MIT", "devDependencies": { "gulp": "^3.8.6", - "gulp-purescript": "0.0.9", + "gulp-purescript": "^0.1.2", "gulp-run": "^1.6.4", "run-sequence": "^0.3.6" } diff --git a/src/Data/Argonaut/README.md b/src/Data/Argonaut/README.md index 921eaf9..6f9cc2a 100755 --- a/src/Data/Argonaut/README.md +++ b/src/Data/Argonaut/README.md @@ -17,19 +17,19 @@ ### Types - type JArray = [Json] + type JArray = [Json] - type JAssoc = Tuple String Json + type JAssoc = Tuple String Json - type JBoolean = Boolean + type JBoolean = Boolean data JNull :: * - type JNumber = Number + type JNumber = Number - type JObject = M.StrMap Json + type JObject = M.StrMap Json - type JString = String + type JString = String data Json :: *