Compare commits

..

2 Commits

Author SHA1 Message Date
akkaradej
dcd06d80a3 Fix missing host from ssh source 2018-03-28 16:35:57 +02:00
akkaradej
51a00ff433 Add test for shallow cloning when source is a ssh protocol 2018-03-28 16:35:57 +02:00
7 changed files with 8 additions and 26 deletions

View File

@@ -16,7 +16,7 @@ function lookup(logger, name, config) {
.then(function (entry) {
return !entry ? null : {
name: name,
url: entry.url
url: entry && entry.url
};
});
}

View File

@@ -687,6 +687,7 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
var unresolvable;
var dataPicks;
var save;
var choices;
var picks = [];
var versionRegex = /(?:[\d\w]\.){2}[\d\w](?:.)*/;
var picksReleases;
@@ -825,9 +826,7 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
});
// Save resolution
if (this._config.argv.cooked.includes('--save')) {
this._storeResolution(picks[suitable]);
}
this._storeResolution(picks[suitable]);
return Q.resolve(picks[suitable]);
}
@@ -846,6 +845,7 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
picks: dataPicks
});
choices = picks.map(function (pick, index) { return index + 1; });
picksReleases = picks.map(function (pick) { return pick.pkgMeta._release; });
return Q.nfcall(this._logger.prompt.bind(this._logger), {
type: 'input',

View File

@@ -176,12 +176,6 @@ function getConstructor(decEndpoint, options, registryClient) {
// Check if is a shorthand and expand it
addResolver(function () {
// Check if the shorthandResolver is falsy
if (!config.shorthandResolver) {
return;
}
// Skip ssh and/or URL with auth
if (/[:@]/.test(source)) {
return;

View File

@@ -121,6 +121,8 @@ GitResolver.prototype._findResolution = function (target) {
version,
index;
versionsArr = versions.map(function (obj) { return obj.version; });
// If there are no tags and target is *,
// fallback to the latest commit on master
if (!versions.length && target === '*') {

View File

@@ -43,9 +43,6 @@ function doEnvReplaceStr (f) {
function envReplace(config) {
var envReplaced = {};
if ( lang.isArray(config) ) {
envReplaced = [];
}
object.forOwn(config, function (value, key) {
@@ -66,9 +63,6 @@ function envReplace(config) {
if ( lang.isPlainObject(value) ) {
envReplaced[key] = envReplace(value);
}
else if ( lang.isArray(value) ) {
envReplaced[key] = envReplace(value);
}
else if ( lang.isString(value) ) {
envReplaced[key] = doEnvReplaceStr(value);
}

View File

@@ -4,12 +4,7 @@
},
"storage" : {
"packages" : "${_BOWERRC_MY_PACKAGES}",
"registry" : {
"register": "~/.bower-test/registry",
"search": [
"${_BOWERRC_MY_USER}:${_BOWERRC_MY_PASS}"
]
}
"registry" : "~/.bower-test/registry"
},
"tmp" : "${_BOWERRC_MY_TMP}"
}

View File

@@ -224,13 +224,10 @@ describe('Allow ${ENV} variables in .bowerrc', function() {
it('sets values from process.env', function() {
process.env._BOWERRC_MY_PACKAGES = 'a';
process.env._BOWERRC_MY_TMP = '/tmp/b';
process.env._BOWERRC_MY_USER = 'username';
process.env._BOWERRC_MY_PASS = 'password';
var config = require('../lib/Config').read('test/assets/env-variables-values');
assert.equal('a', config.storage.packages);
assert.equal('/tmp/b', config.tmp);
assert.equal('username:password', config.storage.registry.search[0]);
assert.equal('${_myshellvar}', config.scripts.postinstall);
});
});
@@ -241,7 +238,7 @@ describe('untildify paths in .bowerrc', function() {
var config = require('../lib/Config').read('test/assets/env-variables-values');
var untildify = require('untildify');
assert.equal(untildify('~/.bower-test/registry') , config.storage.registry.register);
assert.equal(untildify('~/.bower-test/registry') , config.storage.registry);
});
});