commit ghc-tasty-silver for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-tasty-silver for openSUSE:Factory checked in at 2017-09-15 22:16:59 Comparing /work/SRC/openSUSE:Factory/ghc-tasty-silver (Old) and /work/SRC/openSUSE:Factory/.ghc-tasty-silver.new (New) Package is "ghc-tasty-silver" Fri Sep 15 22:16:59 2017 rev:4 rq:525489 version:3.1.10 Changes: --- /work/SRC/openSUSE:Factory/ghc-tasty-silver/ghc-tasty-silver.changes 2017-04-14 13:41:32.882938975 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-tasty-silver.new/ghc-tasty-silver.changes 2017-09-15 22:17:00.636337994 +0200 @@ -1,0 +2,5 @@ +Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +--- Other differences: -- ++ ghc-tasty-silver.spec ++ --- /var/tmp/diff_new_pack.Diq3Uo/_old 2017-09-15 22:17:01.268248981 +0200 +++ /var/tmp/diff_new_pack.Diq3Uo/_new 2017-09-15 22:17:01.272248417 +0200 @@ -23,8 +23,8 @@ Release:0 Summary:A fancy test runner, including support for golden tests License:MIT -Group: Development/Languages/Other -Url:https://hackage.haskell.org/package/%{pkg_name} +Group: Development/Libraries/Haskell +URL:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel @@ -45,7 +45,6 @@ BuildRequires: ghc-tasty-devel BuildRequires: ghc-temporary-devel BuildRequires: ghc-text-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-transformers-devel @@ -61,7 +60,7 @@ %package devel Summary:Haskell %{pkg_name} library development files -Group: Development/Libraries/Other +Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} @@ -89,11 +88,9 @@ %ghc_pkg_recache %files -f %{name}.files -%defattr(-,root,root,-) %doc LICENSE %files devel -f %{name}-devel.files -%defattr(-,root,root,-) %doc CHANGELOG.md %changelog
commit ghc-tasty-silver for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-tasty-silver for openSUSE:Factory checked in at 2017-04-14 13:41:31 Comparing /work/SRC/openSUSE:Factory/ghc-tasty-silver (Old) and /work/SRC/openSUSE:Factory/.ghc-tasty-silver.new (New) Package is "ghc-tasty-silver" Fri Apr 14 13:41:31 2017 rev:3 rq:487389 version:3.1.10 Changes: --- /work/SRC/openSUSE:Factory/ghc-tasty-silver/ghc-tasty-silver.changes 2017-03-08 01:12:43.249324514 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-tasty-silver.new/ghc-tasty-silver.changes 2017-04-14 13:41:32.882938975 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 11:02:14 UTC 2017 - psim...@suse.com + +- Update to version 3.1.10 with cabal2obs. + +--- Old: tasty-silver-3.1.9.tar.gz New: tasty-silver-3.1.10.tar.gz Other differences: -- ++ ghc-tasty-silver.spec ++ --- /var/tmp/diff_new_pack.RilUBF/_old 2017-04-14 13:41:33.722820271 +0200 +++ /var/tmp/diff_new_pack.RilUBF/_new 2017-04-14 13:41:33.722820271 +0200 @@ -19,7 +19,7 @@ %global pkg_name tasty-silver %bcond_with tests Name: ghc-%{pkg_name} -Version:3.1.9 +Version:3.1.10 Release:0 Summary:A fancy test runner, including support for golden tests License:MIT ++ tasty-silver-3.1.9.tar.gz -> tasty-silver-3.1.10.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tasty-silver-3.1.9/CHANGELOG.md new/tasty-silver-3.1.10/CHANGELOG.md --- old/tasty-silver-3.1.9/CHANGELOG.md 2016-08-29 21:47:54.0 +0200 +++ new/tasty-silver-3.1.10/CHANGELOG.md2017-04-01 19:24:02.0 +0200 @@ -1,6 +1,11 @@ Changes === +Version 3.1.10 +-- + +* Better error handling for calls to external tools (`git diff`) + Version 3.1.9 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tasty-silver-3.1.9/Test/Tasty/Silver/Interactive.hs new/tasty-silver-3.1.10/Test/Tasty/Silver/Interactive.hs --- old/tasty-silver-3.1.9/Test/Tasty/Silver/Interactive.hs 2016-08-29 21:47:54.0 +0200 +++ new/tasty-silver-3.1.10/Test/Tasty/Silver/Interactive.hs2017-04-01 19:21:17.0 +0200 @@ -57,6 +57,7 @@ import System.Process import qualified Data.ByteString as BS import System.Directory +import System.Exit import System.IO import System.IO.Temp import System.FilePath @@ -180,12 +181,22 @@ printDiff :: TestName -> GDiff -> IO () -printDiff n (DiffText _ tGold tAct) = withDiffEnv n tGold tAct - (\fGold fAct -> do -(_, stdOut, _) <- PTL.readProcessWithExitCode "sh" ["-c", "git diff --no-index --text " ++ fGold ++ " " ++ fAct] T.empty -TIO.putStrLn stdOut - - ) +printDiff n (DiffText _ tGold tAct) = do + hasGit <- doesCmdExist "git" + if hasGit then +withDiffEnv n tGold tAct + (\fGold fAct -> do +ret <- PTL.readProcessWithExitCode "sh" ["-c", "git diff --no-index --text " ++ fGold ++ " " ++ fAct] T.empty +case ret of + (ExitSuccess, stdOut, _) -> TIO.putStrLn stdOut + _ -> error ("Call to `git diff` failed: " ++ show ret) + ) + else do +putStrLn "`git diff` not available, cannot produce a diff." +putStrLn "Golden value:" +TIO.putStrLn tGold +putStrLn "Actual value:" +TIO.putStrLn tAct printDiff _ (ShowDiffed _ t) = TIO.putStrLn t printDiff _ Equal = error "Can't print diff for equal values." @@ -199,14 +210,15 @@ gitDiff fGold fAct = callProcess "sh" ["-c", "git diff --color=always --no-index --text " ++ fGold ++ " " ++ fAct ++ " | less -r > /dev/tty"] -doesCmdExist cmd = isJust <$> findExecutable cmd - hasColorDiff = (&&) <$> doesCmdExist "wdiff" <*> doesCmdExist "colordiff" colorDiff fGold fAct = callProcess "sh" ["-c", "wdiff " ++ fGold ++ " " ++ fAct ++ " | colordiff | less -r > /dev/tty"] showDiff n (ShowDiffed _ t) = showInLess n t showDiff _ Equal = error "Can't show diff for equal values." +doesCmdExist :: String -> IO Bool +doesCmdExist cmd = isJust <$> findExecutable cmd + -- Stores the golden/actual text in two files, so we can use it for git diff. withDiffEnv :: TestName -> T.Text -> T.Text -> (FilePath -> FilePath -> IO ()) -> IO () withDiffEnv n tGold tAct cont = do @@ -231,9 +243,15 @@ showInLess :: String -> T.Text -> IO () showInLess _ t = do - -- TODO error handling... - _ <- PS.readProcessWithExitCode "sh" ["-c", "less > /dev/tty"] inp - return () + isTerm <- hSupportsANSI stdout + if isTerm +then do + ret <- PS.readProcessWithExitCode "sh" ["-c", "less > /dev/tty"] inp + case ret of +ret@(ExitFailure _,
commit ghc-tasty-silver for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-tasty-silver for openSUSE:Factory checked in at 2017-03-08 01:12:42 Comparing /work/SRC/openSUSE:Factory/ghc-tasty-silver (Old) and /work/SRC/openSUSE:Factory/.ghc-tasty-silver.new (New) Package is "ghc-tasty-silver" Wed Mar 8 01:12:42 2017 rev:2 rq:461686 version:3.1.9 Changes: --- /work/SRC/openSUSE:Factory/ghc-tasty-silver/ghc-tasty-silver.changes 2016-11-16 13:32:40.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-tasty-silver.new/ghc-tasty-silver.changes 2017-03-08 01:12:43.249324514 +0100 @@ -1,0 +2,5 @@ +Thu Sep 15 06:40:34 UTC 2016 - psim...@suse.com + +- Update to version 3.1.9 revision 0 with cabal2obs. + +--- Old: tasty-silver-3.1.8.1.tar.gz New: tasty-silver-3.1.9.tar.gz Other differences: -- ++ ghc-tasty-silver.spec ++ --- /var/tmp/diff_new_pack.MY3Q3M/_old 2017-03-08 01:12:43.977221508 +0100 +++ /var/tmp/diff_new_pack.MY3Q3M/_new 2017-03-08 01:12:43.977221508 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-tasty-silver # -# 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,15 +19,14 @@ %global pkg_name tasty-silver %bcond_with tests Name: ghc-%{pkg_name} -Version:3.1.8.1 +Version:3.1.9 Release:0 Summary:A fancy test runner, including support for golden tests License:MIT -Group: System/Libraries +Group: Development/Languages/Other Url:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-bytestring-devel @@ -51,7 +50,6 @@ BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-transformers-devel %endif -# End cabal-rpm deps %description This package provides a fancy test runner and support for «golden testing». @@ -75,20 +73,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++ tasty-silver-3.1.8.1.tar.gz -> tasty-silver-3.1.9.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tasty-silver-3.1.8.1/CHANGELOG.md new/tasty-silver-3.1.9/CHANGELOG.md --- old/tasty-silver-3.1.8.1/CHANGELOG.md 2015-05-14 21:34:07.0 +0200 +++ new/tasty-silver-3.1.9/CHANGELOG.md 2016-08-29 21:47:54.0 +0200 @@ -1,6 +1,22 @@ Changes === +Version 3.1.9 +- + +* Fix compilation with optparse-applicative 0.13.*. +* Provide character-level diff if wdiff and colordiff are available. + +Version 3.1.8.1 +--- + +* Fix compilation with GHC 8. + +Version 3.1.8 +- + +* Make update function optional for test cases. + Version 3.1.7 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tasty-silver-3.1.8.1/Test/Tasty/Silver/Interactive.hs new/tasty-silver-3.1.9/Test/Tasty/Silver/Interactive.hs --- old/tasty-silver-3.1.8.1/Test/Tasty/Silver/Interactive.hs 2016-01-19 23:11:14.0 +0100 +++ new/tasty-silver-3.1.9/Test/Tasty/Silver/Interactive.hs 2016-08-29 21:47:54.0 +0200 @@ -56,6 +56,7 @@ import System.Process.ByteString as PS import System.Process import qualified Data.ByteString as BS +import System.Directory import System.IO import System.IO.Temp import System.FilePath @@ -179,27 +180,36 @@ printDiff :: TestName -> GDiff -> IO () -printDiff n (DiffText _ tGold tAct) = withDiffEnv +printDiff n (DiffText _ tGold tAct) = withDiffEnv n tGold tAct (\fGold fAct -> do (_, stdOut, _) <- PTL.readProcessWithExitCode "sh" ["-c", "git diff --no-index --text " ++ fGold ++ " " ++ fAct] T.empty TIO.putStrLn stdOut ) - n tGold tAct printDiff _ (ShowDiffed _ t) = TIO.putStrLn t printDiff _ Equal = error "Can't print diff for equal values." showDiff :: TestName -> GDiff -> IO () -showDiff n (DiffText _ tGold tAct) = withDiffEnv - (\fGold fAct -> callProcess "sh" -["-c", "git diff --color=always --no-index --text " ++ fGold ++ " " ++ fAct ++ " | less -r > /dev/tty"]) - n tGold tAct +showDiff n (DiffText _ tGold tAct) = do + hasColorDiff' <- ha