67e388e · rowtype-yoga/purescript-native

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

on golang help sign in

Merge pull request #1320 from hdgarrood/psc-publish-dotcmd

67e388eGary Burgess11 years ago

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

compare with golang

unifiedsplit

@@ -36,14 +36,16 @@ 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

48+import qualified System.Info

48import Web.Bower.PackageMeta (PackageMeta(..), BowerError(..), PackageName,

50import Web.Bower.PackageMeta (PackageMeta(..), BowerError(..), PackageName,

49 runPackageName, parsePackageName, Repository(..))

51 runPackageName, parsePackageName, Repository(..))

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

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

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

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

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

240getResolvedDependencies declaredDeps = do

242getResolvedDependencies declaredDeps = do

243+ bower <- findBowerExecutable

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

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

242

245

243 -- Check for undeclared dependencies

246 -- Check for undeclared dependencies

244 toplevels <- catchJSON (parse asToplevelDependencies depsBS)

247 toplevels <- catchJSON (parse asToplevelDependencies depsBS)

@@ -250,6 +253,15 @@ getResolvedDependencies declaredDeps = do

250 where

253 where

251 catchJSON = flip catchLeft (internalError . JSONError FromBowerList)

254 catchJSON = flip catchLeft (internalError . JSONError FromBowerList)

252

255

256+findBowerExecutable :: PrepareM String

257+findBowerExecutable = do

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

259+ maybe (userError (BowerExecutableNotFound names)) return mname

260+ where

261+ names = case System.Info.os of

262+ "mingw32" -> ["bower", "bower.cmd"]

263+ _ -> ["bower"]

264+

253-- | Extracts all dependencies and their versions from

265-- | Extracts all dependencies and their versions from

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

266-- `bower list --json --offline`

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

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

src/Language/PureScript/Publish/ErrorsWarnings.hs+9−1

@@ -21,7 +21,7 @@ import Data.Version

21import Data.Maybe

22import Data.Monoid

23import Data.Foldable (foldMap)

24−import Data.List (intersperse)

24+import Data.List (intersperse, intercalate)

25import Data.List.NonEmpty (NonEmpty(..))

26import qualified Data.List.NonEmpty as NonEmpty

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

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

54data UserError

55 = BowerJSONNotFound

56+ | BowerExecutableNotFound [String] -- list of executable names tried

56 | CouldntParseBowerJSON (ParseError BowerError)

57 | CouldntParseBowerJSON (ParseError BowerError)

57 | BowerJSONNameMissing

58 | BowerJSONNameMissing

58 | TagMustBeCheckedOut

59 | TagMustBeCheckedOut

@@ -121,6 +122,13 @@ 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 names ->

126+ para (concat

127+ [ "The Bower executable was not found (tried: ", format names, "). Please"

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

129+ ])

130+ where

131+ format = intercalate ", " . map show

124 CouldntParseBowerJSON err ->

132 CouldntParseBowerJSON err ->

125 vcat

133 vcat

126 [ successivelyIndented

134 [ successivelyIndented