From e603cf70f6150cdf3ce7aa80756be79e5f3c90f2 Mon Sep 17 00:00:00 2001 From: Liam Goodacre Date: Sat, 14 Apr 2018 22:32:33 +0100 Subject: [PATCH 1/2] Bump deps for compiler/0.12 & rename module --- bower.json | 6 +++--- package.json | 8 ++++---- src/{Control/Monad/Eff => Effect}/Random.js | 0 src/{Control/Monad/Eff => Effect}/Random.purs | 16 ++++++---------- 4 files changed, 13 insertions(+), 17 deletions(-) rename src/{Control/Monad/Eff => Effect}/Random.js (100%) rename src/{Control/Monad/Eff => Effect}/Random.purs (69%) diff --git a/bower.json b/bower.json index 611d7cc..697feb9 100644 --- a/bower.json +++ b/bower.json @@ -17,8 +17,8 @@ "package.json" ], "dependencies": { - "purescript-eff": "^3.0.0", - "purescript-integers": "^3.0.0", - "purescript-math": "^2.0.0" + "purescript-effect": "purescript/purescript-effect#compiler/0.12", + "purescript-integers": "purescript/purescript-integers#compiler/0.12", + "purescript-math": "purescript/purescript-math#compiler/0.12" } } diff --git a/package.json b/package.json index 26d81a7..15f821c 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "build": "eslint src && pulp build -- --censor-lib --strict" }, "devDependencies": { - "eslint": "^3.17.1", - "pulp": "^10.0.4", - "purescript-psa": "^0.5.0-rc.1", - "rimraf": "^2.6.1" + "eslint": "^4.19.1", + "pulp": "^12.0.1", + "purescript-psa": "^0.6.0", + "rimraf": "^2.6.2" } } diff --git a/src/Control/Monad/Eff/Random.js b/src/Effect/Random.js similarity index 100% rename from src/Control/Monad/Eff/Random.js rename to src/Effect/Random.js diff --git a/src/Control/Monad/Eff/Random.purs b/src/Effect/Random.purs similarity index 69% rename from src/Control/Monad/Eff/Random.purs rename to src/Effect/Random.purs index 44ef938..aecee7d 100644 --- a/src/Control/Monad/Eff/Random.purs +++ b/src/Effect/Random.purs @@ -1,18 +1,14 @@ -module Control.Monad.Eff.Random where +module Effect.Random where import Prelude -import Control.Monad.Eff (Eff, kind Effect) +import Effect (Effect) import Data.Int (toNumber, floor) --- | The `RANDOM` effect indicates that an Eff action may access or modify the --- | JavaScript global random number generator, i.e. `Math.random()`. -foreign import data RANDOM :: Effect - -- | Returns a random number between 0 (inclusive) and 1 (exclusive). This is -- | a direct wrapper around JavaScript's `Math.random()`. -foreign import random :: forall e. Eff (random :: RANDOM | e) Number +foreign import random :: Effect Number -- | Takes a range specified by `low` (the first argument) and `high` (the -- | second), and returns a random integer uniformly distributed in the closed @@ -24,7 +20,7 @@ foreign import random :: forall e. Eff (random :: RANDOM | e) Number -- | randomInt 1 10 >>= Console.print -- | ``` -- | will print a random integer between 1 and 10. -randomInt :: forall e. Int -> Int -> Eff (random :: RANDOM | e) Int +randomInt :: Int -> Int -> Effect Int randomInt low high = do n <- random let asNumber = (toNumber high - toNumber low + one) * n + toNumber low @@ -38,12 +34,12 @@ randomInt low high = do -- | randomRange 1.0 2.0 >>= Console.print -- | ``` -- | will print a random number between 1 and 2. -randomRange :: forall e. Number -> Number -> Eff (random :: RANDOM | e) Number +randomRange :: Number -> Number -> Effect Number randomRange min max = do n <- random pure (n * (max - min) + min) -- | Returns a random boolean value with an equal chance of being `true` or -- | `false`. -randomBool :: forall e. Eff (random :: RANDOM | e) Boolean +randomBool :: Effect Boolean randomBool = (_ < 0.5) <$> random From c10e2bca7b58430c5bafc06f153e6f193b45f4b9 Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Wed, 23 May 2018 01:17:21 +0100 Subject: [PATCH 2/2] Update dependencies, license --- .gitignore | 1 + LICENSE | 38 ++++++++++++++++++++++---------------- bower.json | 9 ++++----- package.json | 2 +- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 7050558..332b6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /bower_components/ /node_modules/ /output/ +package-lock.json diff --git a/LICENSE b/LICENSE index 58b0299..311379c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,26 @@ -The MIT License (MIT) +Copyright 2018 PureScript -Copyright (c) 2014 PureScript +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/bower.json b/bower.json index 697feb9..6add5ad 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,7 @@ { "name": "purescript-random", "homepage": "https://github.com/purescript/purescript-random", - "description": "Random value generation", - "license": "MIT", + "license": "BSD-3-Clause", "repository": { "type": "git", "url": "git://github.com/purescript/purescript-random.git" @@ -17,8 +16,8 @@ "package.json" ], "dependencies": { - "purescript-effect": "purescript/purescript-effect#compiler/0.12", - "purescript-integers": "purescript/purescript-integers#compiler/0.12", - "purescript-math": "purescript/purescript-math#compiler/0.12" + "purescript-effect": "^2.0.0", + "purescript-integers": "^4.0.0", + "purescript-math": "^2.1.1" } } diff --git a/package.json b/package.json index 15f821c..02e36ea 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "devDependencies": { "eslint": "^4.19.1", - "pulp": "^12.0.1", + "pulp": "^12.2.0", "purescript-psa": "^0.6.0", "rimraf": "^2.6.2" }