packages feed

hspec-meta 2.2.1 → 2.3.0

raw patch · 11 files changed

+278/−284 lines, 11 filesdep +call-stackdep ~HUnitPVP ok

version bump matches the API change (PVP)

Dependencies added: call-stack

Dependency ranges changed: HUnit

API changes (from Hackage documentation)

+ Test.Hspec.Meta: type Arg e = ();
+ Test.Hspec.Meta: type family Arg e;
+ Test.Hspec.Meta: }
- Test.Hspec.Meta: class Example e where type family Arg e Arg e = ()
+ Test.Hspec.Meta: class Example e where type Arg e type Arg e = () where {
- Test.Hspec.Meta: it :: (?loc :: CallStack, Example a) => String -> a -> SpecWith (Arg a)
+ Test.Hspec.Meta: it :: (HasCallStack, Example a) => String -> a -> SpecWith (Arg a)

Files

hspec-core/src/Test/Hspec/Core/Example.hs view
@@ -14,6 +14,11 @@ import           Data.Maybe (fromMaybe) import           Data.List (isPrefixOf) import qualified Test.HUnit.Lang as HUnit++#if MIN_VERSION_HUnit(1,4,0)+import           Data.CallStack+#endif+ import qualified Control.Exception as E import           Data.Typeable (Typeable) import qualified Test.QuickCheck as QC@@ -85,11 +90,15 @@ hunitFailureToResult :: HUnit.HUnitFailure -> Result hunitFailureToResult e = case e of #if MIN_VERSION_HUnit(1,3,0)-  HUnit.HUnitFailure loc err -> Fail location err+  HUnit.HUnitFailure mLoc err -> Fail location err     where-      location = case loc of+      location = case mLoc of         Nothing -> Nothing-        Just (HUnit.Location f l c) -> Just $ Location f l c ExactLocation+#if MIN_VERSION_HUnit(1,4,0)+        Just loc -> Just $ Location (srcLocFile loc) (srcLocStartLine loc) (srcLocStartCol loc) ExactLocation+#else+        Just loc -> Just $ Location (HUnit.locationFile loc) (HUnit.locationLine loc) (HUnit.locationColumn loc) ExactLocation+#endif #else   HUnit.HUnitFailure err -> Fail Nothing err #endif
hspec-core/src/Test/Hspec/Core/Spec.hs view
@@ -1,8 +1,5 @@-{-# LANGUAGE CPP #-}-#if MIN_VERSION_base(4,8,1)-#define HAS_SOURCE_LOCATIONS-{-# LANGUAGE ImplicitParams #-}-#endif+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE ConstraintKinds #-} -- | -- Stability: unstable --@@ -27,11 +24,8 @@ , module Test.Hspec.Core.Tree ) where -#ifdef HAS_SOURCE_LOCATIONS-import           GHC.Stack-#endif- import qualified Control.Exception as E+import           Data.CallStack  import           Test.Hspec.Expectations (Expectation) @@ -54,11 +48,7 @@ -- > describe "absolute" $ do -- >   it "returns a positive number when given a negative number" $ -- >     absolute (-1) == 1-#ifdef HAS_SOURCE_LOCATIONS-it :: (?loc :: CallStack, Example a) => String -> a -> SpecWith (Arg a)-#else-it :: Example a => String -> a -> SpecWith (Arg a)-#endif+it :: (HasCallStack, Example a) => String -> a -> SpecWith (Arg a) it label action = fromSpecList [specItem label action]  -- | `parallel` marks all spec items of the given spec to be safe for parallel
hspec-core/src/Test/Hspec/Core/Tree.hs view
@@ -1,10 +1,6 @@ {-# LANGUAGE DeriveFunctor #-}--{-# LANGUAGE CPP #-}-#if MIN_VERSION_base(4,8,1)-#define HAS_SOURCE_LOCATIONS-{-# LANGUAGE ImplicitParams #-}-#endif+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE ConstraintKinds #-}  -- | -- Stability: unstable@@ -16,12 +12,7 @@ , specItem ) where -#ifdef HAS_SOURCE_LOCATIONS-# if !MIN_VERSION_base(4,9,0)-import           GHC.SrcLoc-# endif-import           GHC.Stack-#endif+import           Data.CallStack  import           Prelude () import           Test.Hspec.Compat@@ -88,11 +79,7 @@       | otherwise = s  -- | The @specItem@ function creates a spec item.-#ifdef HAS_SOURCE_LOCATIONS-specItem :: (?loc :: CallStack, Example a) => String -> a -> SpecTree (Arg a)-#else-specItem :: Example a => String -> a -> SpecTree (Arg a)-#endif+specItem :: (HasCallStack, Example a) => String -> a -> SpecTree (Arg a) specItem s e = Leaf $ Item requirement location False (evaluateExample e)   where     requirement@@ -100,10 +87,6 @@       | otherwise = s      location :: Maybe Location-#ifdef HAS_SOURCE_LOCATIONS-    location = case reverse (getCallStack ?loc) of+    location = case reverse callStack of       (_, loc) : _ -> Just (Location (srcLocFile loc) (srcLocStartLine loc) (srcLocStartCol loc) ExactLocation)       _ -> Nothing-#else-    location = Nothing-#endif
+ hspec-discover/driver/hspec-discover.hs view
@@ -0,0 +1,8 @@+module Main (main) where++import           System.Environment++import           Test.Hspec.Discover.Run (run)++main :: IO ()+main = getArgs >>= run
− hspec-discover/src/Config.hs 
@@ -1,45 +0,0 @@-module Config (-  Config (..)-, defaultConfig-, parseConfig-, usage-) where--import           Data.Maybe-import           System.Console.GetOpt--data Config = Config {-  configNested :: Bool-, configFormatter :: Maybe String-, configNoMain :: Bool-, configModuleName :: Maybe String-} deriving (Eq, Show)--defaultConfig :: Config-defaultConfig = Config False Nothing False Nothing--options :: [OptDescr (Config -> Config)]-options = [-    Option [] ["nested"] (NoArg $ \c -> c {configNested = True}) ""-  , Option [] ["formatter"] (ReqArg (\s c -> c {configFormatter = Just s}) "FORMATTER") ""-  , Option [] ["module-name"] (ReqArg (\s c -> c {configModuleName = Just s}) "NAME") ""-  , Option [] ["no-main"] (NoArg $ \c   -> c {configNoMain = True}) ""-  ]--usage :: String -> String-usage prog = "\nUsage: " ++ prog ++ " SRC CUR DST [--module-name=NAME]\n"--parseConfig :: String -> [String] -> Either String Config-parseConfig prog args = case getOpt Permute options args of-    (opts, [], []) -> let-        c = (foldl (flip id) defaultConfig opts)-      in-        if (configNoMain c && isJust (configFormatter c))-           then-             formatError "option `--formatter=<fmt>' does not make sense with `--no-main'\n"-           else-             Right c-    (_, _, err:_)  -> formatError err-    (_, arg:_, _)  -> formatError ("unexpected argument `" ++ arg ++ "'\n")-  where-    formatError err = Left (prog ++ ": " ++ err ++ usage prog)
− hspec-discover/src/Main.hs 
@@ -1,8 +0,0 @@-module Main (main) where--import           System.Environment--import           Run (run)--main :: IO ()-main = getArgs >>= run
− hspec-discover/src/Run.hs 
@@ -1,148 +0,0 @@-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, OverloadedStrings #-}-{-# OPTIONS_GHC -fno-warn-orphans #-}--- | A preprocessor that finds and combines specs.-module Run (-  run---- exported for testing-, Spec(..)-, importList-, fileToSpec-, findSpecs-, getFilesRecursive-, driverWithFormatter-, moduleNameFromId-, pathToModule-) where-import           Control.Monad-import           Control.Applicative-import           Data.List-import           Data.Char-import           Data.Maybe-import           Data.String-import           System.Environment-import           System.Exit-import           System.IO-import           System.Directory (doesDirectoryExist, getDirectoryContents, doesFileExist)-import           System.FilePath hiding (combine)--import           Config--instance IsString ShowS where-  fromString = showString--data Spec = Spec {-  specFile :: FilePath-, specModule :: String-} deriving (Eq, Show)--run :: [String] -> IO ()-run args_ = do-  name <- getProgName-  case args_ of-    src : _ : dst : args -> case parseConfig name args of-      Left err -> do-        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!")-        specs <- findSpecs src-        writeFile dst (mkSpecModule src conf specs)-    _ -> do-      hPutStrLn stderr (usage name)-      exitFailure--mkSpecModule :: FilePath -> Config -> [Spec] -> String-mkSpecModule src conf nodes =-  ( "{-# LINE 1 " . shows src . " #-}\n"-  . showString "{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}\n"-  . showString ("module " ++ moduleName src conf ++" where\n")-  . importList nodes-  . showString "import Test.Hspec.Meta\n"-  . maybe driver driverWithFormatter (configFormatter conf)-  . showString "spec :: Spec\n"-  . showString "spec = "-  . formatSpecs nodes-  ) "\n"-  where-    driver =-        case configNoMain conf of-          False ->-              showString "main :: IO ()\n"-            . showString "main = hspec spec\n"-          True -> ""--moduleName :: FilePath -> Config -> String-moduleName src conf = fromMaybe (if configNoMain conf then pathToModule src else "Main") (configModuleName conf)---- | Derive module name from specified path.-pathToModule :: FilePath -> String-pathToModule f = toUpper m:ms-  where-    fileName = last $ splitDirectories f-    m:ms = takeWhile (/='.') fileName--driverWithFormatter :: String -> ShowS-driverWithFormatter f =-    showString "import qualified " . showString (moduleNameFromId f) . showString "\n"-  . showString "main :: IO ()\n"-  . showString "main = hspecWithFormatter " . showString f . showString " spec\n"---- | Return module name of a fully qualified identifier.-moduleNameFromId :: String -> String-moduleNameFromId = reverse . dropWhile (== '.') . dropWhile (/= '.') . reverse---- | Generate imports for a list of specs.-importList :: [Spec] -> ShowS-importList = foldr (.) "" . map f-  where-    f :: Spec -> ShowS-    f spec = "import qualified " . showString (specModule spec) . "Spec\n"---- | Combine a list of strings with (>>).-sequenceS :: [ShowS] -> ShowS-sequenceS = foldr (.) "" . intersperse " >> "---- | Convert a list of specs to code.-formatSpecs :: [Spec] -> ShowS-formatSpecs xs-  | null xs   = "return ()"-  | otherwise = sequenceS (map formatSpec xs)---- | Convert a spec to code.-formatSpec :: Spec -> ShowS-formatSpec (Spec file name) = "postProcessSpec " . shows file . " (describe " . shows name . " " . showString name . "Spec.spec)"--findSpecs :: FilePath -> IO [Spec]-findSpecs src = do-  let (dir, file) = splitFileName src-  mapMaybe (fileToSpec dir) . filter (/= file) <$> getFilesRecursive dir--fileToSpec :: FilePath -> FilePath -> Maybe Spec-fileToSpec dir file = case reverse $ splitDirectories file of-  x:xs -> case stripSuffix "Spec.hs" x <|> stripSuffix "Spec.lhs" x of-    Just name | isValidModuleName name && all isValidModuleName xs ->-      Just . Spec (dir </> file) $ (intercalate "." . reverse) (name : xs)-    _ -> Nothing-  _ -> Nothing-  where-    stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]-    stripSuffix suffix str = reverse <$> stripPrefix (reverse suffix) (reverse str)---- See `Cabal.Distribution.ModuleName` (http://git.io/bj34)-isValidModuleName :: String -> Bool-isValidModuleName [] = False-isValidModuleName (c:cs) = isUpper c && all isValidModuleChar cs--isValidModuleChar :: Char -> Bool-isValidModuleChar c = isAlphaNum c || c == '_' || c == '\''--getFilesRecursive :: FilePath -> IO [FilePath]-getFilesRecursive baseDir = sort <$> go []-  where-    go :: FilePath -> IO [FilePath]-    go dir = do-      c <- map (dir </>) . filter (`notElem` [".", ".."]) <$> getDirectoryContents (baseDir </> dir)-      dirs <- filterM (doesDirectoryExist . (baseDir </>)) c >>= mapM go-      files <- filterM (doesFileExist . (baseDir </>)) c-      return (files ++ concat dirs)
+ hspec-discover/src/Test/Hspec/Discover/Config.hs view
@@ -0,0 +1,48 @@+-- |+-- /NOTE:/ This module is not meant for public consumption.  For user+-- documentation look at http://hspec.github.io/hspec-discover.html.+module Test.Hspec.Discover.Config (+  Config (..)+, defaultConfig+, parseConfig+, usage+) where++import           Data.Maybe+import           System.Console.GetOpt++data Config = Config {+  configNested :: Bool+, configFormatter :: Maybe String+, configNoMain :: Bool+, configModuleName :: Maybe String+} deriving (Eq, Show)++defaultConfig :: Config+defaultConfig = Config False Nothing False Nothing++options :: [OptDescr (Config -> Config)]+options = [+    Option [] ["nested"] (NoArg $ \c -> c {configNested = True}) ""+  , Option [] ["formatter"] (ReqArg (\s c -> c {configFormatter = Just s}) "FORMATTER") ""+  , Option [] ["module-name"] (ReqArg (\s c -> c {configModuleName = Just s}) "NAME") ""+  , Option [] ["no-main"] (NoArg $ \c   -> c {configNoMain = True}) ""+  ]++usage :: String -> String+usage prog = "\nUsage: " ++ prog ++ " SRC CUR DST [--module-name=NAME]\n"++parseConfig :: String -> [String] -> Either String Config+parseConfig prog args = case getOpt Permute options args of+    (opts, [], []) -> let+        c = (foldl (flip id) defaultConfig opts)+      in+        if (configNoMain c && isJust (configFormatter c))+           then+             formatError "option `--formatter=<fmt>' does not make sense with `--no-main'\n"+           else+             Right c+    (_, _, err:_)  -> formatError err+    (_, arg:_, _)  -> formatError ("unexpected argument `" ++ arg ++ "'\n")+  where+    formatError err = Left (prog ++ ": " ++ err ++ usage prog)
+ hspec-discover/src/Test/Hspec/Discover/Run.hs view
@@ -0,0 +1,151 @@+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, OverloadedStrings #-}+{-# OPTIONS_GHC -fno-warn-orphans #-}+-- | A preprocessor that finds and combines specs.+--+-- /NOTE:/ This module is not meant for public consumption.  For user+-- documentation look at http://hspec.github.io/hspec-discover.html.+module Test.Hspec.Discover.Run (+  run++-- exported for testing+, Spec(..)+, importList+, fileToSpec+, findSpecs+, getFilesRecursive+, driverWithFormatter+, moduleNameFromId+, pathToModule+) where+import           Control.Monad+import           Control.Applicative+import           Data.List+import           Data.Char+import           Data.Maybe+import           Data.String+import           System.Environment+import           System.Exit+import           System.IO+import           System.Directory (doesDirectoryExist, getDirectoryContents, doesFileExist)+import           System.FilePath hiding (combine)++import           Test.Hspec.Discover.Config++instance IsString ShowS where+  fromString = showString++data Spec = Spec {+  specFile :: FilePath+, specModule :: String+} deriving (Eq, Show)++run :: [String] -> IO ()+run args_ = do+  name <- getProgName+  case args_ of+    src : _ : dst : args -> case parseConfig name args of+      Left err -> do+        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!")+        specs <- findSpecs src+        writeFile dst (mkSpecModule src conf specs)+    _ -> do+      hPutStrLn stderr (usage name)+      exitFailure++mkSpecModule :: FilePath -> Config -> [Spec] -> String+mkSpecModule src conf nodes =+  ( "{-# LINE 1 " . shows src . " #-}\n"+  . showString "{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}\n"+  . showString ("module " ++ moduleName src conf ++" where\n")+  . importList nodes+  . showString "import Test.Hspec.Meta\n"+  . maybe driver driverWithFormatter (configFormatter conf)+  . showString "spec :: Spec\n"+  . showString "spec = "+  . formatSpecs nodes+  ) "\n"+  where+    driver =+        case configNoMain conf of+          False ->+              showString "main :: IO ()\n"+            . showString "main = hspec spec\n"+          True -> ""++moduleName :: FilePath -> Config -> String+moduleName src conf = fromMaybe (if configNoMain conf then pathToModule src else "Main") (configModuleName conf)++-- | Derive module name from specified path.+pathToModule :: FilePath -> String+pathToModule f = toUpper m:ms+  where+    fileName = last $ splitDirectories f+    m:ms = takeWhile (/='.') fileName++driverWithFormatter :: String -> ShowS+driverWithFormatter f =+    showString "import qualified " . showString (moduleNameFromId f) . showString "\n"+  . showString "main :: IO ()\n"+  . showString "main = hspecWithFormatter " . showString f . showString " spec\n"++-- | Return module name of a fully qualified identifier.+moduleNameFromId :: String -> String+moduleNameFromId = reverse . dropWhile (== '.') . dropWhile (/= '.') . reverse++-- | Generate imports for a list of specs.+importList :: [Spec] -> ShowS+importList = foldr (.) "" . map f+  where+    f :: Spec -> ShowS+    f spec = "import qualified " . showString (specModule spec) . "Spec\n"++-- | Combine a list of strings with (>>).+sequenceS :: [ShowS] -> ShowS+sequenceS = foldr (.) "" . intersperse " >> "++-- | Convert a list of specs to code.+formatSpecs :: [Spec] -> ShowS+formatSpecs xs+  | null xs   = "return ()"+  | otherwise = sequenceS (map formatSpec xs)++-- | Convert a spec to code.+formatSpec :: Spec -> ShowS+formatSpec (Spec file name) = "postProcessSpec " . shows file . " (describe " . shows name . " " . showString name . "Spec.spec)"++findSpecs :: FilePath -> IO [Spec]+findSpecs src = do+  let (dir, file) = splitFileName src+  mapMaybe (fileToSpec dir) . filter (/= file) <$> getFilesRecursive dir++fileToSpec :: FilePath -> FilePath -> Maybe Spec+fileToSpec dir file = case reverse $ splitDirectories file of+  x:xs -> case stripSuffix "Spec.hs" x <|> stripSuffix "Spec.lhs" x of+    Just name | isValidModuleName name && all isValidModuleName xs ->+      Just . Spec (dir </> file) $ (intercalate "." . reverse) (name : xs)+    _ -> Nothing+  _ -> Nothing+  where+    stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]+    stripSuffix suffix str = reverse <$> stripPrefix (reverse suffix) (reverse str)++-- See `Cabal.Distribution.ModuleName` (http://git.io/bj34)+isValidModuleName :: String -> Bool+isValidModuleName [] = False+isValidModuleName (c:cs) = isUpper c && all isValidModuleChar cs++isValidModuleChar :: Char -> Bool+isValidModuleChar c = isAlphaNum c || c == '_' || c == '\''++getFilesRecursive :: FilePath -> IO [FilePath]+getFilesRecursive baseDir = sort <$> go []+  where+    go :: FilePath -> IO [FilePath]+    go dir = do+      c <- map (dir </>) . filter (`notElem` [".", ".."]) <$> getDirectoryContents (baseDir </> dir)+      dirs <- filterM (doesDirectoryExist . (baseDir </>)) c >>= mapM go+      files <- filterM (doesFileExist . (baseDir </>)) c+      return (files ++ concat dirs)
hspec-meta.cabal view
@@ -1,5 +1,9 @@+-- This file has been generated from package.yaml by hpack version 0.15.0.+--+-- see: https://github.com/sol/hpack+ name:             hspec-meta-version:          2.2.1+version:          2.3.0 license:          MIT license-file:     LICENSE copyright:        (c) 2011-2015 Simon Hengel,@@ -17,23 +21,22 @@                   in-development version of Hspec.  extra-source-files:-  changelog+    changelog  source-repository head   type: git   location: https://github.com/hspec/hspec  library-  ghc-options:-      -Wall+  ghc-options: -Wall   hs-source-dirs:-      src, hspec-core/src/+      src+      hspec-core/src   build-depends:       base == 4.*-    , hspec-expectations     , transformers >= 0.2.2.0     , QuickCheck >= 2.5.1-+    , hspec-expectations     , HUnit     , setenv     , deepseq@@ -42,48 +45,60 @@     , ansi-terminal     , time     , async+    , call-stack   exposed-modules:       Test.Hspec.Meta   other-modules:       Test.Hspec-      Test.Hspec.Runner-      Test.Hspec.Formatters-      Test.Hspec.QuickCheck-      Test.Hspec.Discover       Test.Hspec.Core+      Test.Hspec.Discover+      Test.Hspec.Formatters       Test.Hspec.HUnit--      Test.Hspec.Core.Spec-      Test.Hspec.Core.Hooks-      Test.Hspec.Core.Runner-      Test.Hspec.Core.Formatters-      Test.Hspec.Core.QuickCheck-      Test.Hspec.Core.Util+      Test.Hspec.QuickCheck+      Test.Hspec.Runner       Test.Hspec.Compat+      Test.Hspec.Config       Test.Hspec.Core.Example-      Test.Hspec.Core.Tree-      Test.Hspec.Core.Spec.Monad+      Test.Hspec.Core.Formatters+      Test.Hspec.Core.Formatters.Internal+      Test.Hspec.Core.Hooks+      Test.Hspec.Core.QuickCheck       Test.Hspec.Core.QuickCheckUtil-      Test.Hspec.Config-      Test.Hspec.Options-      Test.Hspec.FailureReport+      Test.Hspec.Core.Runner       Test.Hspec.Core.Runner.Eval-      Test.Hspec.Core.Formatters.Internal+      Test.Hspec.Core.Spec+      Test.Hspec.Core.Spec.Monad+      Test.Hspec.Core.Tree+      Test.Hspec.Core.Util+      Test.Hspec.FailureReport+      Test.Hspec.Options       Test.Hspec.Timer+      Paths_hspec_meta   default-language: Haskell2010  executable hspec-meta-discover-  ghc-options:-      -Wall+  main-is: hspec-discover.hs   hs-source-dirs:       hspec-discover/src-  main-is:-      Main.hs-  other-modules:-      Run-      Config+      hspec-discover/driver+  ghc-options: -Wall   build-depends:       base == 4.*+    , transformers >= 0.2.2.0+    , QuickCheck >= 2.5.1+    , hspec-expectations+    , HUnit+    , setenv+    , deepseq+    , random+    , quickcheck-io+    , ansi-terminal+    , time+    , async+    , call-stack     , filepath     , directory+  other-modules:+      Test.Hspec.Discover.Config+      Test.Hspec.Discover.Run   default-language: Haskell2010
src/Test/Hspec/QuickCheck.hs view
@@ -1,8 +1,5 @@-{-# LANGUAGE CPP #-}-#if MIN_VERSION_base(4,8,1)-#define HAS_SOURCE_LOCATIONS-{-# LANGUAGE ImplicitParams #-}-#endif+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE ConstraintKinds #-} module Test.Hspec.QuickCheck ( -- * Params   modifyMaxSuccess@@ -13,9 +10,7 @@ , prop ) where -#ifdef HAS_SOURCE_LOCATIONS-import           GHC.Stack-#endif+import           Data.CallStack  import           Test.Hspec import           Test.QuickCheck@@ -29,9 +24,5 @@ -- -- > it ".." $ property $ -- >   ..-#ifdef HAS_SOURCE_LOCATIONS-prop :: (?loc :: CallStack, Testable prop) => String -> prop -> Spec-#else-prop :: (Testable prop) => String -> prop -> Spec-#endif+prop :: (HasCallStack, Testable prop) => String -> prop -> Spec prop s = it s . property