tedious alignment and unifying the function name

kellyselden · Feb 14, 2016 · 990b966 · 990b966
1 parent f893d63
commit 990b966
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 51 deletions.
diff --git a/lib/cli/cli.js b/lib/cli/cli.js
@@ -1,16 +1,15 @@
 'use strict';
 
-var lookupCommand  = require('./lookup-command');
-var Promise        = require('../ext/promise');
-var versionUtils   = require('../utilities/version-utils');
-var UpdateChecker  = require('../models/update-checker');
-var getOptionArgs  = require('../utilities/get-option-args');
-var debug          = require('debug')('ember-cli:cli');
-var debugTesting   = require('debug')('ember-cli:testing');
-
-var PlatformChecker = require('../utilities/platform-checker');
-var emberCLIVersion      = versionUtils.emberCLIVersion;
-var InstallationChecker  = require('../models/installation-checker');
+var lookupCommand       = require('./lookup-command');
+var Promise             = require('../ext/promise');
+var versionUtils        = require('../utilities/version-utils');
+var UpdateChecker       = require('../models/update-checker');
+var getOptionArgs       = require('../utilities/get-option-args');
+var debug               = require('debug')('ember-cli:cli');
+var debugTesting        = require('debug')('ember-cli:testing');
+var PlatformChecker     = require('../utilities/platform-checker');
+var InstallationChecker = require('../models/installation-checker');
+var emberCLIVersion     = versionUtils.emberCLIVersion;
 
 function CLI(options) {
   this.name = options.name;

diff --git a/lib/commands/help.js b/lib/commands/help.js
@@ -7,8 +7,7 @@ var string          = require('../utilities/string');
 var assign          = require('lodash/assign');
 var GenerateCommand = require('./generate');
 var versionUtils    = require('../utilities/version-utils');
-
-var emberCLIVersion      = versionUtils.emberCLIVersion;
+var emberCLIVersion = versionUtils.emberCLIVersion;
 
 var RootCommand = Command.extend({
   isRoot: true,

diff --git a/lib/models/project.js b/lib/models/project.js
@@ -3,26 +3,25 @@
 /**
 @module ember-cli
 */
-var Promise             = require('../ext/promise');
-var path                = require('path');
-var findup              = Promise.denodeify(require('findup'));
-var resolve             = Promise.denodeify(require('resolve'));
-var fs                  = require('fs');
-var existsSync          = require('exists-sync');
-var find                = require('lodash/find');
-var assign              = require('lodash/assign');
-var forOwn              = require('lodash/forOwn');
-var merge               = require('lodash/merge');
-var debug               = require('debug')('ember-cli:project');
-var AddonDiscovery      = require('../models/addon-discovery');
-var AddonsFactory       = require('../models/addons-factory');
-var Command             = require('../models/command');
-var UI                  = require('../ui');
-var nodeModulesPath     = require('node-modules-path');
-
-var getPackageBaseName  = require('../utilities/get-package-base-name');
-var versionUtils        = require('../utilities/version-utils');
-var emberCLIVersion     = versionUtils.emberCLIVersion;
+var Promise            = require('../ext/promise');
+var path               = require('path');
+var findup             = Promise.denodeify(require('findup'));
+var resolve            = Promise.denodeify(require('resolve'));
+var fs                 = require('fs');
+var existsSync         = require('exists-sync');
+var find               = require('lodash/find');
+var assign             = require('lodash/assign');
+var forOwn             = require('lodash/forOwn');
+var merge              = require('lodash/merge');
+var debug              = require('debug')('ember-cli:project');
+var AddonDiscovery     = require('../models/addon-discovery');
+var AddonsFactory      = require('../models/addons-factory');
+var Command            = require('../models/command');
+var UI                 = require('../ui');
+var nodeModulesPath    = require('node-modules-path');
+var getPackageBaseName = require('../utilities/get-package-base-name');
+var versionUtils       = require('../utilities/version-utils');
+var emberCLIVersion    = versionUtils.emberCLIVersion;
 
 /**
   The Project model is tied to your package.json. It is instiantiated

diff --git a/lib/models/update-checker.js b/lib/models/update-checker.js
@@ -1,16 +1,17 @@
 'use strict';
 
-var Promise      = require('../ext/promise');
-var versionUtils = require('../utilities/version-utils');
-var chalk        = require('chalk');
-var debug        = require('debug')('ember-cli:update-checker');
+var Promise         = require('../ext/promise');
+var versionUtils    = require('../utilities/version-utils');
+var chalk           = require('chalk');
+var debug           = require('debug')('ember-cli:update-checker');
+var emberCLIVersion = versionUtils.emberCLIVersion;
 
 module.exports = UpdateChecker;
 
 function UpdateChecker(ui, settings, localVersion) {
   this.ui = ui;
   this.settings = settings;
-  this.localVersion = localVersion || versionUtils.emberCLIVersion();
+  this.localVersion = localVersion || emberCLIVersion();
   this.versionConfig = null;
 
   debug('version: %s', this.localVersion);

diff --git a/lib/utilities/doc-generator.js b/lib/utilities/doc-generator.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var versionUtils     = require('./version-utils');
-var calculateVersion = versionUtils.emberCLIVersion;
-var fs               = require('fs');
+var versionUtils    = require('./version-utils');
+var emberCLIVersion = versionUtils.emberCLIVersion;
+var fs              = require('fs');
 
 function DocGenerator(options) {
   options = options || {};
@@ -11,7 +11,7 @@ function DocGenerator(options) {
 
 DocGenerator.prototype.generate = function() {
   var command = 'cd docs && ' + fs.realpathSync('./node_modules/.bin/yuidoc') +
-                ' -q --project-version ' + calculateVersion(); // add '-p' flag to produce only JSON and not HTML
+                ' -q --project-version ' + emberCLIVersion(); // add '-p' flag to produce only JSON and not HTML
 
   console.log('Executing command: ' + command);
   this.exec(command, function(error){ // stdout, stderr

diff --git a/tests/acceptance/help-test.js b/tests/acceptance/help-test.js
@@ -14,8 +14,7 @@ var requireAsHash     = require('../../lib/utilities/require-as-hash');
 var Command           = require('../../lib/models/command');
 var commands          = requireAsHash('../../lib/commands/*.js', Command);
 var versionUtils      = require('../../lib/utilities/version-utils');
-
-var emberCLIVersion      = versionUtils.emberCLIVersion;
+var emberCLIVersion   = versionUtils.emberCLIVersion;
 
 chai.use(chaiString);
 

diff --git a/tests/unit/utilities/doc-generator-test.js b/tests/unit/utilities/doc-generator-test.js
@@ -1,11 +1,11 @@
 'use strict';
 
-var DocGenerator = require('../../../lib/utilities/doc-generator.js');
-var versionUtils = require('../../../lib/utilities/version-utils');
-var calculateVersion = versionUtils.emberCLIVersion;
-var expect = require('chai').expect;
-var path = require('path');
-var escapeRegExp = require('escape-string-regexp');
+var DocGenerator    = require('../../../lib/utilities/doc-generator.js');
+var versionUtils    = require('../../../lib/utilities/version-utils');
+var emberCLIVersion = versionUtils.emberCLIVersion;
+var expect          = require('chai').expect;
+var path            = require('path');
+var escapeRegExp    = require('escape-string-regexp');
 
 describe('generateDocs', function(){
   it('calls the the appropriate command', function(){
@@ -18,7 +18,7 @@ describe('generateDocs', function(){
         commandPath = '/node_modules/yuidocjs/lib/cli.js';
       }
 
-      var version = escapeRegExp(calculateVersion());
+      var version = escapeRegExp(emberCLIVersion());
       var pattern = 'cd docs && .+' + commandPath + ' -q --project-version ' + version;
 
       expect(arguments[0], 'yudoc command').to.match(new RegExp(pattern));