a8556ff · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

psc-publish: Try "bower.cmd" if "bower" is not found

a8556ffHarry Garrood11 years ago

src/Language/PureScript/Publish.hs+11−2

compare with golang

unifiedsplit

@@ -36,11 +36,12 @@ import Control.Applicative

36import Control.Category ((>>>))

37import Control.Arrow ((***))

38import Control.Exception (catch, try)

39+import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)

39import Control.Monad.Trans.Except

40import Control.Monad.Trans.Except

40import Control.Monad.Error.Class (MonadError(..))

41import Control.Monad.Error.Class (MonadError(..))

41import Control.Monad.Writer

42import Control.Monad.Writer

43−import System.Directory (doesFileExist)

44+import System.Directory (doesFileExist, findExecutable)

44import System.Process (readProcess)

45import System.Process (readProcess)

45import System.Exit (exitFailure)

46import System.Exit (exitFailure)

46import qualified System.FilePath.Glob as Glob

47import qualified System.FilePath.Glob as Glob

@@ -238,7 +239,8 @@ data DependencyStatus

238-- appropriate to link to, and we should omit links.

239-- appropriate to link to, and we should omit links.

239getResolvedDependencies :: [PackageName] -> PrepareM [(PackageName, Version)]

240getResolvedDependencies :: [PackageName] -> PrepareM [(PackageName, Version)]

240getResolvedDependencies declaredDeps = do

241getResolvedDependencies declaredDeps = do

242+ bower <- findBowerExecutable

241− depsBS <- fromString <$> readProcess' "bower" ["list", "--json", "--offline"] ""

243+ depsBS <- fromString <$> readProcess' bower ["list", "--json", "--offline"] ""

242

244

243 -- Check for undeclared dependencies

245 -- Check for undeclared dependencies

244 toplevels <- catchJSON (parse asToplevelDependencies depsBS)

246 toplevels <- catchJSON (parse asToplevelDependencies depsBS)

@@ -250,6 +252,13 @@ getResolvedDependencies declaredDeps = do

250 where

252 where

251 catchJSON = flip catchLeft (internalError . JSONError FromBowerList)

253 catchJSON = flip catchLeft (internalError . JSONError FromBowerList)

252

254

255+findBowerExecutable :: PrepareM String

256+findBowerExecutable = do

257+ mname <- liftIO . runMaybeT . msum . map (MaybeT . findExecutable) $ names

258+ maybe (userError BowerExecutableNotFound) return mname

259+ where

260+ names = ["bower", "bower.cmd"]

261+

253-- | Extracts all dependencies and their versions from

262-- | Extracts all dependencies and their versions from

254-- `bower list --json --offline`

263-- `bower list --json --offline`

255asResolvedDependencies :: Parse BowerError [(PackageName, DependencyStatus)]

264asResolvedDependencies :: Parse BowerError [(PackageName, DependencyStatus)]

src/Language/PureScript/Publish/ErrorsWarnings.hs+6

@@ -53,6 +53,7 @@ data PackageWarning

53-- | An error that should be fixed by the user.

54data UserError

55 = BowerJSONNotFound

56+ | BowerExecutableNotFound

56 | CouldntParseBowerJSON (ParseError BowerError)

57 | CouldntParseBowerJSON (ParseError BowerError)

57 | BowerJSONNameMissing

58 | BowerJSONNameMissing

58 | TagMustBeCheckedOut

59 | TagMustBeCheckedOut

@@ -121,6 +122,11 @@ displayUserError e = case e of

121 [ "The bower.json file was not found. Please create one, or run "

122 [ "The bower.json file was not found. Please create one, or run "

122 , "`pulp init`."

123 , "`pulp init`."

123 ])

124 ])

125+ BowerExecutableNotFound ->

126+ para (concat

127+ [ "The \"bower\" executable was not found (nor \"bower.cmd\"). Please"

128+ , " ensure that bower is installed and on your PATH."

129+ ])

124 CouldntParseBowerJSON err ->

130 CouldntParseBowerJSON err ->

125 vcat

131 vcat

126 [ successivelyIndented

132 [ successivelyIndented