Merge pull request #4 from purescript-node/1.0-updates

Updates for 1.0, fix some warnings in the test suite

Author: paf31

bower.json

@@ -7,17 +7,17 @@
     "url": "git://github.com/purescript-node/purescript-node-child-process"
   },
   "dependencies": {
-    "purescript-exceptions": "~0.3.4",
-    "purescript-foreign": "~0.7.2",
-    "purescript-functions": "~0.1.0",
-    "purescript-maps": "~0.5.3",
-    "purescript-node-fs": "~0.11.0",
-    "purescript-node-streams": "~0.4.0",
-    "purescript-nullable": "~0.2.1",
-    "purescript-posix-types": "~0.1.1",
-    "purescript-unsafe-coerce": "~0.1.0"
+    "purescript-exceptions": "^1.0.0",
+    "purescript-foreign": "^1.0.0",
+    "purescript-functions": "^1.0.0",
+    "purescript-maps": "^1.0.0",
+    "purescript-node-fs": "^1.0.0",
+    "purescript-node-streams": "^1.0.0",
+    "purescript-nullable": "^1.0.0",
+    "purescript-posix-types": "^1.0.0",
+    "purescript-unsafe-coerce": "^1.0.0"
   },
   "devDependencies": {
-    "purescript-console": "~0.1.1"
+    "purescript-console": "^1.0.0"
   }
 }

src/Node/ChildProcess.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// module Node.ChildProcess
 /* eslint-env node*/
 
 exports.unsafeFromNullable = function unsafeFromNullable(msg){

src/Node/ChildProcess.purs

@@ -52,20 +52,18 @@ import Control.Bind ((>=>))
 import Control.Monad.Eff (Eff())
 import Control.Monad.Eff.Exception as Exception
 import Control.Monad.Eff.Exception.Unsafe (unsafeThrow)
-
-import Data.StrMap (StrMap())
-import Data.Function (Fn2(), runFn2)
-import Data.Nullable (Nullable(), toNullable, toMaybe)
-import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Foreign (Foreign())
+import Data.Function.Uncurried (Fn2(), runFn2)
+import Data.Maybe (Maybe(..), fromMaybe)
+import Data.Nullable (Nullable(), toNullable, toMaybe)
 import Data.Posix (Pid(), Gid(), Uid())
 import Data.Posix.Signal (Signal())
 import Data.Posix.Signal as Signal
-import Unsafe.Coerce (unsafeCoerce)
-
+import Data.StrMap (StrMap())
 import Node.Buffer (Buffer())
 import Node.FS as FS
 import Node.Stream (Readable(), Writable(), Stream())
+import Unsafe.Coerce (unsafeCoerce)
 
 -- | A handle for inter-process communication (IPC).
 foreign import data Handle :: *
@@ -147,7 +145,6 @@ instance showExit :: Show Exit where
   show (Normally x) = "Normally " <> show x
   show (BySignal sig) = "BySignal " <> show sig
 
-
 mkExit :: Nullable Int -> Nullable String -> Exit
 mkExit code signal =
   case fromCode code <|> fromSignal signal of

test/Main.purs

@@ -1,18 +1,24 @@
 module Test.Main where
 
 import Prelude
-import Control.Apply
-import Control.Bind
-
-import Control.Monad.Eff.Console
-import Control.Monad.Eff.Console.Unsafe
 
+import Control.Monad.Eff (Eff)
+import Control.Monad.Eff.Console (CONSOLE, log)
+import Control.Monad.Eff.Exception (EXCEPTION)
 import Data.Posix.Signal (Signal(..))
-import Node.Encoding (Encoding(UTF8))
 import Node.Buffer as Buffer
-import Node.ChildProcess
+import Node.ChildProcess (CHILD_PROCESS, Exit(..), defaultExecOptions, exec, onError,
+                          defaultSpawnOptions, spawn, stdout, onExit, kill)
+import Node.Encoding (Encoding(UTF8))
 import Node.Stream (onData)
 
+main :: forall eff. Eff
+                      ( cp :: CHILD_PROCESS
+                      , console :: CONSOLE
+                      , err :: EXCEPTION
+                      , buffer :: Buffer.BUFFER
+                      | eff
+                      ) Unit
 main = do
   log "spawns processes ok"
   spawnLs
@@ -22,38 +28,59 @@ main = do
     log "nonexistent executable: all good."
 
   log "doesn't perform effects too early"
-  ls <- spawn "ls" ["-la"] defaultSpawnOptions
-  let unused = kill SIGTERM ls
-  onExit ls \exit ->
-    case exit of
-      Normally 0 ->
-        log "All good!"
-      _ -> do
-        log ("Bad exit: expected `Normally 0`, got: " <> show exit)
+  spawn "ls" ["-la"] defaultSpawnOptions >>= \ls -> do
+    let unused = kill SIGTERM ls
+    onExit ls \exit ->
+      case exit of
+        Normally 0 ->
+          log "All good!"
+        _ -> do
+          log ("Bad exit: expected `Normally 0`, got: " <> show exit)
 
   log "kills processes"
-  ls <- spawn "ls" ["-la"] defaultSpawnOptions
-  kill SIGTERM ls
-  onExit ls \exit ->
-    case exit of
-      BySignal SIGTERM ->
-        log "All good!"
-      _ -> do
-        log ("Bad exit: expected `BySignal SIGTERM`, got: " <> show exit)
+  spawn "ls" ["-la"] defaultSpawnOptions >>= \ls -> do
+    kill SIGTERM ls
+    onExit ls \exit ->
+      case exit of
+        BySignal SIGTERM ->
+          log "All good!"
+        _ -> do
+          log ("Bad exit: expected `BySignal SIGTERM`, got: " <> show exit)
 
   log "exec"
   execLs
 
+spawnLs :: forall eff. Eff ( cp :: CHILD_PROCESS
+                           , console :: CONSOLE
+                           , err :: EXCEPTION
+                           , buffer :: Buffer.BUFFER
+                           | eff
+                           ) Unit
 spawnLs = do
   ls <- spawn "ls" ["-la"] defaultSpawnOptions
   onExit ls \exit ->
       log $ "ls exited: " <> show exit
   onData (stdout ls) (Buffer.toString UTF8 >=> log)
 
+nonExistentExecutable
+  :: forall eff
+   . Eff ( console :: CONSOLE
+         , cp :: CHILD_PROCESS
+         | eff
+         ) Unit
+  -> Eff ( cp :: CHILD_PROCESS
+         , console :: CONSOLE
+         | eff
+         ) Unit
 nonExistentExecutable done = do
   ch <- spawn "this-does-not-exist" [] defaultSpawnOptions
-  onError ch (\err -> logAny err *> done)
+  onError ch (\err -> log err.code *> done)
 
+execLs :: forall eff. Eff ( cp :: CHILD_PROCESS
+                          , console :: CONSOLE
+                          , buffer :: Buffer.BUFFER
+                          | eff
+                          ) Unit
 execLs = do
   exec "ls >&2" defaultExecOptions \r ->
     log "redirected to stderr:" *> (Buffer.toString UTF8 r.stderr >>= log)