diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Opinionated Haskell Interoperability -Copyright © 2018-2019 Operational Dynamics Consulting, Pty Ltd and Others +Copyright © 2018-2019 Athae Eredh Siniath and Others All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/tests/CheckArgumentsParsing.hs b/tests/CheckArgumentsParsing.hs --- a/tests/CheckArgumentsParsing.hs +++ b/tests/CheckArgumentsParsing.hs @@ -2,28 +2,41 @@ {-# LANGUAGE OverloadedLists #-} {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module CheckArgumentsParsing where +module CheckArgumentsParsing + ( checkArgumentsParsing + , main + ) + where import Test.Hspec import Core.Program.Arguments +import Core.System.Base +main :: IO () +main = do + finally (hspec checkArgumentsParsing) (putStrLn ".") + +options1 :: [Options] options1 = [ Option "verbose" (Just 'v') Empty "Make the program verbose" , Option "quiet" (Just 'q') Empty "Be very very quiet, we're hunting wabbits" , Option "dry-run" Nothing (Value "WHEN") "Before trapping Road Runner, best to do a dry-run" ] +options2 :: [Options] options2 = [ Option "recursive" Nothing Empty "Descend into darkness" , Argument "filename" "The file that you want" ] +options3 :: [Options] options3 = [ Option "all" (Just 'a') Empty "Good will to everyone" ] +commands1 :: [Commands] commands1 = [ Global options1 @@ -31,6 +44,7 @@ options2 ] +commands2 :: [Commands] commands2 = [ Global options1 @@ -104,6 +118,14 @@ in actual `shouldBe` Left (MissingArgument "filename") + it "accepts request for version" $ + let + config = simple options1 + actual = parseCommandLine config ["--version"] + in + actual `shouldBe` Left VersionRequest + + describe "Parsing of complex command-lines" $ do it "recognizes only single command" $ @@ -140,11 +162,19 @@ in actual `shouldBe` Right expect - it "rejects further trailing arguments" $ let config = complex commands2 actual = parseCommandLine config ["commit", "some"] in actual `shouldBe` Left (UnexpectedArguments ["some"]) + +-- in complex mode wasn't accpting --version as a global option. + + it "accepts request for version" $ + let + config = complex commands2 + actual = parseCommandLine config ["--version"] + in + actual `shouldBe` Left VersionRequest diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs --- a/tests/TestSuite.hs +++ b/tests/TestSuite.hs @@ -7,7 +7,7 @@ import CheckBytesBehaviour import CheckContainerBehaviour import CheckJsonWrapper -import CheckArgumentsParsing +import CheckArgumentsParsing (checkArgumentsParsing) import CheckProgramMonad main :: IO () diff --git a/unbeliever.cabal b/unbeliever.cabal --- a/unbeliever.cabal +++ b/unbeliever.cabal @@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.31.2. +-- This file has been generated from package.yaml by hpack version 0.33.0. -- -- see: https://github.com/sol/hpack -- --- hash: 98e877f90bde84cfecc972b36c9d063baac619850900284973e14923a423f49f +-- hash: fedafd1087139044ebc03b568441a99811b05346172ad635378d636638dae29b name: unbeliever -version: 0.10.0.5 +version: 0.10.0.6 synopsis: Opinionated Haskell Interoperability description: A library to help build command-line programs, both tools and longer-running daemons. Its @Program@ type provides unified ouptut & @@ -18,7 +18,7 @@ . A description of this package, a list of features, and some background to its design is contained in the - + on GitHub. . Useful starting points in the documentation are @@ -40,19 +40,19 @@ access patterns. category: System stability: experimental -homepage: https://github.com/oprdyn/unbeliever#readme -bug-reports: https://github.com/oprdyn/unbeliever/issues -author: Andrew Cowie -maintainer: Andrew Cowie -copyright: © 2018-2020 Operational Dynamics Consulting Pty Ltd, and Others +homepage: https://github.com/aesiniath/unbeliever#readme +bug-reports: https://github.com/aesiniath/unbeliever/issues +author: Andrew Cowie +maintainer: Andrew Cowie +copyright: © 2018-2020 Athae Eredh Siniath and Others license: BSD3 license-file: LICENSE -tested-with: GHC == 8.6.5 +tested-with: GHC == 8.8.3 build-type: Simple source-repository head type: git - location: https://github.com/oprdyn/unbeliever + location: https://github.com/aesiniath/unbeliever library other-modules: @@ -62,9 +62,9 @@ ghc-options: -Wall -Wwarn -fwarn-tabs build-depends: base >=4.11 && <5 - , core-data >=0.2.1.5 - , core-program >=0.2.4.1 - , core-text >=0.2.3.1 + , core-data >=0.2.1.7 + , core-program >=0.2.4.4 + , core-text >=0.2.3.5 default-language: Haskell2010 test-suite check @@ -81,37 +81,17 @@ tests ghc-options: -Wall -Wwarn -fwarn-tabs -threaded build-depends: - async - , base >=4.11 && <5 + base >=4.11 && <5 , bytestring - , chronologique - , containers - , core-data >=0.2.1.5 - , core-program >=0.2.4.1 - , core-text >=0.2.3.1 - , deepseq - , directory - , exceptions - , filepath + , core-data >=0.2.1.7 + , core-program >=0.2.4.4 + , core-text >=0.2.3.5 , fingertree - , fsnotify , hashable - , hourglass , hspec - , megaparsec - , mtl - , prettyprinter - , prettyprinter-ansi-terminal , safe-exceptions - , scientific - , stm - , template-haskell - , terminal-size , text , text-short - , transformers - , unix - , unordered-containers default-language: Haskell2010 benchmark performance @@ -123,9 +103,9 @@ build-depends: base >=4.11 && <5 , bytestring - , core-data >=0.2.1.5 - , core-program >=0.2.4.1 - , core-text >=0.2.3.1 + , core-data >=0.2.1.7 + , core-program >=0.2.4.4 + , core-text >=0.2.3.5 , gauge , text default-language: Haskell2010