mirror of
https://github.com/bower/bower.git
synced 2026-02-11 22:44:58 -05:00
Minor CS fixes.
This commit is contained in:
@@ -10,12 +10,12 @@ var copy = require('../util/copy');
|
||||
var createError = require('../util/createError');
|
||||
var endpointParser = require('../util/endpointParser');
|
||||
|
||||
var Manager = function (options) {
|
||||
function Manager(options) {
|
||||
options = options || {};
|
||||
|
||||
this._config = options.config || defaultConfig;
|
||||
this._repository = new PackageRepository(options);
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ var resolverFactory = require('./resolverFactory');
|
||||
var defaultConfig = require('../config');
|
||||
var createError = require('../util/createError');
|
||||
|
||||
var PackageRepository = function (options) {
|
||||
function PackageRepository(options) {
|
||||
options = options || {};
|
||||
options.config = options.config || defaultConfig;
|
||||
|
||||
@@ -20,7 +20,7 @@ var PackageRepository = function (options) {
|
||||
}, this._config));
|
||||
|
||||
this._resolveCache = new ResolveCache(this._config.roaming.cache);
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@ var defaultConfig = require('../config');
|
||||
var createError = require('../util/createError');
|
||||
var endpointParser = require('../util/endpointParser');
|
||||
|
||||
var Project = function (options) {
|
||||
function Project(options) {
|
||||
options = options || {};
|
||||
|
||||
this._options = options;
|
||||
this._config = options.config || defaultConfig;
|
||||
this._manager = new Manager(options);
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ var Q = require('q');
|
||||
var mkdirp = require('mkdirp');
|
||||
var rimraf = require('rimraf');
|
||||
|
||||
var ResolveCache = function (dir) {
|
||||
function ResolveCache(dir) {
|
||||
// TODO: Make some options, such as:
|
||||
// - Max MB
|
||||
// - Max versions per source
|
||||
@@ -17,7 +17,7 @@ var ResolveCache = function (dir) {
|
||||
this._versions = {};
|
||||
|
||||
mkdirp.sync(dir);
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
var Q = require('q');
|
||||
var mout = require('mout');
|
||||
|
||||
var Worker = function (defaultConcurrency, types) {
|
||||
function Worker(defaultConcurrency, types) {
|
||||
this._defaultConcurrency = typeof defaultConcurrency === 'number' ? defaultConcurrency : 10;
|
||||
|
||||
// Initialize some needed properties
|
||||
this._queue = {};
|
||||
this._slots = types || {};
|
||||
this._executing = [];
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ var extract = require('../../util/extract');
|
||||
var createError = require('../../util/createError');
|
||||
var junk = require('junk');
|
||||
|
||||
var FsResolver = function (source, options) {
|
||||
function FsResolver(source, options) {
|
||||
Resolver.call(this, source, options);
|
||||
|
||||
// Ensure absolute path
|
||||
@@ -19,7 +19,7 @@ var FsResolver = function (source, options) {
|
||||
if (this._target !== '*') {
|
||||
throw createError('File system sources can\'t resolve targets', 'ENORESTARGET');
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
util.inherits(FsResolver, Resolver);
|
||||
mout.object.mixIn(FsResolver, Resolver);
|
||||
|
||||
@@ -6,12 +6,12 @@ var copy = require('../../util/copy');
|
||||
var cmd = require('../../util/cmd');
|
||||
var path = require('path');
|
||||
|
||||
var GitFsResolver = function (source, options) {
|
||||
function GitFsResolver(source, options) {
|
||||
GitResolver.call(this, source, options);
|
||||
|
||||
// Ensure absolute path
|
||||
this._source = path.resolve(this._config.cwd, source);
|
||||
};
|
||||
}
|
||||
|
||||
util.inherits(GitFsResolver, GitResolver);
|
||||
mout.object.mixIn(GitFsResolver, GitResolver);
|
||||
|
||||
@@ -4,7 +4,7 @@ var mout = require('mout');
|
||||
var GitResolver = require('./GitResolver');
|
||||
var cmd = require('../../util/cmd');
|
||||
|
||||
var GitRemoteResolver = function (source, options) {
|
||||
function GitRemoteResolver(source, options) {
|
||||
if (!mout.string.startsWith(source, 'file://')) {
|
||||
// Trim trailing slashes
|
||||
source = source.replace(/\/+$/, '');
|
||||
@@ -21,7 +21,7 @@ var GitRemoteResolver = function (source, options) {
|
||||
if (this._guessedName && mout.string.endsWith(this._name, '.git')) {
|
||||
this._name = this._name.slice(0, -4);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
util.inherits(GitRemoteResolver, GitResolver);
|
||||
mout.object.mixIn(GitRemoteResolver, GitResolver);
|
||||
|
||||
@@ -9,21 +9,25 @@ var Resolver = require('./Resolver');
|
||||
var createError = require('../../util/createError');
|
||||
var which = require('which');
|
||||
|
||||
var gitChecked = false;
|
||||
var hasGit;
|
||||
|
||||
var GitResolver = function (source, options) {
|
||||
// Check if git is installed
|
||||
if (hasGit == null) {
|
||||
try {
|
||||
which.sync('git');
|
||||
hasGit = true;
|
||||
} catch (ex) {
|
||||
hasGit = false;
|
||||
}
|
||||
}
|
||||
|
||||
function GitResolver(source, options) {
|
||||
Resolver.call(this, source, options);
|
||||
|
||||
if (!gitChecked) {
|
||||
try {
|
||||
which.sync('git');
|
||||
} catch (ex) {
|
||||
throw new Error('git is not installed or not in the PATH');
|
||||
}
|
||||
if (!hasGit) {
|
||||
throw createError('git is not installed or not in the PATH', 'ENOGIT');
|
||||
}
|
||||
|
||||
gitChecked = true;
|
||||
};
|
||||
}
|
||||
|
||||
util.inherits(GitResolver, Resolver);
|
||||
mout.object.mixIn(GitResolver, Resolver);
|
||||
|
||||
@@ -10,7 +10,7 @@ var removeIgnores = require('../../util/removeIgnores');
|
||||
|
||||
tmp.setGracefulCleanup();
|
||||
|
||||
var Resolver = function (source, options) {
|
||||
function Resolver(source, options) {
|
||||
options = options || {};
|
||||
|
||||
this._source = source;
|
||||
@@ -18,7 +18,7 @@ var Resolver = function (source, options) {
|
||||
this._name = options.name || path.basename(this._source);
|
||||
this._guessedName = !options.name;
|
||||
this._config = options.config || defaultConfig;
|
||||
};
|
||||
}
|
||||
|
||||
// -----------------
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ var extract = require('../../util/extract');
|
||||
var createError = require('../../util/createError');
|
||||
var junk = require('junk');
|
||||
|
||||
var UrlResolver = function (source, options) {
|
||||
function UrlResolver(source, options) {
|
||||
var pos;
|
||||
|
||||
Resolver.call(this, source, options);
|
||||
@@ -29,7 +29,7 @@ var UrlResolver = function (source, options) {
|
||||
}
|
||||
|
||||
this._remote = url.parse(source);
|
||||
};
|
||||
}
|
||||
|
||||
util.inherits(UrlResolver, Resolver);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user