Merge pull request #7 from ad-si/master

Use Spago instead of Bower for dependency management

Author: dgendill

.gitignore

@@ -1,7 +1,5 @@
-/bower_components/
 /node_modules/
 /output/
-/.psci*
 /src/.webpack.js
-.pulp-cache/
 .psc-ide-port
+/.spago

bower.json

@@ -1,16 +1,15 @@
 {
   "name": "purescript-yaml-next",
   "license": "SEE LICENSE FILE",
-  "repository": "",
+  "repository": "https://github.com/archaeron/purescript-yaml",
   "private": true,
   "contributors": [],
   "main": "main.js",
   "scripts": {
-    "postinstall": "bower install",
-    "build": "pulp build"
+    "postinstall": "spago build"
   },
   "devDependencies": {},
   "dependencies": {
-    "js-yaml": "^3.12.0"
+    "js-yaml": "^3.13.1"
   }
 }

package-lock.json

@@ -0,0 +1,8 @@
+let upstream =
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.3-20191005/packages.dhall sha256:ba287d858ada09c4164792ad4e643013b742c208cbedf5de2e35ee27b64b6817
+
+let overrides = {=}
+
+let additions = {=}
+
+in  upstream // overrides // additions

package.json

@@ -0,0 +1,20 @@
+{ name =
+    "yaml-next"
+, dependencies =
+    [ "argonaut-codecs"
+    , "argonaut-core"
+    , "console"
+    , "effect"
+    , "foreign"
+    , "foreign-generic"
+    , "functions"
+    , "ordered-collections"
+    , "psci-support"
+    , "spec"
+    , "unsafe-coerce"
+    ]
+, packages =
+    ./packages.dhall
+, sources =
+    [ "src/**/*.purs", "test/**/*.purs" ]
+}

packages.dhall

@@ -5,8 +5,7 @@ module Data.YAML.Foreign.Decode (
 
 import Foreign (F, Foreign, ForeignError(..), fail)
 import Foreign.Generic (genericDecode)
-import Foreign.Generic.Class (class GenericDecode)
-import Foreign.Generic.Types (Options)
+import Foreign.Generic.Class (class GenericDecode, Options)
 import Data.Function.Uncurried (Fn3, runFn3)
 import Data.Generic.Rep (class Generic)
 import Prelude ((>=>), (<<<), pure, (>>=))

spago.dhall

@@ -2,7 +2,7 @@ module Test.Instances where
 
 import Data.YAML.Foreign.Encode
 import Data.Argonaut.Core (toObject, toString)
-import Data.Argonaut.Decode (getField)
+import Data.Argonaut.Decode.Combinators (getField)
 import Data.Argonaut.Decode.Class (class DecodeJson)
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)

src/Data/YAML/Foreign/Decode.purs

@@ -1,19 +1,21 @@
 module Test.Main where
 
-import Data.Map as Map
 import Control.Monad.Except (runExcept)
 import Data.Argonaut.Decode (class DecodeJson, decodeJson)
 import Data.Either (Either(..))
 import Data.Map (Map)
+import Data.Map as Map
 import Data.YAML.Foreign.Decode (parseYAMLToJson)
 import Data.YAML.Foreign.Encode (printYAML)
-import Effect
+import Effect (Effect)
+import Effect.Aff (launchAff_)
 import Prelude (Unit, discard, pure, ($), (<<<), (>>=))
 import Test.Instances (GeoObject(..), Mobility(..), Point(..))
 import Test.Spec (describe, it)
 import Test.Spec.Assertions (shouldEqual)
 import Test.Spec.Reporter.Console (consoleReporter)
-import Test.Spec.Runner (run)
+import Test.Spec.Runner (runSpec)
+
 
 yamlInput :: String
 yamlInput = """
@@ -134,7 +136,7 @@ fullCircle :: String -> Either String String
 fullCircle yamlString = (readPoint yamlString) >>= pure <<< printYAML
 
 main :: Effect Unit
-main = run [consoleReporter] do
+main = launchAff_ $ runSpec [consoleReporter] do
   describe "purescript-yaml" do
     describe "decode" do
       it "Decodes YAML" do