a98f28a · rowtype-yoga/purescript-native

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

Allow https://github.com URLs for psc-publish

Follow-up to #1549, #1752. The HTTPS git access is preferable in a lot of network scenarios (e.g. public WiFi) where other ports are restricted and should work just fine as only read access is needed.

commita98f28a3c81fd67f6d87852a670a24291dffb379 authorPascal Hartig <phartig@rdrei.net> dateThu 31 Dec 2015, 20:32 (11 years ago) parent08aeed2

2 files changed+11−7

compare with golang

unifiedsplit

CONTRIBUTORS.md+1 src/Language/PureScript/Publish.hs+10−7

CONTRIBUTORS.md+1

@@ -61,6 +61,7 @@ This file lists the contributors to the PureScript compiler project, and the ter

6161- [@soupi](https://github.com/soupi) (Gil Mizrahi) My existing contributions and all future contributions until further notice are Copyright Gil Mizrahi, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

6262- [@tfausak](https://github.com/tfausak) (Taylor Fausak) My existing contributions and all future contributions until further notice are Copyright Taylor Fausak, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

6363- [@codedmart](https://github.com/codedmart) (Brandon Martin) My existing contributions and all future contributions until further notice are Copyright Brandon Martin, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

64+- [@passy](https://github.com/passy) (Pascal Hartig) My existing contributions and all future contributions until further notice are Copyright Pascal Hartig, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

6465

6566### Companies

6667

src/Language/PureScript/Publish.hs+10−7

@@ -41,7 +41,6 @@ import qualified Data.Text.Lazy.Encoding as TL

4141

4242import Control.Category ((>>>))

4343import Control.Arrow ((***))

44−import Control.Applicative ((<|>))

4544import Control.Exception (catch, try)

4645import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)

4746import Control.Monad.Trans.Except

@@ -197,8 +196,7 @@ getBowerInfo = either (userError . BadRepositoryField) return . tryExtract

197196 maybe (Left NotOnGithub) Right (extractGithub repositoryUrl)

198197

199198extractGithub :: String -> Maybe (D.GithubUser, D.GithubRepo)

200−extractGithub =

201− matchUrl

199+extractGithub = stripGitHubPrefixes

202200 >>> fmap (splitOn "/")

203201 >=> takeTwo

204202 >>> fmap (D.GithubUser *** (D.GithubRepo . dropDotGit))

@@ -208,15 +206,20 @@ extractGithub =

208206 takeTwo [x, y] = Just (x, y)

209207 takeTwo _ = Nothing

210208

209+ stripGitHubPrefixes :: String -> Maybe String

210+ stripGitHubPrefixes = stripPrefixes [ "git://github.com/"

211+ , "https://github.com/"

212+ , "git@github.com:"

213+ ]

214+

215+ stripPrefixes :: [String] -> String -> Maybe String

216+ stripPrefixes prefixes str = msum $ (`stripPrefix` str) <$> prefixes

217+

211218 dropDotGit :: String -> String

212219 dropDotGit str

213220 | ".git" `isSuffixOf` str = take (length str - 4) str

214221 | otherwise = str

215222

216− matchUrl :: String -> Maybe String

217− matchUrl str =

218− stripPrefix "git@github.com:" str <|> stripPrefix "git://github.com/" str

219−

220223readProcess' :: String -> [String] -> String -> PrepareM String

221224readProcess' prog args stdin = do

222225 out <- liftIO (catch (Right <$> readProcess prog args stdin)