git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1237 from hdgarrood/handle-bower-link

Handle 'bower link' properly in psc-publish

commit6806f7f4c9d83122ad1ab2c389226b10a50e14a3 authorPhil Freeman <paf31@cantab.net> dateTue 7 Jul 2015, 10:19 (11 years ago) parent8cd1be192cda39
2 files changed+19−12
compare with golang
unifiedsplit
psc-publish/ErrorsWarnings.hs+8−8 psc-publish/Main.hs+11−4
psc-publish/ErrorsWarnings.hs+8−8
@@ -33,7 +33,7 @@ data PackageError
3333 deriving (Show)
3434
3535data PackageWarning
36− = ResolutionNotVersion PackageName
36+ = NoResolvedVersion PackageName
3737 | UndeclaredDependency PackageName
3838 | UnacceptableVersion (PackageName, String)
3939 deriving (Show)
@@ -253,7 +253,7 @@ displayOtherError e = case e of
253253 [ "An IO exception occurred:", show exc ]
254254
255255data CollectedWarnings = CollectedWarnings
256− { resolutionNotVersions :: [PackageName]
256+ { noResolvedVersions :: [PackageName]
257257 , undeclaredDependencies :: [PackageName]
258258 , unacceptableVersions :: [(PackageName, String)]
259259 }
@@ -268,7 +268,7 @@ collectWarnings :: [PackageWarning] -> CollectedWarnings
268268collectWarnings = foldMap singular
269269 where
270270 singular w = case w of
271− ResolutionNotVersion pn -> CollectedWarnings [pn] [] []
271+ NoResolvedVersion pn -> CollectedWarnings [pn] [] []
272272 UndeclaredDependency pn -> CollectedWarnings [] [pn] []
273273 UnacceptableVersion t -> CollectedWarnings [] [] [t]
274274
@@ -276,7 +276,7 @@ renderWarnings :: [PackageWarning] -> Box
276276renderWarnings warns =
277277 let CollectedWarnings{..} = collectWarnings warns
278278 go toBox warns' = toBox <$> NonEmpty.nonEmpty warns'
279− mboxes = [ go warnResolutionNotVersions resolutionNotVersions
279+ mboxes = [ go warnNoResolvedVersions noResolvedVersions
280280 , go warnUndeclaredDependencies undeclaredDependencies
281281 , go warnUnacceptableVersions unacceptableVersions
282282 ]
@@ -286,18 +286,18 @@ renderWarnings warns =
286286 , indented (vcat (intersperse spacer boxes))
287287 ]
288288
289−warnResolutionNotVersions :: NonEmpty PackageName -> Box
290−warnResolutionNotVersions pkgNames =
289+warnNoResolvedVersions :: NonEmpty PackageName -> Box
290+warnNoResolvedVersions pkgNames =
291291 let singular = NonEmpty.length pkgNames == 1
292292 pl a b = if singular then b else a
293293
294294 packages = pl "packages" "package"
295− were = pl "were" "was"
296295 anyOfThese = pl "any of these" "this"
297296 these = pl "these" "this"
298297 in vcat $
299298 [ para (concat
300− ["The following ", packages, " ", were, " not resolved to a version:"])
299+ ["The following ", packages, " did not appear to have a resolved "
300+ , "version:"])
301301 ] ++
302302 bulletedList runPackageName (NonEmpty.toList pkgNames)
303303 ++
psc-publish/Main.hs+11−4
@@ -173,6 +173,12 @@ readProcess' prog args stdin = do
173173
174174data DependencyStatus
175175 = Missing
176+ -- ^ Listed in bower.json, but not installed.
177+ | NoResolution
178+ -- ^ In the output of `bower list --json --offline`, there was no
179+ -- _resolution key. This can be caused by adding the dependency using
180+ -- `bower link`, or simply copying it into bower_components instead of
181+ -- installing it normally.
176182 | ResolvedOther String
177183 -- ^ Resolved, but to something other than a version. The String argument
178184 -- is the resolution type. The values it can take that I'm aware of are
@@ -237,7 +243,7 @@ asDependencyStatus = do
237243 return Missing
238244 else
239245 key "pkgMeta" $
240− key "_resolution" $ do
246+ keyOrDefault "_resolution" NoResolution $ do
241247 type_ <- key "type" asString
242248 case type_ of
243249 "version" -> ResolvedVersion <$> key "tag" asString
@@ -250,12 +256,12 @@ warnUndeclared declared actual =
250256handleDeps ::
251257 [(PackageName, DependencyStatus)] -> PrepareM [(PackageName, Version)]
252258handleDeps deps = do
253− let (missing, notVersion, installed) = partitionDeps deps
259+ let (missing, noVersion, installed) = partitionDeps deps
254260 case missing of
255261 (x:xs) ->
256262 userError (MissingDependencies (x :| xs))
257263 [] -> do
258− mapM_ (warn . ResolutionNotVersion . fst) notVersion
264+ mapM_ (warn . NoResolvedVersion) noVersion
259265 withVersions <- catMaybes <$> mapM tryExtractVersion' installed
260266 filterM (liftIO . isPureScript . bowerDir . fst) withVersions
261267
@@ -264,7 +270,8 @@ handleDeps deps = do
264270 go (pkgName, d) (ms, os, is) =
265271 case d of
266272 Missing -> (pkgName : ms, os, is)
267− ResolvedOther o -> (ms, (pkgName, o) : os, is)
273+ NoResolution -> (ms, pkgName : os, is)
274+ ResolvedOther _ -> (ms, pkgName : os, is)
268275 ResolvedVersion v -> (ms, os, (pkgName, v) : is)
269276
270277 bowerDir pkgName = "bower_components/" ++ runPackageName pkgName