yesod-bin 1.5.2.4 → 1.5.2.5

raw patch · 4 files changed

+27/−9 lines, 4 files

Files

• AddHandler.hs +21/−7
• ChangeLog.md +4/−0
• Devel.hs +1/−1
• yesod-bin.cabal +1/−1

@@ -5,9 +5,13 @@ import System.IO  (hFlush, stdout) import Data.Char  (isLower, toLower, isSpace) import Data.List  (isPrefixOf, isSuffixOf, stripPrefix)-import Data.Maybe (fromMaybe)+import Data.Maybe (fromMaybe, listToMaybe) import qualified Data.Text as T import qualified Data.Text.IO as TIO+import Distribution.PackageDescription.Parse (readPackageDescription)+import Distribution.PackageDescription.Configuration (flattenPackageDescription)+import Distribution.PackageDescription (allBuildInfo, hsSourceDirs)+import Distribution.Verbosity (normal) import System.Directory (getDirectoryContents, doesFileExist) import Control.Monad (unless) @@ -31,7 +35,7 @@ addHandler :: Maybe String -> Maybe String -> [String] -> IO () addHandler (Just route) pat met = do     cabal <- getCabal-    checked <- checkRoute route+    checked <- checkRoute route cabal     let routePair = case checked of           Left err@EmptyRoute -> (error . show) err           Left err@RouteCaseError -> (error . show) err@@ -54,7 +58,7 @@         putStr "Name of route (without trailing R): "         hFlush stdout         name <- getLine-        checked <- checkRoute name+        checked <- checkRoute name cabal         case checked of             Left err@EmptyRoute -> (error . show) err             Left err@RouteCaseError -> print err >> routeInput@@ -75,7 +79,9 @@  addHandlerFiles :: FilePath -> (String, FilePath) -> String -> String -> IO () addHandlerFiles cabal (name, handlerFile) pattern methods = do-    modify "Application.hs" $ fixApp name+    src <- getSrcDir cabal+    let applicationFile = concat [src, "/Application.hs"]+    modify applicationFile $ fixApp name     modify cabal $ fixCabal name     modify "config/routes" $ fixRoutes name pattern methods     writeFile handlerFile $ mkHandler name pattern methods@@ -94,15 +100,16 @@         [] -> error "No cabal file found"         _ -> error "Too many cabal files found" -checkRoute :: String -> IO (Either RouteError (String, FilePath))-checkRoute name =+checkRoute :: String -> FilePath -> IO (Either RouteError (String, FilePath))+checkRoute name cabal =     case name of         [] -> return $ Left EmptyRoute         c:_             | isLower c -> return $ Left RouteCaseError             | otherwise -> do                 -- Check that the handler file doesn't already exist-                let handlerFile = concat ["Handler/", name, ".hs"]+                src <- getSrcDir cabal+                let handlerFile = concat [src, "/Handler/", name, ".hs"]                 exists <- doesFileExist handlerFile                 if exists                     then (return . Left . RouteExists) handlerFile@@ -214,3 +221,10 @@ uncapitalize :: String -> String uncapitalize (x:xs) = toLower x : xs uncapitalize "" = ""++getSrcDir :: FilePath -> IO FilePath+getSrcDir cabal = do+    pd <- flattenPackageDescription <$> readPackageDescription normal cabal+    let buildInfo = allBuildInfo pd+        srcDirs = concatMap hsSourceDirs buildInfo+    return $ fromMaybe "." $ listToMaybe srcDirs

@@ -1,3 +1,7 @@+## 1.5.2.5++* Support for `add-handler` when modules are in `src/` directory [#1413](https://github.com/yesodweb/yesod/issues/1413)+ ## 1.5.2.4  * Cabal 2.0 support

@@ -281,7 +281,7 @@     cabal  <- D.findPackageDesc "." #endif -#if MIN_VERSION_Cabal(1, 20, 0)+#if MIN_VERSION_Cabal(2, 0, 0)     gpd    <- D.readGenericPackageDescription D.normal cabal #else     gpd    <- D.readPackageDescription D.normal cabal

@@ -1,5 +1,5 @@ name:            yesod-bin-version:         1.5.2.4+version:         1.5.2.5 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>