github/bower
1
1
Fork 0
mirror of https://github.com/bower/bower.git synced 2026-01-15 01:08:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #901 from bower/absolute-path-slash

Browse Source 
Fix absolute paths ending with / not going through the FsResolver, fixes #898
This commit is contained in:
André Cruz
2013-10-04 05:01:38 -07:00
parent 6ae2c8497f 60c522a696
commit b4603069bf
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/resolverFactory.js
View File

@@ -60,7 +60,7 @@ function getConstructor(source, config, registryClient) {
// If source is ./ or ../ or an absolute path
absolutePath = path.resolve(config.cwd, source);
if (/^\.\.?[\/\\]/.test(source) || /^~\//.test(source) || path.normalize(source) === absolutePath) {
if (/^\.\.?[\/\\]/.test(source) || /^~\//.test(source) || path.normalize(source).replace(/[\/\\]+$/, '') === absolutePath) {
promise = Q.nfcall(fs.stat, path.join(absolutePath, '.git'))
.then(function (stats) {
if (stats.isDirectory()) {

5
test/core/resolverFactory.js
View File

@@ -303,6 +303,11 @@ describe('resolverFactory', function () {
temp = path.resolve(__dirname, '../assets/package-a');
endpoints[temp] = temp;
// Absolute path that ends with a /
// See: https://github.com/bower/bower/issues/898
temp = path.resolve(__dirname, '../assets/package-a') + '/';
endpoints[temp] = temp;
// Relative path
endpoints[__dirname + '/../assets/package-a'] = temp;