haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Break out the check for numeric-only words into a separate function, with comments

Browse Source
This commit is contained in:
Maximilian Tagher 2014-06-06 13:00:52 -07:00
parent 62877cbba0
commit 5b5caf2ad4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yesod-bin/Scaffolding/Scaffolder.hs
View File

@ -70,14 +70,18 @@ validPN c
validPN '-' = True validPN '-' = True
validPN _ = False validPN _ = False
-- | Cabal separates packages with a hyphen into words. A word can't consist of only digits
-- <http://www.haskell.org/ghc/docs/7.0.3/html/Cabal/packages.html Relevant Cabal Docs>
-- Fixes <https://github.com/yesodweb/yesod/issues/550 #550>
wordsHaveOneCharacter :: String -> Bool
wordsHaveOneCharacter s = not $ any (all isDigit) (splitOn "-" s)
scaffold :: Bool -- ^ bare directory instead of a new subdirectory? scaffold :: Bool -- ^ bare directory instead of a new subdirectory?
-> IO () -> IO ()
scaffold isBare = do scaffold isBare = do
puts $ renderTextUrl undefined $(textFile "input/welcome.cg") puts $ renderTextUrl undefined $(textFile "input/welcome.cg")
project <- prompt $ \s -> project <- prompt $ \s ->
if all validPN s && not (null s) && s /= "test" && (not $ any (all isDigit) (splitOn "-" s)) if all validPN s && not (null s) && s /= "test" && wordsHaveOneCharacter s
then Just s then Just s
else Nothing else Nothing
let dir = project let dir = project