Hello community, here is the log from the commit of package hspec-discover for openSUSE:Factory checked in at 2017-04-14 13:39:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hspec-discover (Old) and /work/SRC/openSUSE:Factory/.hspec-discover.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hspec-discover" Fri Apr 14 13:39:21 2017 rev:2 rq:485182 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hspec-discover/hspec-discover.changes 2017-03-24 02:04:50.450826794 +0100 +++ /work/SRC/openSUSE:Factory/.hspec-discover.new/hspec-discover.changes 2017-04-14 13:39:22.741332200 +0200 @@ -1,0 +2,20 @@ +Mon Mar 27 12:40:25 UTC 2017 - [email protected] + +- Update to version 2.4.3 with cabal2obs. + +------------------------------------------------------------------- +Mon Feb 27 10:12:07 UTC 2017 - [email protected] + +- Update to version 2.4.2 with cabal2obs. + +------------------------------------------------------------------- +Sun Feb 12 14:14:55 UTC 2017 - [email protected] + +- Update to version 2.4.1 with cabal2obs. + +------------------------------------------------------------------- +Tue Nov 1 18:14:37 UTC 2016 - [email protected] + +- Update to version 2.2.4 with cabal2obs. + +------------------------------------------------------------------- Old: ---- hspec-discover-2.2.3.tar.gz New: ---- hspec-discover-2.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hspec-discover.spec ++++++ --- /var/tmp/diff_new_pack.PhtRjj/_old 2017-04-14 13:39:23.233262676 +0200 +++ /var/tmp/diff_new_pack.PhtRjj/_new 2017-04-14 13:39:23.237262110 +0200 @@ -1,7 +1,7 @@ # # spec file for package hspec-discover # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,13 @@ %global pkg_name hspec-discover %bcond_with tests Name: %{pkg_name} -Version: 2.2.3 +Version: 2.4.3 Release: 0 Summary: Automatically discover and run Hspec tests License: MIT Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -# Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-directory-devel @@ -36,7 +35,6 @@ %if %{with tests} BuildRequires: ghc-hspec-meta-devel %endif -# End cabal-rpm deps %description Automatically discover and run Hspec tests @@ -64,22 +62,15 @@ %prep %setup -q - %build %ghc_lib_build - %install %ghc_lib_install - -%ghc_fix_dynamic_rpath %{pkg_name} - +%ghc_fix_rpath %{pkg_name}-%{version} %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post -n ghc-%{name}-devel %ghc_pkg_recache ++++++ hspec-discover-2.2.3.tar.gz -> hspec-discover-2.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/LICENSE new/hspec-discover-2.4.3/LICENSE --- old/hspec-discover-2.2.3/LICENSE 2016-03-28 11:33:08.000000000 +0200 +++ new/hspec-discover-2.4.3/LICENSE 2017-03-25 12:27:49.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Simon Hengel <[email protected]> +Copyright (c) 2011-2017 Simon Hengel <[email protected]> Copyright (c) 2011-2012 Trystan Spangler <[email protected]> Copyright (c) 2011-2011 Greg Weber <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/hspec-discover.cabal new/hspec-discover-2.4.3/hspec-discover.cabal --- old/hspec-discover-2.2.3/hspec-discover.cabal 2016-03-28 11:33:08.000000000 +0200 +++ new/hspec-discover-2.4.3/hspec-discover.cabal 2017-03-25 12:27:49.000000000 +0100 @@ -1,12 +1,12 @@ --- This file has been generated from package.yaml by hpack version 0.11.2. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: hspec-discover -version: 2.2.3 +version: 2.4.3 license: MIT license-file: LICENSE -copyright: (c) 2012-2015 Simon Hengel +copyright: (c) 2012-2017 Simon Hengel author: Simon Hengel <[email protected]> maintainer: Simon Hengel <[email protected]> build-type: Simple @@ -43,6 +43,8 @@ exposed-modules: Test.Hspec.Discover.Config Test.Hspec.Discover.Run + other-modules: + Paths_hspec_discover default-language: Haskell2010 executable hspec-discover @@ -64,13 +66,13 @@ test main-is: Spec.hs other-modules: - ConfigSpec Helper - RunSpec + Test.Hspec.Discover.ConfigSpec + Test.Hspec.Discover.RunSpec build-depends: base == 4.* , filepath , directory , hspec-discover - , hspec-meta >= 2.2.0 + , hspec-meta >= 2.3.2 default-language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/src/Test/Hspec/Discover/Run.hs new/hspec-discover-2.4.3/src/Test/Hspec/Discover/Run.hs --- old/hspec-discover-2.2.3/src/Test/Hspec/Discover/Run.hs 2016-03-28 11:33:08.000000000 +0200 +++ new/hspec-discover-2.4.3/src/Test/Hspec/Discover/Run.hs 2017-03-25 12:27:49.000000000 +0100 @@ -48,7 +48,7 @@ hPutStrLn stderr err exitFailure Right conf -> do - when (configNested conf) (hPutStrLn stderr "hspec-discover: WARNING - The `--nested' flag is deprecated and will be removed in a future release!") + when (configNested conf) (hPutStrLn stderr "hspec-discover: WARNING - The `--nested' option is deprecated and will be removed in a future release!") specs <- findSpecs src writeFile dst (mkSpecModule src conf specs) _ -> do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/test/ConfigSpec.hs new/hspec-discover-2.4.3/test/ConfigSpec.hs --- old/hspec-discover-2.2.3/test/ConfigSpec.hs 2016-03-28 11:33:08.000000000 +0200 +++ new/hspec-discover-2.4.3/test/ConfigSpec.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -module ConfigSpec (main, spec) where - -import Helper - -import Test.Hspec.Discover.Config - -main :: IO () -main = hspec spec - -spec :: Spec -spec = do - describe "parseConfig" $ do - let parse = parseConfig "hspec-discover" - - it "recognizes --nested" $ do - parse ["--nested"] `shouldBe` Right (defaultConfig {configNested = True}) - - it "recognizes --formatter" $ do - parse ["--formatter", "someFormatter"] `shouldBe` Right (defaultConfig {configFormatter = Just "someFormatter"}) - - it "recognizes --no-main" $ do - parse ["--no-main"] `shouldBe` Right (defaultConfig {configNoMain = True}) - - it "returns error message on unrecognized option" $ do - parse ["--foo"] `shouldBe` (Left . unlines) [ - "hspec-discover: unrecognized option `--foo'" - , "" - , "Usage: hspec-discover SRC CUR DST [--module-name=NAME]" - ] - - it "returns error message on unexpected argument" $ do - parse ["foo"] `shouldBe` (Left . unlines) [ - "hspec-discover: unexpected argument `foo'" - , "" - , "Usage: hspec-discover SRC CUR DST [--module-name=NAME]" - ] - - it "returns error message on --formatter=<fmt> with --no-main" $ do - parse ["--no-main", "--formatter=foo"] `shouldBe` (Left . unlines) [ - "hspec-discover: option `--formatter=<fmt>' does not make sense with `--no-main'" - , "" - , "Usage: hspec-discover SRC CUR DST [--module-name=NAME]" - ] - - context "when option is given multiple times" $ do - it "gives the last occurrence precedence" $ do - parse ["--formatter", "foo", "--formatter", "bar"] `shouldBe` Right (defaultConfig {configFormatter = Just "bar"}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/test/RunSpec.hs new/hspec-discover-2.4.3/test/RunSpec.hs --- old/hspec-discover-2.2.3/test/RunSpec.hs 2016-03-28 11:33:08.000000000 +0200 +++ new/hspec-discover-2.4.3/test/RunSpec.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,126 +0,0 @@ -module RunSpec (main, spec) where - -import Helper - -import System.IO -import System.Directory -import System.FilePath -import Data.List (sort) - -import Test.Hspec.Discover.Run hiding (Spec) -import qualified Test.Hspec.Discover.Run - -main :: IO () -main = hspec spec - -withTempFile :: (FilePath -> IO a) -> IO a -withTempFile action = do - dir <- getTemporaryDirectory - (file, h) <- openTempFile dir "" - hClose h - action file <* removeFile file - - -spec :: Spec -spec = do - describe "run" $ do - it "generates test driver" $ withTempFile $ \f -> do - run ["test-data/nested-spec/Spec.hs", "", f] - readFile f `shouldReturn` unlines [ - "{-# LINE 1 \"test-data/nested-spec/Spec.hs\" #-}" - , "{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}" - , "module Main where" - , "import qualified Foo.Bar.BazSpec" - , "import qualified Foo.BarSpec" - , "import qualified FooSpec" - , "import Test.Hspec.Discover" - , "main :: IO ()" - , "main = hspec spec" - , "spec :: Spec" - , "spec = " ++ unwords [ - "postProcessSpec \"test-data/nested-spec/Foo/Bar/BazSpec.hs\" (describe \"Foo.Bar.Baz\" Foo.Bar.BazSpec.spec)" - , ">> postProcessSpec \"test-data/nested-spec/Foo/BarSpec.hs\" (describe \"Foo.Bar\" Foo.BarSpec.spec)" - , ">> postProcessSpec \"test-data/nested-spec/FooSpec.hs\" (describe \"Foo\" FooSpec.spec)" - ] - ] - - it "generates test driver for an empty directory" $ withTempFile $ \f -> do - run ["test-data/empty-dir/Spec.hs", "", f] - readFile f `shouldReturn` unlines [ - "{-# LINE 1 \"test-data/empty-dir/Spec.hs\" #-}" - , "{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}" - , "module Main where" - , "import Test.Hspec.Discover" - , "main :: IO ()" - , "main = hspec spec" - , "spec :: Spec" - , "spec = return ()" - ] - - describe "pathToModule" $ do - it "derives module name from a given path" $ do - pathToModule "test/Spec.hs" `shouldBe` "Spec" - - describe "getFilesRecursive" $ do - it "recursively returns all file entries of a given directory" $ do - getFilesRecursive "test-data" `shouldReturn` sort [ - "empty-dir/Foo/Bar/Baz/.placeholder" - , "nested-spec/Foo/Bar/BazSpec.hs" - , "nested-spec/Foo/BarSpec.hs" - , "nested-spec/FooSpec.hs" - ] - - describe "fileToSpec" $ do - it "converts path to spec name" $ do - fileToSpec "" "FooSpec.hs" `shouldBe` Just (spec_ "FooSpec.hs" "Foo") - - it "rejects spec with empty name" $ do - fileToSpec "" "Spec.hs" `shouldBe` Nothing - - it "works for lhs files" $ do - fileToSpec "" "FooSpec.lhs" `shouldBe` Just (spec_ "FooSpec.lhs" "Foo") - - it "returns Nothing for invalid spec name" $ do - fileToSpec "" "foo" `shouldBe` Nothing - - context "when spec does not have a valid module name" $ do - it "returns Nothing" $ do - fileToSpec "" "flycheck_Spec.hs" `shouldBe` Nothing - - context "when any component of a hierarchical module name is not valid"$ do - it "returns Nothing" $ do - fileToSpec "" ("Valid" </> "invalid" </>"MiddleNamesSpec.hs") `shouldBe` Nothing - - context "when path has directory component" $ do - it "converts path to spec name" $ do - let file = "Foo" </> "Bar" </> "BazSpec.hs" - fileToSpec "" file `shouldBe` Just (spec_ file "Foo.Bar.Baz") - - it "rejects spec with empty name" $ do - fileToSpec "" ("Foo" </> "Bar" </> "Spec.hs") `shouldBe` Nothing - - describe "findSpecs" $ do - it "finds specs" $ do - let dir = "test-data/nested-spec" - findSpecs (dir </> "Spec.hs") `shouldReturn` [spec_ (dir </> "Foo/Bar/BazSpec.hs") "Foo.Bar.Baz", spec_ (dir </> "Foo/BarSpec.hs") "Foo.Bar", spec_ (dir </> "FooSpec.hs") "Foo"] - - describe "driverWithFormatter" $ do - it "generates a test driver that uses a custom formatter" $ do - driverWithFormatter "Some.Module.formatter" "" `shouldBe` unlines [ - "import qualified Some.Module" - , "main :: IO ()" - , "main = hspecWithFormatter Some.Module.formatter spec" - ] - - describe "moduleNameFromId" $ do - it "returns the module name of a fully qualified identifier" $ do - moduleNameFromId "Some.Module.someId" `shouldBe` "Some.Module" - - describe "importList" $ do - it "generates imports for a list of specs" $ do - importList [spec_ "FooSpec.hs" "Foo", spec_ "BarSpec.hs" "Bar"] "" `shouldBe` unlines [ - "import qualified FooSpec" - , "import qualified BarSpec" - ] - where - spec_ = Test.Hspec.Discover.Run.Spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/test/Test/Hspec/Discover/ConfigSpec.hs new/hspec-discover-2.4.3/test/Test/Hspec/Discover/ConfigSpec.hs --- old/hspec-discover-2.2.3/test/Test/Hspec/Discover/ConfigSpec.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/hspec-discover-2.4.3/test/Test/Hspec/Discover/ConfigSpec.hs 2017-03-25 12:27:49.000000000 +0100 @@ -0,0 +1,47 @@ +module Test.Hspec.Discover.ConfigSpec (main, spec) where + +import Helper + +import Test.Hspec.Discover.Config + +main :: IO () +main = hspec spec + +spec :: Spec +spec = do + describe "parseConfig" $ do + let parse = parseConfig "hspec-discover" + + it "recognizes --nested" $ do + parse ["--nested"] `shouldBe` Right (defaultConfig {configNested = True}) + + it "recognizes --formatter" $ do + parse ["--formatter", "someFormatter"] `shouldBe` Right (defaultConfig {configFormatter = Just "someFormatter"}) + + it "recognizes --no-main" $ do + parse ["--no-main"] `shouldBe` Right (defaultConfig {configNoMain = True}) + + it "returns error message on unrecognized option" $ do + parse ["--foo"] `shouldBe` (Left . unlines) [ + "hspec-discover: unrecognized option `--foo'" + , "" + , "Usage: hspec-discover SRC CUR DST [--module-name=NAME]" + ] + + it "returns error message on unexpected argument" $ do + parse ["foo"] `shouldBe` (Left . unlines) [ + "hspec-discover: unexpected argument `foo'" + , "" + , "Usage: hspec-discover SRC CUR DST [--module-name=NAME]" + ] + + it "returns error message on --formatter=<fmt> with --no-main" $ do + parse ["--no-main", "--formatter=foo"] `shouldBe` (Left . unlines) [ + "hspec-discover: option `--formatter=<fmt>' does not make sense with `--no-main'" + , "" + , "Usage: hspec-discover SRC CUR DST [--module-name=NAME]" + ] + + context "when option is given multiple times" $ do + it "gives the last occurrence precedence" $ do + parse ["--formatter", "foo", "--formatter", "bar"] `shouldBe` Right (defaultConfig {configFormatter = Just "bar"}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.2.3/test/Test/Hspec/Discover/RunSpec.hs new/hspec-discover-2.4.3/test/Test/Hspec/Discover/RunSpec.hs --- old/hspec-discover-2.2.3/test/Test/Hspec/Discover/RunSpec.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/hspec-discover-2.4.3/test/Test/Hspec/Discover/RunSpec.hs 2017-03-25 12:27:49.000000000 +0100 @@ -0,0 +1,126 @@ +module Test.Hspec.Discover.RunSpec (main, spec) where + +import Helper + +import System.IO +import System.Directory +import System.FilePath +import Data.List (sort) + +import Test.Hspec.Discover.Run hiding (Spec) +import qualified Test.Hspec.Discover.Run + +main :: IO () +main = hspec spec + +withTempFile :: (FilePath -> IO a) -> IO a +withTempFile action = do + dir <- getTemporaryDirectory + (file, h) <- openTempFile dir "" + hClose h + action file <* removeFile file + + +spec :: Spec +spec = do + describe "run" $ do + it "generates test driver" $ withTempFile $ \f -> do + run ["test-data/nested-spec/Spec.hs", "", f] + readFile f `shouldReturn` unlines [ + "{-# LINE 1 \"test-data/nested-spec/Spec.hs\" #-}" + , "{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}" + , "module Main where" + , "import qualified Foo.Bar.BazSpec" + , "import qualified Foo.BarSpec" + , "import qualified FooSpec" + , "import Test.Hspec.Discover" + , "main :: IO ()" + , "main = hspec spec" + , "spec :: Spec" + , "spec = " ++ unwords [ + "postProcessSpec \"test-data/nested-spec/Foo/Bar/BazSpec.hs\" (describe \"Foo.Bar.Baz\" Foo.Bar.BazSpec.spec)" + , ">> postProcessSpec \"test-data/nested-spec/Foo/BarSpec.hs\" (describe \"Foo.Bar\" Foo.BarSpec.spec)" + , ">> postProcessSpec \"test-data/nested-spec/FooSpec.hs\" (describe \"Foo\" FooSpec.spec)" + ] + ] + + it "generates test driver for an empty directory" $ withTempFile $ \f -> do + run ["test-data/empty-dir/Spec.hs", "", f] + readFile f `shouldReturn` unlines [ + "{-# LINE 1 \"test-data/empty-dir/Spec.hs\" #-}" + , "{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}" + , "module Main where" + , "import Test.Hspec.Discover" + , "main :: IO ()" + , "main = hspec spec" + , "spec :: Spec" + , "spec = return ()" + ] + + describe "pathToModule" $ do + it "derives module name from a given path" $ do + pathToModule "test/Spec.hs" `shouldBe` "Spec" + + describe "getFilesRecursive" $ do + it "recursively returns all file entries of a given directory" $ do + getFilesRecursive "test-data" `shouldReturn` sort [ + "empty-dir/Foo/Bar/Baz/.placeholder" + , "nested-spec/Foo/Bar/BazSpec.hs" + , "nested-spec/Foo/BarSpec.hs" + , "nested-spec/FooSpec.hs" + ] + + describe "fileToSpec" $ do + it "converts path to spec name" $ do + fileToSpec "" "FooSpec.hs" `shouldBe` Just (spec_ "FooSpec.hs" "Foo") + + it "rejects spec with empty name" $ do + fileToSpec "" "Spec.hs" `shouldBe` Nothing + + it "works for lhs files" $ do + fileToSpec "" "FooSpec.lhs" `shouldBe` Just (spec_ "FooSpec.lhs" "Foo") + + it "returns Nothing for invalid spec name" $ do + fileToSpec "" "foo" `shouldBe` Nothing + + context "when spec does not have a valid module name" $ do + it "returns Nothing" $ do + fileToSpec "" "flycheck_Spec.hs" `shouldBe` Nothing + + context "when any component of a hierarchical module name is not valid"$ do + it "returns Nothing" $ do + fileToSpec "" ("Valid" </> "invalid" </>"MiddleNamesSpec.hs") `shouldBe` Nothing + + context "when path has directory component" $ do + it "converts path to spec name" $ do + let file = "Foo" </> "Bar" </> "BazSpec.hs" + fileToSpec "" file `shouldBe` Just (spec_ file "Foo.Bar.Baz") + + it "rejects spec with empty name" $ do + fileToSpec "" ("Foo" </> "Bar" </> "Spec.hs") `shouldBe` Nothing + + describe "findSpecs" $ do + it "finds specs" $ do + let dir = "test-data/nested-spec" + findSpecs (dir </> "Spec.hs") `shouldReturn` [spec_ (dir </> "Foo/Bar/BazSpec.hs") "Foo.Bar.Baz", spec_ (dir </> "Foo/BarSpec.hs") "Foo.Bar", spec_ (dir </> "FooSpec.hs") "Foo"] + + describe "driverWithFormatter" $ do + it "generates a test driver that uses a custom formatter" $ do + driverWithFormatter "Some.Module.formatter" "" `shouldBe` unlines [ + "import qualified Some.Module" + , "main :: IO ()" + , "main = hspecWithFormatter Some.Module.formatter spec" + ] + + describe "moduleNameFromId" $ do + it "returns the module name of a fully qualified identifier" $ do + moduleNameFromId "Some.Module.someId" `shouldBe` "Some.Module" + + describe "importList" $ do + it "generates imports for a list of specs" $ do + importList [spec_ "FooSpec.hs" "Foo", spec_ "BarSpec.hs" "Bar"] "" `shouldBe` unlines [ + "import qualified FooSpec" + , "import qualified BarSpec" + ] + where + spec_ = Test.Hspec.Discover.Run.Spec
