Reorganize modules

Author: fujimura

hi.cabal

@@ -52,6 +52,7 @@ description:
 library
   exposed-modules:
       Hi
+      Hi.Cli
       Hi.Directory
       Hi.FilePath
       Hi.Git
@@ -81,7 +82,7 @@ library
 
 executable hi
   main-is:
-      Cli.hs
+      Main.hs
   ghc-options:
       -Wall
   hs-source-dirs:

src/Cli.hs src/Hi/Cli.hssrc/Cli.hs renamed to src/Hi/Cli.hs

@@ -1,6 +1,5 @@
-module Cli
-  ( main
-  , runWithArgs
+module Hi.Cli
+  ( run
   ) where
 
 import qualified Hi
@@ -11,15 +10,11 @@ import qualified Hi.Version                   as Version
 
 import           Data.Monoid                  (mempty)
 import           Options.Applicative
-import           System.Environment           (getArgs)
 import qualified Text.PrettyPrint.ANSI.Leijen as PP
 
-main :: IO ()
-main = getArgs >>= runWithArgs
-
-runWithArgs :: [String] -> IO ()
-runWithArgs []   = showHelpText (prefs idm) opts
-runWithArgs args = (handleParseResult $ execParserPure (prefs idm) opts args) >>= buildOption >>= Hi.run
+run :: [String] -> IO ()
+run []   = showHelpText (prefs idm) opts
+run args = (handleParseResult $ execParserPure (prefs idm) opts args) >>= buildOption >>= Hi.run
 
 opts :: ParserInfo CommandLineOption
 opts = info (helper <*> (version <*> commandLineOption))

src/Main.hs

@@ -0,0 +1,9 @@
+module Main
+  ( main
+  ) where
+
+import           Hi.Cli             (run)
+import           System.Environment (getArgs)
+
+main :: IO ()
+main = getArgs >>= run

test/FeatureSpec.hs

@@ -2,7 +2,7 @@
 
 module FeatureSpec ( spec ) where
 
-import           Cli                 as Cli
+import qualified Hi.Cli              as Cli
 import           Hi.Directory        (inDirectory)
 import           Hi.Version          (version)
 
@@ -39,10 +39,10 @@ spec = do
 
     describe "with --initialize-git-repository" $ do
       let cmd = runWithCommandLineOptions [ "--initialize-git-repository"
-                                              , "-p"
-                                              , packageName
-                                              , "-m"
-                                              , moduleName ]
+                                          , "-p"
+                                          , packageName
+                                          , "-m"
+                                          , moduleName ]
       around cmd $ do
         it "should initialize it as git repository and make first commit" $ do
           inDirectory "./testapp" $ do
@@ -53,7 +53,7 @@ spec = do
         let handle ExitSuccess   = return ()
             handle e             = throwIO e
 
-        (res,_) <- capture $ Cli.runWithArgs ["-v"] `catch` handle
+        (res,_) <- capture $ Cli.run ["-v"] `catch` handle
         res `shouldBe` version ++ "\n"
 
 packageName, moduleName, author, email :: String
@@ -146,10 +146,10 @@ runWithCommandLineOptions opts action = do
     pwd <- getCurrentDirectory
 
     inTestDirectory $ do
-      Cli.runWithArgs $ opts ++ [ "-a", quote author
-                                , "-e", quote email
-                                , "-r file://" ++ pwd ++ "/template"
-                                ]
+      Cli.run $ opts ++ [ "-a", quote author
+                        , "-e", quote email
+                        , "-r file://" ++ pwd ++ "/template"
+                        ]
       action
 
 runWithLocalGitConfig :: [String] -> IO () -> IO ()
@@ -160,10 +160,10 @@ runWithLocalGitConfig opts action = do
         _ <- system $ "git init"
         _ <- system $ "git config user.name" ++ " " ++ quote author
         _ <- system $ "git config user.email" ++ " " ++ quote email
-        Cli.runWithArgs $ opts ++ [ "-a", quote author
-                                  , "-e", quote email
-                                  , "-r file://" ++ pwd ++ "/template"
-                                  ]
+        Cli.run $ opts ++ [ "-a", quote author
+                          , "-e", quote email
+                          , "-r file://" ++ pwd ++ "/template"
+                          ]
         action
 
 inTestDirectory :: IO () -> IO ()