Code cleanup based on ESLint warnings

STYLEGUIDE.md

@@ -192,7 +192,7 @@ while (true) {
 
 try {
   // code that throws an error
-} catch(e) {
+} catch (e) {
   // code that handles an error
 }
 ```

bin/changelog

@@ -42,7 +42,7 @@ function getCommitMessage(commitInfo) {
     try {
       // command from http://stackoverflow.com/questions/8475448/find-merge-commit-which-include-a-specific-commit
       message = execSync('commit=$((git rev-list ' + originalCommit + '..origin/master --ancestry-path | cat -n; git rev-list ' + originalCommit + '..origin/master --first-parent | cat -n) | sort -k2 | uniq -f1 -d | sort -n | tail -1 | cut -f2) && git show --format="%s\n\n%b" $commit', { encoding: 'utf8' });
-    } catch(e) { }
+    } catch (e) { }
   }
 
   return message;

bin/feature-flag-yuidoc-filter.js

@@ -11,19 +11,19 @@ function isClassToBeIncluded(item, featuresToFilter) {
     }
   }
   return true;
-};
+}
 
 function gatherFeatures() {
-    var featuresJson = JSON.parse(fs.readFileSync('features.json'));
-    var featuresObj = featuresJson.features;
-    var featuresToFilter = [];
-    for (var feature in featuresObj) {
-        if (featuresObj[feature] === null || featuresObj[feature] === false) {
-            featuresToFilter.push(feature);
-        }
+  var featuresJson = JSON.parse(fs.readFileSync('features.json'));
+  var featuresObj = featuresJson.features;
+  var featuresToFilter = [];
+  for (var feature in featuresObj) {
+    if (featuresObj[feature] === null || featuresObj[feature] === false) {
+      featuresToFilter.push(feature);
     }
-    return featuresToFilter;
-};
+  }
+  return featuresToFilter;
+}
 
 function gatherClassesToDocument(data, featuresToFilter) {
   var classesToDocument = {};
@@ -34,24 +34,23 @@ function gatherClassesToDocument(data, featuresToFilter) {
     }
   }
   return classesToDocument;
-};
+}
 
 function updateClassReferencesInNamespaces(data) {
   for (var namespace in data.modules) {
     var namespaceClasses = {};
     var originalClasses = data.modules[namespace].classes;
-    for(var className in originalClasses) {
+    for (var className in originalClasses) {
       if (data.classes.hasOwnProperty(className)) {
         namespaceClasses[className] = originalClasses[className]
       }
     }
     data.modules[namespace].classes = namespaceClasses;
   }
-
-};
+}
 
 module.exports = function (data, options) {
-    var featuresToFilter = gatherFeatures();
-    data.classes = gatherClassesToDocument(data, featuresToFilter);
-    updateClassReferencesInNamespaces(data);
+  var featuresToFilter = gatherFeatures();
+  data.classes = gatherClassesToDocument(data, featuresToFilter);
+  updateClassReferencesInNamespaces(data);
 };

bin/run-sauce-tests.js

@@ -50,7 +50,7 @@ RSVP.resolve()
     console.log('error');
     console.log(error);
     process.exit(1);
-  }).then(function(){
+  }).then(function() {
     console.log('success');
     process.exit(0);
   });

bin/run-travis-browser-tests.js

@@ -2,7 +2,6 @@
 
 var RSVP  = require('rsvp');
 var spawn = require('child_process').spawn;
-var execSync = require('child_process').execSync;
 
 function run(command, _args) {
   var args = _args || [];

blueprints/-addon-import.js

@@ -38,7 +38,7 @@ module.exports = {
     var modulePathSegments = [addonName, inflector.pluralize(options.originBlueprintName), fileName];
 
     if (blueprintName.match(/-addon/)) {
-      blueprintName = blueprintName.substr(0,blueprintName.indexOf('-addon'));
+      blueprintName = blueprintName.substr(0, blueprintName.indexOf('-addon'));
       modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
     }
 

blueprints/component-addon/index.js

@@ -45,7 +45,7 @@ module.exports = {
     var importPathName       = [addonName, 'components', fileName].join('/');
 
     if (options.pod) {
-      importPathName = [addonName, 'components', fileName,'component'].join('/');
+      importPathName = [addonName, 'components', fileName, 'component'].join('/');
     }
 
     return {

blueprints/component-test/index.js

@@ -15,9 +15,9 @@ module.exports = useTestFrameworkDetector({
       name: 'test-type',
       type: ['integration', 'unit'],
       default: 'integration',
-      aliases:[
-        { 'i': 'integration'},
-        { 'u': 'unit'},
+      aliases: [
+        { 'i': 'integration' },
+        { 'u': 'unit' },
         { 'integration': 'integration' },
         { 'unit': 'unit' }
       ]

blueprints/component/index.js

@@ -16,8 +16,8 @@ module.exports = {
       name: 'path',
       type: String,
       default: 'components',
-      aliases:[
-        {'no-path': ''}
+      aliases: [
+        { 'no-path': '' }
       ]
     }
   ],
@@ -57,7 +57,7 @@ module.exports = {
     var contents       = '';
     // if we're in an addon, build import statement
     if (options.project.isEmberCLIAddon() || options.inRepoAddon && !options.inDummy) {
-      if(options.pod) {
+      if (options.pod) {
         templatePath   = './template';
       } else {
         templatePath   = pathUtil.getRelativeParentPath(options.entity.name) +

blueprints/helper-test/index.js

@@ -13,9 +13,9 @@ module.exports = useTestFrameworkDetector({
       name: 'test-type',
       type: ['integration', 'unit'],
       default: 'unit',
-      aliases:[
-        { 'i': 'integration'},
-        { 'u': 'unit'},
+      aliases: [
+        { 'i': 'integration' },
+        { 'u': 'unit' },
         { 'integration': 'integration' },
         { 'unit': 'unit' }
       ]
@@ -38,7 +38,7 @@ module.exports = useTestFrameworkDetector({
     return {
       friendlyTestName: friendlyTestName,
       dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
-      testType:testType
+      testType: testType
     };
   },
 
@@ -49,4 +49,4 @@ module.exports = useTestFrameworkDetector({
       ]);
     }
   }
-});
+});

blueprints/route/index.js

@@ -45,7 +45,7 @@ module.exports = {
         }
 
         if (options.inDummy) {
-          return path.join('tests','dummy','app');
+          return path.join('tests', 'dummy', 'app');
         }
 
         if (options.inAddon) {

config/s3ProjectConfig.js

@@ -1,4 +1,4 @@
-function fileMap(revision,tag,date) {
+function fileMap(revision, tag, date) {
   return {
     "ember.js":                   fileObject("ember",                   ".js",   "text/javascript",  revision, tag, date),
     "ember.debug.js":             fileObject("ember.debug",             ".js",   "text/javascript",  revision, tag, date),
@@ -15,7 +15,7 @@ function fileMap(revision,tag,date) {
     "composer.json":              fileObject("composer",                ".json", "application/json", revision, tag, date),
     "package.json":               fileObject("package",                 ".json", "application/json", revision, tag, date),
   };
-};
+}
 
 function fileObject(baseName, extension, contentType, currentRevision, tag, date) {
   var fullName = "/" + baseName + extension;

ember-cli-build.js

@@ -17,7 +17,6 @@ var filterImports     = require('babel-plugin-filter-imports');
 
 var vendoredPackage    = require('emberjs-build/lib/vendored-package');
 var htmlbarsPackage    = require('emberjs-build/lib/htmlbars-package');
-var vendoredES6Package = require('emberjs-build/lib/es6-vendored-package');
 var replaceVersion     = require('emberjs-build/lib/utils/replace-version');
 
 var Funnel = require('broccoli-funnel');
@@ -254,7 +253,7 @@ module.exports = function() {
     'router':                router(),
     'dag-map':               dag(),
     'route-recognizer':      routeRecognizer(),
-    'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer', { libPath: 'node_modules/glimmer-engine/dist/es6'}),
+    'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer', { libPath: 'node_modules/glimmer-engine/dist/es6' }),
 
     'glimmer':              glimmerPackage('glimmer'),
     'glimmer-compiler':     glimmerPackage('glimmer-compiler'),

lib/jscs-rules/disallow-space-inside-round-braces-in-call-expression.js

@@ -35,8 +35,6 @@ module.exports.prototype = {
   },
 
   check: function(file, errors) {
-    var tokens = file.getTokens();
-
     file.iterateNodesByType('CallExpression', function(node) {
       var nodeBeforeRoundBrace = node;
 

lib/packages.js

@@ -1,5 +1,3 @@
-var fs = require('fs');
-
 module.exports = function(features) {
   var packages = {
     'container':                  { trees: null,  requirements: ['ember-utils'] },

node-tests/blueprints/acceptance-test-test.js

@@ -68,8 +68,8 @@ describe('Acceptance: ember generate and destroy acceptance-test', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/acceptance/foo-test.js'))

node-tests/blueprints/component-test.js

@@ -791,8 +791,8 @@ describe('Acceptance: ember generate component', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/integration/components/x-foo-test.js'))
@@ -810,8 +810,8 @@ describe('Acceptance: ember generate component', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/components/x-foo-test.js'))

node-tests/blueprints/controller-test.js

@@ -238,8 +238,8 @@ describe('Acceptance: ember generate and destroy controller', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/controllers/foo-test.js'))

node-tests/blueprints/helper-test.js

@@ -249,8 +249,8 @@ describe('Acceptance: ember generate and destroy helper', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/integration/helpers/foo/bar-baz-test.js'))
@@ -264,8 +264,8 @@ describe('Acceptance: ember generate and destroy helper', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/helpers/foo/bar-baz-test.js'))

node-tests/blueprints/initializer-test.js

@@ -296,8 +296,8 @@ describe('Acceptance: ember generate and destroy initializer', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/initializers/foo-test.js'))

node-tests/blueprints/instance-initializer-test.js

@@ -296,8 +296,8 @@ describe('Acceptance: ember generate and destroy instance-initializer', function
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/instance-initializers/foo-test.js'))

node-tests/blueprints/mixin-test.js

@@ -235,8 +235,8 @@ describe('Acceptance: ember generate and destroy mixin', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/mixins/foo-test.js'))

node-tests/blueprints/service-test.js

@@ -170,8 +170,8 @@ describe('Acceptance: ember generate and destroy service', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/services/foo-test.js'))

node-tests/blueprints/template-test.js

@@ -133,5 +133,4 @@ describe('Acceptance: ember generate and destroy template', function() {
         expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal('');
       }));
   });
-
 });

node-tests/blueprints/util-test.js

@@ -150,8 +150,8 @@ describe('Acceptance: ember generate and destroy util', function() {
 
     return emberNew()
       .then(() => modifyPackages([
-        {name: 'ember-cli-qunit', delete: true},
-        {name: 'ember-cli-mocha', dev: true}
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
       ]))
       .then(() => emberGenerateDestroy(args, _file => {
         expect(_file('tests/unit/utils/foo-bar-test.js'))