Minor CS fixes.

lib/core/Manager.js

@@ -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);
-};
+}
 
 // -----------------
 

lib/core/PackageRepository.js

@@ -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);
-};
+}
 
 // -----------------
 

lib/core/Project.js

@@ -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);
-};
+}
 
 // -----------------
 

lib/core/ResolveCache.js

@@ -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);
-};
+}
 
 // -----------------
 

lib/core/Worker.js

@@ -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 = [];
-};
+}
 
 // -----------------
 

lib/core/resolvers/FsResolver.js

@@ -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);

lib/core/resolvers/GitFsResolver.js

@@ -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);

lib/core/resolvers/GitRemoteResolver.js

@@ -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);

lib/core/resolvers/GitResolver.js

@@ -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);

lib/core/resolvers/Resolver.js

@@ -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;
-};
+}
 
 // -----------------
 

lib/core/resolvers/UrlResolver.js

@@ -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);
 

lib/renderers/cli.js

@@ -47,7 +47,7 @@ function renderTagPlusLabel(data) {
 
 // -------------------------
 
-var colorful = {
+colorful = {
     begin: function () {},
     end: function () {},
     error: function (err) {
@@ -66,13 +66,10 @@ var colorful = {
         this._write(process.stderr, str);
     },
     data: function (data) {
+        var outputStream;
+
         data.data = data.data || '';
-
-        var outputStream = process.stdout;
-
-        if (data.level === 'warn') {
-            outputStream = process.stderr;
-        }
+        outputStream = data.level === 'warn' ? process.stderr : process.stdout;
 
         this._write(outputStream, 'bower ' + renderTagPlusLabel(data) + ' ' + data.data + '\n');
     },
@@ -83,15 +80,15 @@ var colorful = {
 
         this.data(data);
     },
-    _write: function (channel, str) {
-        channel.write(str);
+    _write: function (outputStream, str) {
+        outputStream.write(str);
     }
 };
 
 // The colorless variant simply removes the colors from the write method
-var colorless = mout.object.mixIn({}, colorful, {
-    _write: function (channel, str) {
-        channel.write(uncolor(str));
+colorless = mout.object.mixIn({}, colorful, {
+    _write: function (outputStream, str) {
+        outputStream.write(uncolor(str));
     }
 });
 

lib/renderers/json.js

@@ -1,3 +1,6 @@
+var json;
+var nrData = 0;
+
 function uncolor(str) {
     return str.replace(/\x1B\[\d+m/g, '');
 }
@@ -8,11 +11,9 @@ function stringify(data) {
 
 // -------------------------
 
-var nrData = 0;
-
 // In the json output, everything goes to stderr except
 // the final command result that goes to stdout.
-var json = {
+json = {
     begin: function () {
         process.stderr.write('[');
     },

lib/renderers/silent.js

@@ -1,8 +1,10 @@
+var silent;
+
 function empty() {}
 
 // -------------------------
 
-var silent = {
+silent = {
     begin: empty,
     end: empty,
     error: empty,