Merge pull request #2 from cryogenian/ready/update

Update deps and travis

Author: garyb

.travis.yml

@@ -5,10 +5,6 @@ node_js:
 env:
   - TAG=v0.7.0 PATH=$HOME/bin:$PATH
 install:
-  - mkdir $HOME/bin
-  - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
-  - tar zxvf $HOME/purescript.tar.gz -C $HOME/bin purescript/psc{,i,-docs,-bundle,-publish} --strip-components=1
-  - chmod a+x $HOME/bin/psc{,i,-docs,-bundle,-publish}
   - npm install bower gulp -g
   - npm install && bower install
 script:

bower.json

@@ -17,12 +17,15 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-string-parsers":  "^0.5.0",
-    "purescript-pathy":           "^0.2.0",
-    "purescript-arrays":          "^0.4.0",
-    "purescript-lists":           "^0.7.0",
-    "purescript-maps":            "^0.4.0",
-    "purescript-integers":        "^0.2.0",
-    "purescript-globals":         "^0.2.0"
+    "purescript-arrays": "~0.4.2",
+    "purescript-globals": "~0.2.1",
+    "purescript-integers": "~0.2.1",
+    "purescript-lists": "~0.7.5",
+    "purescript-maps": "~0.5.0",
+    "purescript-pathy": "~0.3.0",
+    "purescript-string-parsers": "~0.6.0"
+  },
+  "devDependencies": {
+    "purescript-exceptions": "~0.3.0"
   }
 }

package.json

@@ -1,12 +1,11 @@
 {
-  "name"    : "purescript-uri",
+  "name": "purescript-uri",
   "private": true,
-  "devDependencies": {
-    "ioredis": "1.1.x",
-    "gulp": "^3.8.11",
-    "gulp-jscs": "^1.6.0",
-    "gulp-jshint": "^1.11.2",
-    "gulp-purescript": "^0.5.0",
-    "gulp-run": "^1.6.8"
+  "devDependencies": {},
+  "dependencies": {
+    "gulp": "^3.9.0",
+    "gulp-purescript": "^0.7.0",
+    "gulp-run": "^1.6.11",
+    "purescript": "^0.7.4"
   }
-}
+}

test/Main.purs

@@ -2,12 +2,15 @@ module Test.Main where
 
 import Prelude
 import Data.Either
+import Control.Apply
 import Control.Monad.Eff
-import Control.Monad.Eff.Console
+import qualified Control.Monad.Eff.Console as C
+import Control.Monad.Eff.Exception
 import Data.URI
 import Data.URI.Types
 import Text.Parsing.StringParser
 
+
 main = do
   test runParseURIRef "mongodb://localhost"
   test runParseURIRef "http://en.wikipedia.org/wiki/URI_scheme"
@@ -31,22 +34,30 @@ main = do
   test runParseURIRef "foo://info.example.com?fred"
   test runParseURIRef "ftp://cnn.example.com&[email protected]/top_story.htm"
 
-  log "\nFailing test cases: "
-  test runParseURIRef "news:comp.infosystems.www.servers.unix"
-  test runParseURIRef "tel:+1-816-555-1212"
-  test runParseURIRef "urn:oasis:names:specification:docbook:dtd:xml:4.1.2"
-  test runParseURIRef "mailto:[email protected]"
-  test runParseURIRef "mailto:[email protected]"
-  test runParseURIRef "../top_story.htm"
-  test runParseURIRef "top_story.htm"
-  test runParseURIRef "/top_story.htm"
+  C.log "\nFailing test cases: "
+  testFails runParseURIRef "news:comp.infosystems.www.servers.unix"
+  testFails runParseURIRef "tel:+1-816-555-1212"
+  testFails runParseURIRef "urn:oasis:names:specification:docbook:dtd:xml:4.1.2"
+  testFails runParseURIRef "mailto:[email protected]"
+  testFails runParseURIRef "mailto:[email protected]"
+  testFails runParseURIRef "../top_story.htm"
+  testFails runParseURIRef "top_story.htm"
+  testFails runParseURIRef "/top_story.htm"
 
 
-test :: forall a. (String -> Either ParseError URIRef) -> String -> _
-test f s = do
-  log $ "\nTrying to parse " ++ s ++ ""
+testCommon :: (String -> Eff _ Unit) -> (String -> Eff _ Unit) ->
+              (String -> Either ParseError URIRef) -> String -> _
+testCommon leftMsg rightMsg f s = do
+  C.log $ "\nTrying to parse " <> s <> ""
   case f s of
-    (Left err) -> log $ "  Parse failed: " ++ show err
-    (Right x) -> do
-      log $ "      printURI: " ++ printURIRef x
-      log $ "          show: " ++ show x
+    Left err -> leftMsg $ "  Parse failed: " <> show err
+    Right x -> do
+      rightMsg $ "      printURI: " <> printURIRef x
+        <> "\n          show: " <> show x
+
+
+test :: (String -> Either ParseError URIRef) -> String -> _
+test = testCommon (\x -> C.error x *> (throwException $ error x)) C.log
+
+testFails :: (String -> Either ParseError URIRef) -> String -> _
+testFails = testCommon C.log (\x -> C.error x *> (throwException $ error x))