Merge pull request #53 from everythingfunctional/finishCommands

Finish commands

Author: everythingfunctional

app/Main.hs

@@ -28,6 +28,7 @@ import           Options.Applicative            ( Parser
 import           System.Directory               ( doesDirectoryExist
                                                 , doesFileExist
                                                 )
+import           System.Process                 ( runCommand )
 import           Toml                           ( TomlCodec
                                                 , (.=)
                                                 )
@@ -40,6 +41,7 @@ data TomlSettings = TomlSettings {
     , tomlSettingsProjectName :: String
     , tomlSettingsLibrary :: (Maybe Library)
     , tomlSettingsExecutables :: [Executable]
+    , tomlSettingsTests :: [Executable]
 }
 
 data AppSettings = AppSettings {
@@ -49,6 +51,7 @@ data AppSettings = AppSettings {
     , appSettingsFlags :: [String]
     , appSettingsLibrary :: (Maybe Library)
     , appSettingsExecutables :: [Executable]
+    , appSettingsTests :: [Executable]
 }
 
 data Library = Library { librarySourceDir :: String }
@@ -74,18 +77,38 @@ main = do
 
 app :: Arguments -> AppSettings -> IO ()
 app args settings = case command' args of
-  Run   -> putStrLn "Run"
-  Test  -> putStrLn "Test"
   Build -> build settings
+  Run   -> do
+    build settings
+    let buildPrefix = appSettingsBuildPrefix settings
+    let
+      executableNames = map
+        (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } ->
+          sourceDir </> name
+        )
+        (appSettingsExecutables settings)
+    let executables = map (buildPrefix </>) executableNames
+    mapM_ runCommand executables
+  Test -> do
+    build settings
+    let buildPrefix = appSettingsBuildPrefix settings
+    let
+      executableNames = map
+        (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } ->
+          sourceDir </> name
+        )
+        (appSettingsTests settings)
+    let executables = map (buildPrefix </>) executableNames
+    mapM_ runCommand executables
 
 build :: AppSettings -> IO ()
 build settings = do
-  putStrLn "Building"
   let compiler    = appSettingsCompiler settings
   let projectName = appSettingsProjectName settings
   let buildPrefix = appSettingsBuildPrefix settings
   let flags       = appSettingsFlags settings
   let executables = appSettingsExecutables settings
+  let tests       = appSettingsTests settings
   executableDepends <- case appSettingsLibrary settings of
     Just librarySettings -> do
       let librarySourceDir' = librarySourceDir librarySettings
@@ -112,6 +135,19 @@ build settings = do
                      mainFile
     )
     executables
+  mapM_
+    (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } ->
+      do
+        buildProgram sourceDir
+                     executableDepends
+                     [".f90", ".f", ".F", ".F90", ".f95", ".f03"]
+                     (buildPrefix </> sourceDir)
+                     compiler
+                     flags
+                     name
+                     mainFile
+    )
+    tests
 
 getArguments :: IO Arguments
 getArguments = execParser
@@ -159,6 +195,8 @@ settingsCodec =
     .=  tomlSettingsLibrary
     <*> Toml.list executableCodec "executable"
     .=  tomlSettingsExecutables
+    <*> Toml.list executableCodec "test"
+    .=  tomlSettingsTests
 
 libraryCodec :: TomlCodec Library
 libraryCodec = Library <$> Toml.string "source-dir" .= librarySourceDir
@@ -180,6 +218,7 @@ toml2AppSettings tomlSettings release = do
   executableSettings <- getExecutableSettings
     (tomlSettingsExecutables tomlSettings)
     projectName
+  testSettings <- getTestSettings $ tomlSettingsTests tomlSettings
   return AppSettings
     { appSettingsCompiler    = tomlSettingsCompiler tomlSettings
     , appSettingsProjectName = projectName
@@ -212,6 +251,7 @@ toml2AppSettings tomlSettings release = do
                                    ]
     , appSettingsLibrary     = librarySettings
     , appSettingsExecutables = executableSettings
+    , appSettingsTests       = testSettings
     }
 
 getLibrarySettings :: Maybe Library -> IO (Maybe Library)
@@ -239,3 +279,20 @@ getExecutableSettings [] projectName = do
         else return []
     else return []
 getExecutableSettings executables _ = return executables
+
+getTestSettings :: [Executable] -> IO [Executable]
+getTestSettings [] = do
+  defaultDirectoryExists <- doesDirectoryExist "test"
+  if defaultDirectoryExists
+    then do
+      defaultMainExists <- doesFileExist ("test" </> "main.f90")
+      if defaultMainExists
+        then return
+          [ Executable { executableSourceDir = "test"
+                       , executableMainFile  = "main.f90"
+                       , executableName      = "runTests"
+                       }
+          ]
+        else return []
+    else return []
+getTestSettings tests = return tests

example_project/test/main.f90

@@ -0,0 +1,3 @@
+program runTests
+    print *, "Running Tests"
+end program runTests