Enable reading in dependencies

3 files changed, 103 insertions, 31 deletions

diff --git a/src/Fpm.hs b/src/Fpm.hs
index 3f06c05..0392fa3 100644
--- a/src/Fpm.hs
+++ b/src/Fpm.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Fpm
@@ -11,6 +12,7 @@ where
 import           Build                          ( buildLibrary
                                                 , buildProgram
                                                 )
+import qualified Data.Map                      as Map
 import qualified Data.Text.IO                  as TIO
 import           Development.Shake              ( FilePattern
                                                 , (<//>)
@@ -22,6 +24,7 @@ import           Development.Shake.FilePath     ( (</>)
                                                 )
 import           Options.Applicative            ( Parser
                                                 , (<**>)
+                                                , (<|>)
                                                 , command
                                                 , execParser
                                                 , fullDesc
@@ -51,6 +54,7 @@ data TomlSettings = TomlSettings {
     , tomlSettingsLibrary :: (Maybe Library)
     , tomlSettingsExecutables :: [Executable]
     , tomlSettingsTests :: [Executable]
+    , tomlSettingsDependencies :: (Map.Map String Version)
 }
 
 data AppSettings = AppSettings {
@@ -61,6 +65,7 @@ data AppSettings = AppSettings {
     , appSettingsLibrary :: (Maybe Library)
     , appSettingsExecutables :: [Executable]
     , appSettingsTests :: [Executable]
+    , appSettingsDependencies :: (Map.Map String Version)
 }
 
 data Library = Library { librarySourceDir :: String }
@@ -71,6 +76,12 @@ data Executable = Executable {
     , executableName :: String
 }
 
+data Version = SimpleVersion String | GitVersion GitVersionSpec
+
+data GitVersionSpec = GitVersionSpec { gitVersionSpecUrl :: String, gitVersionSpecRef :: Maybe GitRef }
+
+data GitRef = Tag String | Branch String | Commit String
+
 data Command = Run | Test | Build
 
 start :: Arguments -> IO ()
@@ -211,6 +222,8 @@ settingsCodec =
     .=  tomlSettingsExecutables
     <*> Toml.list executableCodec "test"
     .=  tomlSettingsTests
+    <*> Toml.tableMap Toml._KeyString versionCodec "dependencies"
+    .=  tomlSettingsDependencies
 
 libraryCodec :: TomlCodec Library
 libraryCodec = Library <$> Toml.string "source-dir" .= librarySourceDir
@@ -225,6 +238,50 @@ executableCodec =
     <*> Toml.string "name"
     .=  executableName
 
+matchSimpleVersion :: Version -> Maybe String
+matchSimpleVersion = \case
+  SimpleVersion v -> Just v
+  _               -> Nothing
+
+matchGitVersion :: Version -> Maybe GitVersionSpec
+matchGitVersion = \case
+  GitVersion v -> Just v
+  _            -> Nothing
+
+matchTag :: GitRef -> Maybe String
+matchTag = \case
+  Tag v -> Just v
+  _     -> Nothing
+
+matchBranch :: GitRef -> Maybe String
+matchBranch = \case
+  Branch v -> Just v
+  _        -> Nothing
+
+matchCommit :: GitRef -> Maybe String
+matchCommit = \case
+  Commit v -> Just v
+  _        -> Nothing
+
+versionCodec :: Toml.Key -> Toml.TomlCodec Version
+versionCodec key =
+  Toml.dimatch matchSimpleVersion SimpleVersion (Toml.string key)
+    <|> Toml.dimatch matchGitVersion GitVersion (Toml.table gitVersionCodec key)
+
+gitVersionCodec :: Toml.TomlCodec GitVersionSpec
+gitVersionCodec =
+  GitVersionSpec
+    <$> Toml.string "git"
+    .=  gitVersionSpecUrl
+    <*> Toml.dioptional gitRefCodec
+    .=  gitVersionSpecRef
+
+gitRefCodec :: Toml.TomlCodec GitRef
+gitRefCodec =
+  Toml.dimatch matchTag Tag (Toml.string "tag")
+    <|> Toml.dimatch matchBranch Branch (Toml.string "branch")
+    <|> Toml.dimatch matchCommit Commit (Toml.string "rev")
+
 toml2AppSettings :: TomlSettings -> Bool -> IO AppSettings
 toml2AppSettings tomlSettings release = do
   let projectName = tomlSettingsProjectName tomlSettings
@@ -235,36 +292,38 @@ toml2AppSettings tomlSettings release = do
     projectName
   testSettings <- getTestSettings $ tomlSettingsTests tomlSettings
   buildPrefix  <- makeBuildPrefix compiler release
+  let dependencies = tomlSettingsDependencies tomlSettings
   return AppSettings
-    { appSettingsCompiler    = compiler
-    , appSettingsProjectName = projectName
-    , appSettingsBuildPrefix = buildPrefix
-    , appSettingsFlags       = if release
-                                 then
-                                   [ "-Wall"
-                                   , "-Wextra"
-                                   , "-Wimplicit-interface"
-                                   , "-fPIC"
-                                   , "-fmax-errors=1"
-                                   , "-O3"
-                                   , "-march=native"
-                                   , "-ffast-math"
-                                   , "-funroll-loops"
-                                   ]
-                                 else
-                                   [ "-Wall"
-                                   , "-Wextra"
-                                   , "-Wimplicit-interface"
-                                   , "-fPIC"
-                                   , "-fmax-errors=1"
-                                   , "-g"
-                                   , "-fbounds-check"
-                                   , "-fcheck-array-temporaries"
-                                   , "-fbacktrace"
-                                   ]
-    , appSettingsLibrary     = librarySettings
-    , appSettingsExecutables = executableSettings
-    , appSettingsTests       = testSettings
+    { appSettingsCompiler     = compiler
+    , appSettingsProjectName  = projectName
+    , appSettingsBuildPrefix  = buildPrefix
+    , appSettingsFlags        = if release
+                                  then
+                                    [ "-Wall"
+                                    , "-Wextra"
+                                    , "-Wimplicit-interface"
+                                    , "-fPIC"
+                                    , "-fmax-errors=1"
+                                    , "-O3"
+                                    , "-march=native"
+                                    , "-ffast-math"
+                                    , "-funroll-loops"
+                                    ]
+                                  else
+                                    [ "-Wall"
+                                    , "-Wextra"
+                                    , "-Wimplicit-interface"
+                                    , "-fPIC"
+                                    , "-fmax-errors=1"
+                                    , "-g"
+                                    , "-fbounds-check"
+                                    , "-fcheck-array-temporaries"
+                                    , "-fbacktrace"
+                                    ]
+    , appSettingsLibrary      = librarySettings
+    , appSettingsExecutables  = executableSettings
+    , appSettingsTests        = testSettings
+    , appSettingsDependencies = dependencies
     }
 
 getLibrarySettings :: Maybe Library -> IO (Maybe Library)
diff --git a/stack.yaml b/stack.yaml
index 52fe5e4..68dcaaa 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -39,7 +39,9 @@ packages:
 # - git: https://github.com/commercialhaskell/stack.git
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
 #
-# extra-deps: []
+extra-deps:
+- git: https://github.com/kowainik/tomland.git
+  commit: 536a5e6ffb148d0dd4e4c4b120913a6744097676
 
 # Override default flag values for local packages and extra-deps
 # flags: {}
diff --git a/stack.yaml.lock b/stack.yaml.lock
index e24dcac..31e0c19 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -3,7 +3,18 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages: []
+packages:
+- completed:
+    name: tomland
+    version: 1.3.0.0
+    git: https://github.com/kowainik/tomland.git
+    pantry-tree:
+      size: 5000
+      sha256: 68d6f9a3e4c20cc4645374b30000017a75c4ab1c131590538edad2ea0e4a53bd
+    commit: 536a5e6ffb148d0dd4e4c4b120913a6744097676
+  original:
+    git: https://github.com/kowainik/tomland.git
+    commit: 536a5e6ffb148d0dd4e4c4b120913a6744097676
 snapshots:
 - completed:
     size: 524996