1 files changed, 24 insertions, 19 deletions
diff --git a/src/Config.hs b/src/Config.hs
index 7f5895c..adf0321 100644
--- a/src/Config.hs
+++ b/src/Config.hs
@@ -2,11 +2,13 @@ module Config (
     Config(..),
     findConfig,
     parseConfig,
+    getConfigTestFiles,
 ) where
 
 import Control.Monad.Combinators
 
 import Data.ByteString.Lazy qualified as BS
+import Data.Scientific
 import Data.Text qualified as T
 import Data.YAML
 
@@ -16,31 +18,31 @@ import System.FilePath
 import System.FilePath.Glob
 
 data Config = Config
-    { configTool :: Maybe FilePath
-    , configTests :: [Pattern]
+    { configDir :: FilePath
+    , configTool :: Maybe FilePath
+    , configTests :: [ Pattern ]
+    , configTimeout :: Maybe Scientific
     }
     deriving (Show)
 
-instance Semigroup Config where
-    a <> b = Config
-        { configTool = maybe (configTool b) Just (configTool a)
-        , configTests = configTests a ++ configTests b
-        }
-
-instance Monoid Config where
-    mempty = Config
-        { configTool = Nothing
-        , configTests = []
-        }
-
-instance FromYAML Config where
-    parseYAML = withMap "Config" $ \m -> Config
-        <$> (fmap T.unpack <$> m .:? "tool")
-        <*> (map (compile . T.unpack) <$> foldr1 (<|>)
+instance FromYAML (FilePath -> Config) where
+    parseYAML = withMap "Config" $ \m -> do
+        configTool <- (fmap T.unpack <$> m .:? "tool")
+        configTests <- (map (compile . T.unpack) <$> foldr1 (<|>)
                 [ fmap (:[]) (m .: "tests") -- single pattern
                 , m .:? "tests" .!= []      -- list of patterns
                 ]
             )
+        configTimeout <- fmap fromNumber <$> m .:! "timeout"
+        return $ \configDir -> Config {..}
+
+newtype Number = Number { fromNumber :: Scientific }
+
+instance FromYAML Number where
+    parseYAML = \case
+        Scalar _ (SFloat x) -> return $ Number $ realToFrac x
+        Scalar _ (SInt x) -> return $ Number $ fromIntegral x
+        node -> typeMismatch "int or float" node
 
 findConfig :: IO (Maybe FilePath)
 findConfig = go "."
@@ -63,4 +65,7 @@ parseConfig path = do
         Left (pos, err) -> do
             putStr $ prettyPosWithSource pos contents err
             exitFailure
-        Right conf -> return conf
+        Right conf -> return $ conf $ takeDirectory path
+
+getConfigTestFiles :: Config -> IO [ FilePath ]
+getConfigTestFiles config = concat <$> mapM (flip globDir1 $ configDir config) (configTests config)