diff --git a/bin/bower b/bin/bower index 41393134..8989f32d 100755 --- a/bin/bower +++ b/bin/bower @@ -8,10 +8,14 @@ var pkg = require(path.join(__dirname, '..', 'package.json')); // -------- -var options = nopt({ version: Boolean }, { 'v': ['--version'] }, process.argv); +var options = nopt({ + version: Boolean +}, { + 'v': ['--version'] +}, process.argv); // Handle print of version if (options.version) { process.stdout.write(pkg.version + '\n'); process.exit(); -} \ No newline at end of file +} diff --git a/lib/config.js b/lib/config.js index a960be5c..cc6796d3 100644 --- a/lib/config.js +++ b/lib/config.js @@ -2,6 +2,7 @@ var path = require('path'); var fs = require('fs'); var mout = require('mout'); var mkdirp = require('mkdirp'); +var rc = require('rc'); // Guess some needed properties based on the user OS var temp = process.env.TMPDIR @@ -28,7 +29,7 @@ var proxy = process.env.HTTPS_PROXY // Read global bower config var config; try { - config = require('rc')('bower', { + config = rc('bower', { directory: 'bower_components', shorthandResolver: 'git://github.com/{{owner}}/{{package}}.git', proxy: proxy, diff --git a/lib/resolve/Resolver.js b/lib/resolve/Resolver.js index f7c8fd03..101ba052 100644 --- a/lib/resolve/Resolver.js +++ b/lib/resolve/Resolver.js @@ -39,9 +39,9 @@ Resolver.prototype.getTempDir = function () { }; Resolver.prototype.hasNew = function (canonicalPkg) { - var that = this, - promise, - metaFile; + var that = this; + var promise; + var metaFile; // If already working, error out if (this._working) { @@ -210,4 +210,4 @@ Resolver.prototype._savePkgMeta = function (meta) { }.bind(this)); }; -module.exports = Resolver; \ No newline at end of file +module.exports = Resolver; diff --git a/lib/resolve/Worker.js b/lib/resolve/Worker.js index 1115f8dd..0810551b 100644 --- a/lib/resolve/Worker.js +++ b/lib/resolve/Worker.js @@ -17,9 +17,9 @@ util.inherits(Worker, events.EventEmitter); // ----------------- Worker.prototype.enqueue = function (func, type) { - var deferred = Q.defer(), - types, - entry; + var deferred = Q.defer(); + var types; + var entry; type = type || ''; types = Array.isArray(type) ? type : [type]; @@ -61,9 +61,9 @@ Worker.prototype.abort = function () { // ----------------- Worker.prototype._processQueue = function (type) { - var queue = this._queue[type], - length = queue ? queue.length : 0, - x; + var queue = this._queue[type]; + var length = queue ? queue.length : 0; + var x; for (x = 0; x < length; ++x) { if (this._processEntry(queue[x])) { @@ -73,8 +73,8 @@ Worker.prototype._processQueue = function (type) { }; Worker.prototype._processEntry = function (entry) { - var allFree = entry.types.every(this._hasSlot, this), - promise; + var allFree = entry.types.every(this._hasSlot, this); + var promise; // If there is a free slot for every tag if (allFree) { @@ -148,4 +148,4 @@ Worker.prototype._freeSlot = function (type) { } }; -module.exports = Worker; \ No newline at end of file +module.exports = Worker; diff --git a/lib/resolve/resolverFactory.js b/lib/resolve/resolverFactory.js index 3bbb560b..698aae13 100644 --- a/lib/resolve/resolverFactory.js +++ b/lib/resolve/resolverFactory.js @@ -10,9 +10,9 @@ var config = require('../config'); var createError = require('../util/createError'); function createResolver(endpoint, options) { - var split = endpoint.split('#'), - source, - target; + var split = endpoint.split('#'); + var source; + var target; // TODO: extract name from the endpoint and set it up in the options.name // not sure about the @ being used to specify it because it may conflict @@ -83,4 +83,4 @@ function createResolver(endpoint, options) { }); } -module.exports = createResolver; \ No newline at end of file +module.exports = createResolver; diff --git a/lib/resolve/resolvers/FsResolver.js b/lib/resolve/resolvers/FsResolver.js index 5154a351..bd333847 100644 --- a/lib/resolve/resolvers/FsResolver.js +++ b/lib/resolve/resolvers/FsResolver.js @@ -41,9 +41,9 @@ FsResolver.prototype._resolve = function () { FsResolver.prototype._copy = function (meta) { return Q.nfcall(fs.stat, this._source) .then(function (stat) { - var dstFile, - copyOpts, - promise; + var dstFile; + var copyOpts; + var promise; this._sourceStat = stat; @@ -80,9 +80,9 @@ FsResolver.prototype._extract = function (file) { FsResolver.prototype._rename = function () { return Q.nfcall(fs.readdir, this._tempDir) .then(function (files) { - var file, - oldPath, - newPath; + var file; + var oldPath; + var newPath; // Remove any OS specific files from the files array // before checking its length @@ -108,4 +108,4 @@ FsResolver.prototype._savePkgMeta = function (meta) { return Resolver.prototype._savePkgMeta.call(this, meta); }; -module.exports = FsResolver; \ No newline at end of file +module.exports = FsResolver; diff --git a/lib/resolve/resolvers/GitRemoteResolver.js b/lib/resolve/resolvers/GitRemoteResolver.js index 0a98cf0a..cbffb014 100644 --- a/lib/resolve/resolvers/GitRemoteResolver.js +++ b/lib/resolve/resolvers/GitRemoteResolver.js @@ -23,8 +23,8 @@ mout.object.mixIn(GitRemoteResolver, GitResolver); // ----------------- GitRemoteResolver.prototype._checkout = function () { - var branch, - resolution = this._resolution; + var branch; + var resolution = this._resolution; // If resolution is a commit, we need to clone the entire repo and check it out // Because a commit is not a named ref, there's no better solution diff --git a/lib/resolve/resolvers/GitResolver.js b/lib/resolve/resolvers/GitResolver.js index e5cbf5c1..d304b9ad 100644 --- a/lib/resolve/resolvers/GitResolver.js +++ b/lib/resolve/resolvers/GitResolver.js @@ -54,6 +54,7 @@ GitResolver.prototype._resolve = function () { GitResolver.prototype._checkout = function () { throw new Error('_checkout not implemented'); }; + GitResolver.fetchRefs = function (source) { throw new Error('fetchRefs not implemented'); }; @@ -61,8 +62,8 @@ GitResolver.fetchRefs = function (source) { // ----------------- GitResolver.prototype._findResolution = function (target) { - var self = this.constructor, - err; + var self = this.constructor; + var err; target = target || this._target; @@ -195,9 +196,9 @@ GitResolver.fetchVersions = function (source) { return this.fetchTags(source) .then(function (tags) { - var versions = [], - tag, - version; + var versions = []; + var tag; + var version; // For each tag for (tag in tags) { @@ -228,8 +229,8 @@ GitResolver.fetchTags = function (source) { // For each line in the refs, match only the tags refs.forEach(function (line) { - var match = line.match(/^([a-f0-9]{40})\s+refs\/tags\/(\S+)/), - tag; + var match = line.match(/^([a-f0-9]{40})\s+refs\/tags\/(\S+)/); + var tag; if (match) { tag = match[2]; diff --git a/lib/resolve/resolvers/UrlResolver.js b/lib/resolve/resolvers/UrlResolver.js index 3074a647..499cef14 100644 --- a/lib/resolve/resolvers/UrlResolver.js +++ b/lib/resolve/resolvers/UrlResolver.js @@ -33,8 +33,8 @@ util.inherits(UrlResolver, Resolver); // ----------------- UrlResolver.prototype._hasNew = function (pkgMeta) { - var oldCacheHeaders = pkgMeta._cacheHeaders || {}, - reqHeaders = {}; + var oldCacheHeaders = pkgMeta._cacheHeaders || {}; + var reqHeaders = {}; // If the previous cache headers contain an ETag, // send the "If-None-Match" header with it @@ -88,13 +88,13 @@ UrlResolver.prototype._resolve = function () { // ----------------- UrlResolver.prototype._download = function () { - var file = path.join(this._tempDir, this._name), - deferred = Q.defer(), - req, - res, - writer, - finish, - that = this; + var file = path.join(this._tempDir, this._name); + var deferred = Q.defer(); + var req; + var res; + var writer; + var finish; + var that = this; finish = function (err) { // Ensure that all listeners are removed @@ -132,9 +132,9 @@ UrlResolver.prototype._download = function () { }; UrlResolver.prototype._parseHeaders = function (file, response) { - var disposition, - newFile, - match; + var disposition; + var newFile; + var match; // Check if we got a Content-Disposition header disposition = response.headers['content-disposition']; @@ -187,9 +187,9 @@ UrlResolver.prototype._extract = function (file, response) { UrlResolver.prototype._rename = function () { return Q.nfcall(fs.readdir, this._tempDir) .then(function (files) { - var file, - oldPath, - newPath; + var file; + var oldPath; + var newPath; // Remove any OS specific files from the files array // before checking its length @@ -243,4 +243,4 @@ UrlResolver._cacheHeaders = [ 'Content-Disposition' ]; -module.exports = UrlResolver; \ No newline at end of file +module.exports = UrlResolver; diff --git a/lib/util/cmd.js b/lib/util/cmd.js index 1d7ff679..6e44f8d7 100644 --- a/lib/util/cmd.js +++ b/lib/util/cmd.js @@ -7,10 +7,10 @@ var createError = require('./createError'); // Returns a promise that gets fulfilled if the command succeeds // or rejected if it fails function cmd(command, args, options) { - var process, - stderr = '', - stdout = '', - deferred = Q.defer(); + var process; + var stderr = ''; + var stdout = ''; + var deferred = Q.defer(); process = cp.spawn(command, args, options); process.stdout.on('data', function (data) { stdout += data.toString(); }); @@ -19,8 +19,8 @@ function cmd(command, args, options) { // Listen to the close event instead of exit // They are similar but close ensures that streams are flushed process.on('close', function (code) { - var fullCommand, - error; + var fullCommand; + var error; if (code) { // Generate the full command to be presented in the error message @@ -46,4 +46,4 @@ function cmd(command, args, options) { return deferred.promise; } -module.exports = cmd; \ No newline at end of file +module.exports = cmd; diff --git a/lib/util/copy.js b/lib/util/copy.js index 0d4d52d8..c089b1fd 100644 --- a/lib/util/copy.js +++ b/lib/util/copy.js @@ -4,9 +4,9 @@ var fs = require('fs'); var Q = require('q'); function copy(reader, writer) { - var deferred = Q.defer(), - ignore, - finish; + var deferred = Q.defer(); + var ignore; + var finish; finish = function (err) { // Ensure that all listeners are removed @@ -117,4 +117,4 @@ function copyDir(src, dst, opts) { } module.exports.copyDir = copyDir; -module.exports.copyFile = copyFile; \ No newline at end of file +module.exports.copyFile = copyFile; diff --git a/lib/util/extract.js b/lib/util/extract.js index 7fe2fab1..709f46dd 100644 --- a/lib/util/extract.js +++ b/lib/util/extract.js @@ -11,8 +11,8 @@ var osJunk = require('./osJunk'); // to avoid issue #314 zlib.Z_DEFAULT_CHUNK = 1024 * 8; -var extractors, - extractorTypes; +var extractors; +var extractorTypes; extractors = { '.zip': extractZip, @@ -25,6 +25,7 @@ extractors = { 'application/x-tgz': extractTarGz, 'application/x-gzip': extractGz }; + extractorTypes = Object.keys(extractors); function extractZip(archive, dest) { @@ -115,8 +116,8 @@ function moveSingleDirContents(dir) { var promises; promises = files.map(function (file) { - var src = path.join(dir, file), - dest = path.join(destDir, file); + var src = path.join(dir, file); + var dest = path.join(destDir, file); return Q.nfcall(fs.rename, src, dest); }); @@ -138,8 +139,8 @@ function canExtract(target) { // - keepArchive: true to keep the archive afterwards (defaults to false) // - keepStructure: true to keep the extracted structure unchanged (defaults to false) function extract(src, dest, opts) { - var extractor, - promise; + var extractor; + var promise; opts = opts || {}; extractor = getExtractor(opts.mimeType || src); @@ -178,4 +179,4 @@ function extract(src, dest, opts) { } module.exports = extract; -module.exports.canExtract = canExtract; \ No newline at end of file +module.exports.canExtract = canExtract; diff --git a/test/resolve/resolver.js b/test/resolve/resolver.js index 039234bf..a446097c 100644 --- a/test/resolve/resolver.js +++ b/test/resolve/resolver.js @@ -9,8 +9,8 @@ var copy = require('../../lib/util/copy'); var Resolver = require('../../lib/resolve/Resolver'); describe('Resolver', function () { - var tempDir = path.resolve(__dirname, '../assets/tmp'), - testPackage = path.resolve(__dirname, '../assets/github-test-package'); + var tempDir = path.resolve(__dirname, '../assets/tmp'); + var testPackage = path.resolve(__dirname, '../assets/github-test-package'); describe('.getSource', function () { it('should return the resolver source', function () { @@ -50,13 +50,13 @@ describe('Resolver', function () { describe('.hasNew', function () { it('should throw an error if already working (resolving)', function (next) { - var resolver = new Resolver('foo'), - succeeded; + var resolver = new Resolver('foo'); + var succeeded; resolver._resolve = function () {}; resolver.resolve() - .then(function () { + .then(function () { // Test if resolve can be called again when done resolver.resolve() .then(function () { @@ -76,11 +76,11 @@ describe('Resolver', function () { }); it('should throw an error if already working (checking for newer version)', function (next) { - var resolver = new Resolver('foo'), - succeeded; + var resolver = new Resolver('foo'); + var succeeded; resolver.hasNew() - .then(function () { + .then(function () { // Test if hasNew can be called again when done resolver.hasNew() .then(function () { @@ -127,13 +127,13 @@ describe('Resolver', function () { }); it('should throw an error if already working (resolving)', function (next) { - var resolver = new Resolver('foo'), - succeeded; + var resolver = new Resolver('foo'); + var succeeded; resolver._resolve = function () {}; resolver.resolve() - .then(function () { + .then(function () { // Test if resolve can be called again when done resolver.resolve() .then(function () { @@ -153,13 +153,13 @@ describe('Resolver', function () { }); it('should throw an error if already working (checking newer version)', function (next) { - var resolver = new Resolver('foo'), - succeeded; + var resolver = new Resolver('foo'); + var succeeded; resolver._resolve = function () {}; resolver.hasNew() - .then(function () { + .then(function () { // Test if hasNew can be called again when done resolver.hasNew() .then(function () { @@ -260,7 +260,7 @@ describe('Resolver', function () { expect(fs.existsSync(folder)).to.be(true); next(); }) - .done(); + .done(); }); }); @@ -361,8 +361,8 @@ describe('Resolver', function () { resolver._createTempDir() .then(function (dir) { - var dirname, - osTempDir; + var dirname; + var osTempDir; expect(dir).to.be.a('string'); expect(fs.existsSync(dir)).to.be(true); @@ -382,8 +382,8 @@ describe('Resolver', function () { resolver._createTempDir() .then(function (dir) { - var stat = fs.statSync(dir), - expectedMode = dirMode0777 & ~process.umask(); + var stat = fs.statSync(dir); + var expectedMode = dirMode0777 & ~process.umask(); expect(stat.mode).to.equal(expectedMode); next(); @@ -463,8 +463,8 @@ describe('Resolver', function () { }); it('should fallback to component.json (notifying a warn)', function (next) { - var resolver = new Resolver('foo'), - notified = false; + var resolver = new Resolver('foo'); + var notified = false; fs.mkdirSync(tempDir); fs.writeFileSync(path.join(tempDir, 'component.json'), JSON.stringify({ name: 'bar', version: '0.0.0' })); @@ -509,8 +509,8 @@ describe('Resolver', function () { it('should resolve with the same package meta', function (next) { fs.mkdirSync(tempDir); - var resolver = new Resolver('foo'), - meta = { name: 'foo' }; + var resolver = new Resolver('foo'); + var meta = { name: 'foo' }; resolver._tempDir = tempDir; @@ -613,9 +613,9 @@ describe('Resolver', function () { rimraf(tempDir, next); }); - it('should resolve with the same package meta', function (next) { - var resolver = new Resolver('foo'), - meta = { name: 'foo' }; + it('should resolve with the same package meta', function (next) { + var resolver = new Resolver('foo'); + var meta = { name: 'foo' }; resolver._tempDir = tempDir; @@ -645,4 +645,4 @@ describe('Resolver', function () { .done(); }); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/resolverFactory.js b/test/resolve/resolverFactory.js index 035bfb9e..5cf312c1 100644 --- a/test/resolve/resolverFactory.js +++ b/test/resolve/resolverFactory.js @@ -23,8 +23,8 @@ describe('resolverFactory', function () { }); it('should recognize git remote endpoints correctly', function (next) { - var promise = Q.resolve(), - endpoints; + var promise = Q.resolve(); + var endpoints; endpoints = { 'git://github.com/user/project.git': { @@ -102,8 +102,8 @@ describe('resolverFactory', function () { }); it('should recognize local fs git endpoints correctly', function (next) { - var promise = Q.resolve(), - endpoints; + var promise = Q.resolve(); + var endpoints; endpoints = [ path.resolve(__dirname, '../assets/github-test-package'), @@ -129,8 +129,8 @@ describe('resolverFactory', function () { fs.mkdirSync(tempSource); fs.writeFileSync(path.join(tempSource, '.git'), 'foo'); - var promise = Q.resolve(), - endpoints; + var promise = Q.resolve(); + var endpoints; endpoints = [ tempSource, // folder with .git file (not folder!) @@ -153,8 +153,8 @@ describe('resolverFactory', function () { }); it('should recognize URL endpoints correctly', function (next) { - var promise = Q.resolve(), - endpoints; + var promise = Q.resolve(); + var endpoints; endpoints = [ 'http://bower.io/foo.js', @@ -194,4 +194,4 @@ describe('resolverFactory', function () { }) .done(); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/resolvers/fsResolver.js b/test/resolve/resolvers/fsResolver.js index bf813ccf..299947f1 100644 --- a/test/resolve/resolvers/fsResolver.js +++ b/test/resolve/resolvers/fsResolver.js @@ -9,8 +9,8 @@ var copy = require('../../../lib/util/copy'); var FsResolver = require('../../../lib/resolve/resolvers/FsResolver'); describe('FsResolver', function () { - var testPackage = path.resolve(__dirname, '../../assets/github-test-package'), - tempSource; + var testPackage = path.resolve(__dirname, '../../assets/github-test-package'); + var tempSource; before(function (next) { // Checkout test package version 0.2.1 which has a bower.json @@ -157,8 +157,8 @@ describe('FsResolver', function () { }); it('should copy the source directory permissions', function (next) { - var mode0777, - resolver; + var mode0777; + var resolver; tempSource = path.resolve(__dirname, '../../assets/github-test-package-copy'); resolver = new FsResolver(tempSource); @@ -181,8 +181,8 @@ describe('FsResolver', function () { }); it('should copy the source file permissions', function (next) { - var mode0777, - resolver; + var mode0777; + var resolver; tempSource = path.resolve(__dirname, '../../assets/temp'); resolver = new FsResolver(tempSource); @@ -280,4 +280,4 @@ describe('FsResolver', function () { .done(); }); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/resolvers/gitFsResolver.js b/test/resolve/resolvers/gitFsResolver.js index bf306598..59cca0dd 100644 --- a/test/resolve/resolvers/gitFsResolver.js +++ b/test/resolve/resolvers/gitFsResolver.js @@ -57,8 +57,8 @@ describe('GitFsResolver', function () { .then(function (dir) { expect(dir).to.be.a('string'); - var files = fs.readdirSync(dir), - fooContents; + var files = fs.readdirSync(dir); + var fooContents; expect(files).to.contain('foo'); expect(files).to.contain('baz'); @@ -109,9 +109,9 @@ describe('GitFsResolver', function () { }); it('should remove any untracked files and directories', function (next) { - var resolver = new GitFsResolver(testPackage, { target: '7339c38f5874129504b83650fbb2d850394573e9' }), - file = path.join(testPackage, 'new-file'), - dir = path.join(testPackage, 'new-dir'); + var resolver = new GitFsResolver(testPackage, { target: '7339c38f5874129504b83650fbb2d850394573e9' }); + var file = path.join(testPackage, 'new-file'); + var dir = path.join(testPackage, 'new-dir'); fs.writeFileSync(file, 'foo'); fs.mkdir(dir); @@ -169,8 +169,8 @@ describe('GitFsResolver', function () { }); it('should copy source folder permissions', function (next) { - var mode0777, - resolver; + var mode0777; + var resolver; tempSource = path.resolve(__dirname, '../../assets/github-test-package-copy'); resolver = new GitFsResolver(tempSource, { target: 'some-branch' }); @@ -247,8 +247,8 @@ describe('GitFsResolver', function () { }); it('should reuse promises for the same source, avoiding making duplicate fetchs', function (next) { - var promise1, - promise2; + var promise1; + var promise2; promise1 = GitFsResolver.fetchRefs(testPackage); promise2 = GitFsResolver.fetchRefs(testPackage); @@ -261,4 +261,4 @@ describe('GitFsResolver', function () { .done(); }); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/resolvers/gitRemoteResolver.js b/test/resolve/resolvers/gitRemoteResolver.js index 9e306741..7e7253c2 100644 --- a/test/resolve/resolvers/gitRemoteResolver.js +++ b/test/resolve/resolvers/gitRemoteResolver.js @@ -50,8 +50,8 @@ describe('GitRemoteResolver', function () { .then(function (dir) { expect(dir).to.be.a('string'); - var files = fs.readdirSync(dir), - fooContents; + var files = fs.readdirSync(dir); + var fooContents; expect(files).to.contain('foo'); expect(files).to.contain('baz'); @@ -170,8 +170,8 @@ describe('GitRemoteResolver', function () { }); it('should reuse promises for the same source, avoiding making duplicate fetchs', function (next) { - var promise1, - promise2; + var promise1; + var promise2; promise1 = GitRemoteResolver.fetchRefs(testPackage); promise2 = GitRemoteResolver.fetchRefs(testPackage); @@ -184,4 +184,4 @@ describe('GitRemoteResolver', function () { .done(); }); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/resolvers/gitResolver.js b/test/resolve/resolvers/gitResolver.js index 83a8a101..513c811d 100644 --- a/test/resolve/resolvers/gitResolver.js +++ b/test/resolve/resolvers/gitResolver.js @@ -10,8 +10,8 @@ var copy = require('../../../lib/util/copy'); var GitResolver = require('../../../lib/resolve/resolvers/GitResolver'); describe('GitResolver', function () { - var tempDir = path.resolve(__dirname, '../../assets/tmp'), - originalFetchRefs = GitResolver.fetchRefs; + var tempDir = path.resolve(__dirname, '../../assets/tmp'); + var originalFetchRefs = GitResolver.fetchRefs; function clearResolverRuntimeCache() { GitResolver.fetchRefs = originalFetchRefs; @@ -288,6 +288,7 @@ describe('GitResolver', function () { return val; }.bind(this)); }; + DummyResolver.prototype._checkout = function () { this._stack.push('before _checkout'); return Q.resolve() @@ -296,6 +297,7 @@ describe('GitResolver', function () { return val; }.bind(this)); }; + DummyResolver.prototype._cleanup = function () { this._stack.push('before _cleanup'); return GitResolver.prototype._cleanup.apply(this, arguments) @@ -634,8 +636,8 @@ describe('GitResolver', function () { }); it('should remove the .git folder from the temp dir', function (next) { - var resolver = new GitResolver('foo'), - dest = path.join(tempDir, '.git'); + var resolver = new GitResolver('foo'); + var dest = path.join(tempDir, '.git'); // Copy .git folder to the tempDir copy.copyDir(path.resolve(__dirname, '../../../.git'), dest, { @@ -654,8 +656,8 @@ describe('GitResolver', function () { }); it('should not fail if .git does not exist for some reason', function (next) { - var resolver = new GitResolver('foo'), - dest = path.join(tempDir, '.git'); + var resolver = new GitResolver('foo'); + var dest = path.join(tempDir, '.git'); resolver._tempDir = tempDir; @@ -668,8 +670,8 @@ describe('GitResolver', function () { }); it('should sill run even if _checkout fails for some reason', function (next) { - var resolver = new GitResolver('foo'), - called = false; + var resolver = new GitResolver('foo'); + var called = false; GitResolver.fetchRefs = function () { return Q.resolve([ @@ -769,8 +771,8 @@ describe('GitResolver', function () { }); it('should warn if the resolution version is different than the package meta version', function (next) { - var resolver = new GitResolver('foo'), - notified = false; + var resolver = new GitResolver('foo'); + var notified = false; resolver._resolution = { type: 'version', version: '0.0.1', tag: '0.0.1' }; resolver._tempDir = tempDir; @@ -1182,4 +1184,4 @@ describe('GitResolver', function () { .done(); }); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/resolvers/urlResolver.js b/test/resolve/resolvers/urlResolver.js index 5ae17e96..24d8261e 100644 --- a/test/resolve/resolvers/urlResolver.js +++ b/test/resolve/resolvers/urlResolver.js @@ -9,8 +9,8 @@ var cmd = require('../../../lib/util/cmd'); var UrlResolver = require('../../../lib/resolve/resolvers/UrlResolver'); describe('UrlResolver', function () { - var testPackage = path.resolve(__dirname, '../../assets/github-test-package'), - tempDir = path.resolve(__dirname, '../../assets/tmp'); + var testPackage = path.resolve(__dirname, '../../assets/github-test-package'); + var tempDir = path.resolve(__dirname, '../../assets/tmp'); before(function (next) { // Checkout test package version 0.2.1 @@ -178,17 +178,17 @@ describe('UrlResolver', function () { }); it('should work with redirects', function (next) { - var redirectingUrl = 'http://redirecting-url.com', - redirectingToUrl = 'http://bower.io', - resolver; + var redirectingUrl = 'http://redirecting-url.com'; + var redirectingToUrl = 'http://bower.io'; + var resolver; nock(redirectingUrl) - .head('/foo.js') - .reply(302, '', { location: redirectingToUrl + '/foo.js' }); + .head('/foo.js') + .reply(302, '', { location: redirectingToUrl + '/foo.js' }); nock(redirectingToUrl) - .head('/foo.js') - .reply(200, 'foo contents', { + .head('/foo.js') + .reply(200, 'foo contents', { 'ETag': '686897696a7c876b7e', 'Last-Modified': 'Tue, 15 Nov 2012 12:45:26 GMT' }); @@ -427,17 +427,19 @@ describe('UrlResolver', function () { }); it('should work with redirects', function (next) { - var redirectingUrl = 'http://redirecting-url.com', - redirectingToUrl = 'http://bower.io', - resolver; + var redirectingUrl = 'http://redirecting-url.com'; + var redirectingToUrl = 'http://bower.io'; + var resolver; nock(redirectingUrl) - .get('/foo.js') - .reply(302, '', { location: redirectingToUrl + '/foo.js' }); + .get('/foo.js') + .reply(302, '', { + location: redirectingToUrl + '/foo.js' + }); nock(redirectingToUrl) - .get('/foo.js') - .reply(200, 'foo contents'); + .get('/foo.js') + .reply(200, 'foo contents'); resolver = new UrlResolver(redirectingUrl + '/foo.js'); @@ -563,4 +565,4 @@ describe('UrlResolver', function () { }); }); }); -}); \ No newline at end of file +}); diff --git a/test/resolve/worker.js b/test/resolve/worker.js index 893b6de0..d070dea0 100644 --- a/test/resolve/worker.js +++ b/test/resolve/worker.js @@ -14,8 +14,8 @@ describe('Worker', function () { describe('.enqueue', function () { it('return a promise', function () { - var worker = new Worker(), - promise; + var worker = new Worker(); + var promise; promise = worker.enqueue(function () { return Q.resolve('foo'); }); @@ -46,8 +46,8 @@ describe('Worker', function () { }); it('should assume the default concurrency when a type is not specified', function (next) { - var worker = new Worker(1), - calls = 0; + var worker = new Worker(1); + var calls = 0; worker.enqueue(function () { calls++; return Q.defer().promise; }); worker.enqueue(function () { next(new Error('Should not be called!')); }); @@ -59,8 +59,8 @@ describe('Worker', function () { }); it('should assume the default concurrency when a type is not known', function (next) { - var worker = new Worker(1), - calls = 0; + var worker = new Worker(1); + var calls = 0; worker.enqueue(function () { calls++; return Q.defer().promise; }, 'foo_type'); worker.enqueue(function () { next(new Error('Should not be called!')); }, 'foo_type'); @@ -72,8 +72,8 @@ describe('Worker', function () { }); it('should have different slots when type is not passed or is not known', function (next) { - var worker = new Worker(1), - calls = 0; + var worker = new Worker(1); + var calls = 0; worker.enqueue(function () { calls++; return Q.defer().promise; }); worker.enqueue(function () { calls++; return Q.defer().promise; }, 'foo_type'); @@ -90,12 +90,12 @@ describe('Worker', function () { var worker = new Worker(1, { foo: 2, bar: 3 - }), - calls = { - def: 0, - foo: 0, - bar: 0 - }; + }); + var calls = { + def: 0, + foo: 0, + bar: 0 + }; worker.enqueue(function () { calls.def++; return Q.defer().promise; }); worker.enqueue(function () { next(new Error('Should not be called!')); }); @@ -119,8 +119,8 @@ describe('Worker', function () { it('should clear the whole queue', function (next) { var worker = new Worker(1, { foo: 2 - }), - calls = 0; + }); + var calls = 0; worker.enqueue(function () { calls++; return Q.resolve(); }); worker.enqueue(function () { next(new Error('Should not be called!')); }); @@ -141,8 +141,8 @@ describe('Worker', function () { it('should wait for currently running functions to finish', function (next) { var worker = new Worker(1, { foo: 2 - }), - calls = []; + }); + var calls = []; worker.enqueue(function () { calls.push(1); return Q.resolve(); }); worker.enqueue(function () { calls.push(2); return Q.resolve(); }); @@ -171,8 +171,8 @@ describe('Worker', function () { it('should start remaining tasks when one ends', function (next) { var worker = new Worker(1, { foo: 2 - }), - calls = 0; + }); + var calls = 0; worker.enqueue(function () { calls++; return Q.resolve(); }); worker.enqueue(function () { calls++; return Q.resolve(); }, 'foo'); @@ -187,9 +187,9 @@ describe('Worker', function () { }); it('should respect the enqueue order', function (next) { - var worker = new Worker(1), - defCalls = [], - fooCalls = []; + var worker = new Worker(1); + var defCalls = []; + var fooCalls = []; worker.enqueue(function () { defCalls.push(1); @@ -232,8 +232,8 @@ describe('Worker', function () { var worker = new Worker(1, { foo: 1, bar: 2 - }), - calls = 0; + }); + var calls = 0; worker.enqueue(function () { return Q.defer().promise; }, 'foo'); worker.enqueue(function () { return Q.defer().promise; }, 'bar'); @@ -253,8 +253,8 @@ describe('Worker', function () { var worker = new Worker(1, { foo: 1, bar: 2 - }), - calls = 0; + }); + var calls = 0; worker.enqueue(function () { return Q.defer().promise; }, 'bar'); worker.enqueue(function () { calls++; return Q.resolve(); }, ['foo', 'bar']); @@ -267,4 +267,4 @@ describe('Worker', function () { }, 25); }); }); -}); \ No newline at end of file +});