Merge branch 'master' into github-actions

Author: f-f

CHANGELOG.md

@@ -7,10 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.0] - 2020-10-29
+
 Breaking changes (😱!!!):
 - **Specify the package set version via `--tag` (#680)**
 
-  Example usage: `spago init --tag psc-0.13.2-20190725` and `spago upgrade-set --tag psc-0.13.2-20190725`. This is a breaking change because we are removing support for the old spacchetti/spacchetti-style location (i.e. in the src/packages.dhall) for the upgrade-set command.
+  Example usage: `spago init --tag psc-0.13.2-20190725` and `spago upgrade-set --tag psc-0.13.2-20190725`.
+  This is a breaking change because we are removing support for the old spacchetti/spacchetti-style location (i.e. in the src/packages.dhall) for the upgrade-set command.
+
+Bugfixes:
+- Remove dependency on `libtinfo`, removing the biggest cause of friction for using the precompiled binary on various Linux distros (#684)
+- Correctly parse flags to be passed to the compiler (#688)
 
 ## [0.16.0] - 2020-08-14
 

package.yaml

@@ -1,5 +1,5 @@
 name:                spago
-version:             0.16.0
+version:             0.17.0
 github:              "purescript/spago"
 license:             BSD3
 author:              "Justin Woo, Fabrizio Ferrai"

src/Spago/Command/Path.hs

@@ -1,4 +1,4 @@
-module Spago.Command.Path (showPaths, getOutputPath) where
+module Spago.Command.Path (showPaths, getOutputPath, findFlag) where
 
 import Spago.Prelude
 import Spago.Env
@@ -43,7 +43,7 @@ getOutputPath buildOpts = do
     Just path -> Text.unpack path
 
 
--- TODO tests:
+-- See tests in: test/Spago/Command/PathSpec.hs
 -- ["-o", "something"]
 -- ["--output", "something"]
 -- ["--output something"]
@@ -53,18 +53,34 @@ getOutputPath buildOpts = do
 -- | Try to find the content of a certain flag in a list of PursArgs
 findFlag :: Char -> Text -> [PursArg] -> Maybe Text
 findFlag char string = \case
-  [] -> Nothing
-  [_] -> Nothing
-  (x:y:xs) -> if isFlag x
-              then Just (unPursArg y)
-              else findFlag char string (y : xs)
-  where 
+  (x:xs) -> if isFlag x
+              then case xs of
+                (y:_) -> Just (unPursArg y)
+                _ -> Nothing
+              else if hasFlag x
+                then case Text.words (unPursArg x) of
+                  [word] -> case Text.split (=='=') word of
+                    [_,value] -> Just value
+                    _           -> Nothing
+                  (_:value:_) -> Just value
+                  _ -> Nothing
+                else findFlag char string xs
+  _ -> Nothing
+  where
     isFlag :: PursArg -> Bool
-    isFlag (PursArg a)
+    isFlag (PursArg word)
+      =  word == (Text.pack ['-', char])
+      || word == ("--" <> string)
+    hasFlag :: PursArg -> Bool
+    hasFlag (PursArg a)
       =  firstWord == (Text.pack ['-', char])
       || firstWord == ("--" <> string)
         where
           firstWord
             = fromMaybe "" $ case Text.words a of
                 []       -> Nothing
-                (word:_) -> Just word
+                [word]   -> case Text.split (=='=') word of
+                  [one]       -> Just one
+                  [key,_]     -> Just key
+                  _           -> Nothing
+                (word:_) -> Just word

templates/packages.dhall

@@ -105,6 +105,6 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201007/packages.dhall sha256:35633f6f591b94d216392c9e0500207bb1fec42dd355f4fecdfd186956567b6b
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201021/packages.dhall sha256:55ebdbda1bd6ede4d5307fbc1ef19988c80271b4225d833c8d6fb9b6fb1aa6d8
 
 in  upstream

test/Spago/Command/PathSpec.hs

@@ -0,0 +1,32 @@
+module Spago.Command.PathSpec (spec) where
+
+import            Prelude
+import            Test.Hspec
+
+import            Spago.Prelude hiding (link)
+import            Spago.Env
+import qualified  Spago.Command.Path   as Path
+
+spec :: Spec
+spec = do
+  describe "Path findFlag" $ do
+    it "[\"-o\", \"something\"]" $ do
+      let a = fromMaybe "" $ Path.findFlag 'o' "output" [PursArg "-o" , PursArg "something"]
+      let b = "something"
+      a `shouldBe` b
+    it "[\"--output\", \"something\"]" $ do
+      let a = fromMaybe "" $ Path.findFlag 'o' "output" [PursArg "--output" , PursArg "something"]
+      let b = "something"
+      a `shouldBe` b
+    it "[\"-o something\"]" $ do
+      let a = fromMaybe "" $ Path.findFlag 'o' "output" [PursArg "-o something"]
+      let b = "something"
+      a `shouldBe` b
+    it "[\"--output something\"]" $ do
+      let a = fromMaybe "" $ Path.findFlag 'o' "output" [PursArg "--output something"]
+      let b = "something"
+      a `shouldBe` b
+    it "[\"--output=something\"]" $ do
+      let a = fromMaybe "" $ Path.findFlag 'o' "output" [PursArg "--output=something"]
+      let b = "something"
+      a `shouldBe` b