From f2a19c4032f41534d1a4c7c0ef3bb06680e63dcf Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Thu, 24 Mar 2016 20:54:21 +0000 Subject: [PATCH] Fixes for new prelude & update build --- .jscsrc | 5 +++++ .jshintrc | 5 +++-- .travis.yml | 16 +++++++++++++--- README.md | 4 ++-- bower.json | 9 +++------ package.json | 12 ++++++------ src/Control/Monad/Eff/Random.purs | 9 +++++---- 7 files changed, 37 insertions(+), 23 deletions(-) diff --git a/.jscsrc b/.jscsrc index 342da66..2561ce9 100644 --- a/.jscsrc +++ b/.jscsrc @@ -1,5 +1,10 @@ { "preset": "grunt", + "disallowSpacesInFunctionExpression": null, + "requireSpacesInFunctionExpression": { + "beforeOpeningRoundBrace": true, + "beforeOpeningCurlyBrace": true + }, "disallowSpacesInAnonymousFunctionExpression": null, "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, diff --git a/.jshintrc b/.jshintrc index f391159..620d8d7 100644 --- a/.jshintrc +++ b/.jshintrc @@ -5,7 +5,7 @@ "freeze": true, "funcscope": true, "futurehostile": true, - "globalstrict": true, + "strict": "global", "latedef": true, "maxparams": 1, "noarg": true, @@ -15,5 +15,6 @@ "singleGroups": true, "undef": true, "unused": true, - "eqnull": true + "eqnull": true, + "predef": ["exports"] } diff --git a/.travis.yml b/.travis.yml index 791313a..36183ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js -sudo: false -node_js: - - 0.10 +sudo: required +dist: trusty +node_js: 5 env: - PATH=$HOME/purescript:$PATH install: @@ -9,6 +9,16 @@ install: - 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 -g bower - npm install + - bower install script: - npm run build +after_success: +- >- + test $TRAVIS_TAG && + psc-publish > .pursuit.json && + curl -X POST http://pursuit.purescript.org/packages \ + -d @.pursuit.json \ + -H 'Accept: application/json' \ + -H "Authorization: token ${GITHUB_TOKEN}" diff --git a/README.md b/README.md index 52726e9..75cd497 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,6 @@ Random value generation. bower install purescript-random ``` -## Module documentation +## Documentation -- [Control.Monad.Eff.Random](docs/Control/Monad/Eff/Random.md) +Module documentation is [published on Pursuit](http://pursuit.purescript.org/packages/purescript-random). diff --git a/bower.json b/bower.json index 493343c..e61d791 100644 --- a/bower.json +++ b/bower.json @@ -2,9 +2,6 @@ "name": "purescript-random", "homepage": "https://github.com/purescript/purescript-random", "description": "Random value generation", - "keywords": [ - "purescript" - ], "license": "MIT", "repository": { "type": "git", @@ -20,8 +17,8 @@ "package.json" ], "dependencies": { - "purescript-eff": "^0.1.0", - "purescript-integers": "^0.2.1", - "purescript-math": "^0.2.0" + "purescript-eff": "^1.0.0-rc.1", + "purescript-integers": "^1.0.0-rc.1", + "purescript-math": "^1.0.0-rc.1" } } diff --git a/package.json b/package.json index e129c49..af45679 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "private": true, "scripts": { - "postinstall": "pulp dep install", - "build": "jshint src && jscs src && pulp build && rimraf docs && pulp docs" + "clean": "rimraf output && rimraf .pulp-cache", + "build": "jshint src && jscs src && pulp build" }, "devDependencies": { - "jscs": "^1.13.1", - "jshint": "^2.8.0", - "pulp": "^4.0.2", - "rimraf": "^2.4.1" + "jscs": "^2.8.0", + "jshint": "^2.9.1", + "pulp": "^8.1.0", + "rimraf": "^2.5.0" } } diff --git a/src/Control/Monad/Eff/Random.purs b/src/Control/Monad/Eff/Random.purs index 8d4a791..b24ad9a 100644 --- a/src/Control/Monad/Eff/Random.purs +++ b/src/Control/Monad/Eff/Random.purs @@ -1,8 +1,9 @@ module Control.Monad.Eff.Random where -import Prelude ((<), (<$>), (-), (+), (*), return, bind, ($), one) +import Prelude + +import Control.Monad.Eff (Eff) -import Control.Monad.Eff (Eff()) import Data.Int (toNumber, floor) -- | The `RANDOM` effect indicates that an Eff action may access or modify the @@ -27,7 +28,7 @@ randomInt :: forall e. Int -> Int -> Eff (random :: RANDOM | e) Int randomInt low high = do n <- random let asNumber = (toNumber high - toNumber low + one) * n + toNumber low - return $ floor asNumber + pure $ floor asNumber -- | Returns a random number between a minimum value (inclusive) and a maximum -- | value (exclusive). It is unspecified what happens if `maximum < minimum`. @@ -40,7 +41,7 @@ randomInt low high = do randomRange :: forall e. Number -> Number -> Eff (random :: RANDOM | e) Number randomRange min max = do n <- random - return (n * (max - min) + min) + pure (n * (max - min) + min) -- | Returns a random boolean value with an equal chance of being `true` or -- | `false`.