Skip to content
This repository was archived by the owner on Aug 11, 2022. It is now read-only.

Commit 89ce829

Browse files
othiym23othiym23
committed
Use `hosted-git-info` directly to ensure that all GitHub URLs are being run through the same cloning strategy for caching. Fixes #7630.
1 parent 63313eb commit 89ce829

34 files changed

Lines changed: 13 additions & 1370 deletions

‎lib/cache/maybe-github.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
var assert = require("assert")
22
, log = require("npmlog")
33
, addRemoteGit = require("./add-remote-git.js")
4+
, hosted = require("hosted-git-info")
45

56
module.exports = function maybeGithub (p, cb) {
67
assert(typeof p === "string", "must pass package name")
78
assert(typeof cb === "function", "must pass callback")
89

9-
var u = "git://github.com/" + p
10-
log.info("maybeGithub", "Attempting %s from %s", p, u)
10+
var parsed = hosted.fromUrl(p)
11+
log.info("maybeGithub", "Attempting %s from %s", p, parsed.git())
1112

12-
return addRemoteGit(u, true, function (er, data) {
13+
return addRemoteGit(parsed.git(), true, function (er, data) {
1314
if (er) {
14-
var upriv = "ssh://[email protected]:" + p
15-
log.info("maybeGithub", "Attempting %s from %s", p, upriv)
15+
log.info("maybeGithub", "Couldn't clone %s", parsed.git())
16+
log.info("maybeGithub", "Now attempting %s from %s", p, parsed.ssh())
1617

17-
return addRemoteGit(upriv, false, function (er, data) {
18+
return addRemoteGit(parsed.ssh(), false, function (er, data) {
1819
if (er) return cb(er)
1920

20-
success(upriv, data)
21+
success(parsed.ssh(), data)
2122
})
2223
}
2324

24-
success(u, data)
25+
success(parsed.git(), data)
2526
})
2627

2728
function success (u, data) {

node_modules/npm-package-arg/node_modules/hosted-git-info/.npmignore renamed to node_modules/hosted-git-info/.npmignore

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/.travis.yml renamed to node_modules/hosted-git-info/.travis.yml

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/README.md renamed to node_modules/hosted-git-info/README.md

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/README.md~ renamed to node_modules/hosted-git-info/README.md~

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/index.js renamed to node_modules/hosted-git-info/index.js

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/package.json renamed to node_modules/hosted-git-info/package.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node_modules/npm-package-arg/node_modules/hosted-git-info/test/basic.js renamed to node_modules/hosted-git-info/test/basic.js

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/test/bitbucket.js renamed to node_modules/hosted-git-info/test/bitbucket.js

File renamed without changes.

node_modules/npm-package-arg/node_modules/hosted-git-info/test/gist.js renamed to node_modules/hosted-git-info/test/gist.js

File renamed without changes.

0 commit comments

Comments
 (0)