Stop built-in default templates

Pros:

- This made code complex
- Default template which can be forked seems to be useful

Cons:

- A bit slow
- Version conflict between hi and template may exist

Author: fujimura

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/template"]
+	path = test/template
+	url = git://github.com/fujimura/hi-hspec.git

hi.cabal

@@ -9,21 +9,6 @@ category:            Distribution
 build-type:          Simple
 cabal-version:       >=1.8
 homepage:            https://github.com/fujimura/hi
-data-files:
-    templates/flat/.gitignore.template
-    templates/flat/LICENSE.template
-    templates/flat/Main.hs.template
-    templates/flat/ModuleName.hs.template
-    templates/flat/README.md.template
-    templates/flat/package-name.cabal.template
-    templates/hspec/.gitignore.template
-    templates/hspec/LICENSE.template
-    templates/hspec/README.md.template
-    templates/hspec/package-name.cabal.template
-    templates/hspec/src/ModuleName.hs.template
-    templates/hspec/src/ModuleName/Internal.hs.template
-    templates/hspec/test/ModuleNameSpec.hs.template
-    templates/hspec/test/Spec.hs.template
 description:
     This application generates a scaffold for Haskell project from a Git repository.
 

src/Hi.hs

@@ -32,8 +32,6 @@ run option@(Option {templateSource}) = do
     postProcess option
   where
     sourceName (FromRepo repository) = "git repository:" ++ Git.expandUrl repository
-    sourceName BuiltInHSpec          = "built in template: HSpec"
-    sourceName BuiltInFlat           = "built in template: Flat"
 
 -- |Write given 'Files' to filesystem.
 writeFiles :: Files -> IO ()

src/Hi/CommandLineOption.hs

@@ -10,7 +10,6 @@ data CommandLineOption = CommandLineOption
                        , packageName             :: Maybe String
                        , author                  :: Maybe String
                        , email                   :: Maybe String
-                       , template                :: Maybe String
                        , repository              :: Maybe String
                        , configFilePath          :: Maybe String
                        , initializeGitRepository :: Maybe Bool
@@ -22,7 +21,6 @@ commandLineOption = CommandLineOption
    <*> optional ( strOption ( short 'p' <> long "packageName" <> metavar "package-name" <> help "Name of package" ))
    <*> optional ( strOption ( short 'a' <> long "author"      <> metavar "NAME"         <> help "Name of the project's author" ))
    <*> optional ( strOption ( short 'e' <> long "email"       <> metavar "EMAIL"        <> help "Email address of the maintainer" ))
-   <*> optional ( strOption ( short 't' <> long "template"    <> metavar "hspec/flat"   <> help "Template to be used" ))
    <*> optional ( strOption ( short 'r' <> long "repository"  <> metavar "REPOSITORY"   <> help "Template repository" ))
    <*> optional ( strOption ( long "configuration-file"       <> help "Use specified configuration file"))
    <*> optional ( switch    ( long "initialize-git-repository" <> help "Initialize with git repository"))

src/Hi/Option.hs

@@ -78,11 +78,7 @@ buildOption copt = do
         (y,_,_) <- (toGregorian . utctDay) <$> getCurrentTime
         return $ show y
     guessTemplate :: IO TemplateSource
-    guessTemplate = do
-      return $ case CommandLineOption.template copt of
-                 Just "hspec" -> BuiltInHSpec
-                 Just "flat"  -> BuiltInFlat
-                 _            -> fromMaybe BuiltInHSpec $ FromRepo <$> CommandLineOption.repository copt
+    guessTemplate = return . FromRepo $ maybe defaultRepo id (CommandLineOption.repository copt)
 
 defaultRepo :: String
 defaultRepo = "git://github.com/fujimura/hi-hspec.git"

src/Hi/Template.hs

@@ -5,7 +5,6 @@ module Hi.Template
     , untemplate
     ) where
 
-import           Control.Exception   (bracket_)
 import           Hi.Directory        (inTemporaryDirectory)
 import qualified Hi.Git              as Git
 import           Hi.Types
@@ -16,48 +15,15 @@ import qualified Data.ByteString     as BS (readFile)
 import           Data.List           (isSuffixOf)
 import           Data.List.Split     (splitOn)
 
-import           Paths_hi            (getDataDir)
-import           System.Directory
-import           System.FilePath
-
 -- | Read templates in given 'FilePath'
 readTemplates :: TemplateSource -> IO Files
-readTemplates BuiltInHSpec = readBuiltInTemplate "hspec"
-readTemplates BuiltInFlat  = readBuiltInTemplate "flat"
 readTemplates (FromRepo repo) =
     inTemporaryDirectory "hi" $ do
         -- TODO Handle error
         _ <- Git.clone $ Git.expandUrl repo
         paths <- Git.lsFiles
         mapM fetchFile paths
 
-readBuiltInTemplate :: String -> IO Files
-readBuiltInTemplate dir = do
-    root <- getDataDir
-    inDirectory (root </> "templates" </> dir) $ do
-      paths <- getDirectoryContentsRecursively "./"
-      mapM fetchFile paths
-
-inDirectory :: FilePath -> IO a -> IO a
-inDirectory path action = do
-    pwd <- getCurrentDirectory
-    let go    = setCurrentDirectory path
-        back  = setCurrentDirectory pwd
-    bracket_ go back action
-
-getDirectoryContentsRecursively :: FilePath -> IO [FilePath]
-getDirectoryContentsRecursively path = go [path]
-  where
-    go :: [FilePath] -> IO [FilePath]
-    go [] = return []
-    go (x:xs) = do
-       isDir <- doesDirectoryExist x
-       if isDir then do
-                  xs' <- filter (/= "..") <$> filter (/= ".") <$> getDirectoryContents x
-                  go (xs ++ map (x </>) xs')
-                else
-                  (x:) <$> go xs
-
 fetchFile :: FilePath -> IO File
 fetchFile fp | isTemplate fp = TemplateFile fp <$> BS.readFile fp
              | otherwise     = RegularFile  fp <$> BS.readFile fp

src/Hi/Types.hs

@@ -12,7 +12,7 @@ import Data.ByteString (ByteString)
 data File = TemplateFile { getFilePath :: FilePath, getFileContents :: ByteString } |
             RegularFile  { getFilePath :: FilePath, getFileContents :: ByteString } deriving (Show)
 
-data TemplateSource = FromRepo String | BuiltInHSpec | BuiltInFlat deriving (Eq,Ord,Show)
+data TemplateSource = FromRepo String deriving (Eq,Ord,Show)
 
 type Files = [File]