Cleanup of cli template.

Author: markhibberd

.gitignore

@@ -9,3 +9,4 @@ cabal-dev
 .cabal-sandbox
 cabal.sandbox.config
 /tmp
+/gen

Setup.hs

@@ -20,25 +20,31 @@ main :: IO ()
 main =
   let hooks = simpleUserHooks
    in defaultMainWithHooks hooks {
-     buildHook = \pd lbi uh flags -> do
-       genBuildInfo (fromFlag $ buildVerbosity flags) pd lbi
+     preConf = \args flags -> do
+       createDirectoryIfMissingVerbose silent True "gen"
+       (preConf hooks) args flags
+   , sDistHook  = \pd mlbi uh flags -> do
+       genBuildInfo silent pd
+       (sDistHook hooks) pd mlbi uh flags
+   , buildHook = \pd lbi uh flags -> do
+       genBuildInfo (fromFlag $ buildVerbosity flags) pd
        (buildHook hooks) pd lbi uh flags
    , replHook = \pd lbi uh flags args -> do
-       genBuildInfo (fromFlag $ replVerbosity flags) pd lbi
+       genBuildInfo (fromFlag $ replVerbosity flags) pd
        (replHook hooks) pd lbi uh flags args
    , testHook = \args pd lbi uh flags -> do
-       genBuildInfo (fromFlag $ testVerbosity flags) pd lbi
+       genBuildInfo (fromFlag $ testVerbosity flags) pd
        (testHook hooks) args pd lbi uh flags
    }
 
-genBuildInfo :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
-genBuildInfo verbosity pkg info = do
-  createDirectoryIfMissingVerbose verbosity True (autogenModulesDir info)
+genBuildInfo :: Verbosity -> PackageDescription -> IO ()
+genBuildInfo verbosity pkg = do
+  createDirectoryIfMissingVerbose verbosity True "gen"
   let (PackageName pname) = pkgName . package $ pkg
       version = pkgVersion . package $ pkg
       name = "BuildInfo_" ++ (map (\c -> if c == '-' then '_' else c) pname)
-      targetHs = autogenModulesDir info </> name <.> "hs"
-      targetText = autogenModulesDir info </> "version.txt"
+      targetHs = "gen" </> name <.> "hs"
+      targetText = "gen" </> "version.txt"
   t <- timestamp
   gv <- gitVersion
   let v = showVersion version

main/project.hs

@@ -1,10 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-import           BuildInfo_project
-
-import           Data.String
-import qualified Data.Text as T
+import           BuildInfo_ambiata_project
 
 import           Options.Applicative
 
@@ -20,59 +17,22 @@ main = do
   hSetBuffering stderr LineBuffering
   dispatch parser >>= \sc ->
     case sc of
-      Version ->
+      VersionCommand ->
         putStrLn buildInfoVersion >> exitSuccess
       RunCommand DryRun c ->
-        print (renderCommand c) >> exitSuccess
+        print c >> exitSuccess
       RunCommand RealRun c ->
         run c
 
+parser :: Parser (SafeCommand Command)
+parser =
+  safeCommand $ pure Command
+
 run :: Command -> IO ()
 run c = case c of
-  CommandInputs name ->
-    putStrLn (T.unpack name)
-
-
--------------
--- DATA TYPES
--------------
-
--- | This application can be run for real
--- | or just return a description of what it is about to do
-data RunType =
-  DryRun | RealRun
-  deriving (Eq, Show)
-
-data SafeCommand =
-  Version
-  | RunCommand RunType Command
-  deriving (Eq, Show)
+  Command ->
+    putStrLn "*implement me*" >> exitFailure
 
 data Command =
-  CommandInputs T.Text
+  Command
   deriving (Eq, Show)
-
-renderCommand :: Command -> String
-renderCommand (CommandInputs name) =
-   T.unpack $
-    T.concat
-    [ "CommandInputs("
-    , "name=", name, ")"
-    ]
-
-
-----------
--- PARSERS
-----------
-
-parser :: Parser SafeCommand
-parser =
-  Version <$ flag' () (short 'v' <> long "version" <> help "Version information")
-  <|> RunCommand <$> flag RealRun DryRun (long "dry-run" <> hidden) <*> commandP'
-
-commandP' :: Parser Command
-commandP' = CommandInputs <$> name'
-
-name' :: Parser T.Text
-name'= fmap T.pack $ argument str $
-     metavar "VIEW-NAME"

project.cabal

@@ -1,4 +1,4 @@
-name:                  project
+name:                  ambiata-project
 version:               0.0.1
 license:               AllRightsReserved
 author:                Ambiata <[email protected]>
@@ -13,22 +13,20 @@ description:           project
 library
   build-depends:
                       base                            >= 3          && < 5
-                    , attoparsec                      == 0.12.*
+                    , ambiata-p
                     , either                          >= 4.4.1      && < 4.5
-                    , p
-                    , text
+                    , text                            == 1.2.*
 
   ghc-options:
                     -Wall
 
   hs-source-dirs:
-                    src
+                    src gen
 
   exposed-modules:
-                    Paths_project
+                    Paths_ambiata_project
+                    BuildInfo_ambiata_project
                     Project
-                    Project.Data
-                    Project.Error
 
 executable project
   ghc-options:
@@ -39,11 +37,11 @@ executable project
 
   build-depends:
                       base
-                    , project
+                    , ambiata-project
+                    , ambiata-p
+                    , ambiata-x-optparse
                     , optparse-applicative            == 0.11.*
-                    , p
                     , text
-                    , x-optparse
 
 
 test-suite test
@@ -61,10 +59,10 @@ test-suite test
 
   build-depends:
                       base                            >= 3          && < 5
-                    , project
-                    , disorder-core
-                    , disorder-corpus
-                    , p
+                    , ambiata-project
+                    , ambiata-disorder-core
+                    , ambiata-disorder-corpus
+                    , ambiata-p
                     , QuickCheck                      == 2.7.*
                     , quickcheck-instances            == 0.3.*
 
@@ -83,10 +81,10 @@ test-suite test-io
 
   build-depends:
                       base                            >= 3          && < 5
-                    , project
-                    , disorder-core
-                    , disorder-corpus
-                    , p
+                    , ambiata-project
+                    , ambiata-disorder-core
+                    , ambiata-disorder-corpus
+                    , ambiata-p
                     , text
                     , QuickCheck                      == 2.7.*
                     , quickcheck-instances            == 0.3.*
@@ -106,5 +104,5 @@ test-suite test-cli
 
   build-depends:
                       base                            >= 3          && < 5
-                    , project
-                    , disorder-core
+                    , ambiata-project
+                    , ambiata-disorder-core

src/Project.hs

@@ -1,4 +1,2 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE OverloadedStrings #-}
 module Project where

src/Project/Data.hs

@@ -1,9 +1,6 @@
 import           Disorder.Core.Main
 
-import qualified Test.IO.Project.IO
-
 main :: IO ()
 main =
   disorderMain [
-      Test.IO.Project.IO.tests
     ]