fix(eslint): correct eslint issues in hooks, index, and add task to package.json.

Author: jthoms1

index.js

@@ -1,21 +1,17 @@
-var fs = require('fs'),
-    IonicAppLib = module.exports,
-    path = require('path');
+var fs = require('fs');
+var IonicAppLib = module.exports;
+var path = require('path');
 
-var capitalize = function capitalize(str) {
-  return str && str[0].toUpperCase() + str.slice(1);
-};
-
-var camelCase = function camelCase(input) {
-    return input.toLowerCase().replace(/-(.)/g, function(match, group1) {
-        return group1.toUpperCase();
-    });
-};
+function camelCase(input) {
+  return input.toLowerCase().replace(/-(.)/g, function(match, group1) {
+    return group1.toUpperCase();
+  });
+}
 
 //
 // Setup all modules as lazy-loaded getters.
 //
-fs.readdirSync(path.join(__dirname, 'lib')).forEach(function (file) {
+fs.readdirSync(path.join(__dirname, 'lib')).forEach(function(file) {
   file = file.replace('.js', '');
   var command;
 
@@ -25,11 +21,11 @@ fs.readdirSync(path.join(__dirname, 'lib')).forEach(function (file) {
     command = file;
   }
 
-  IonicAppLib.__defineGetter__(command, function () {
+  IonicAppLib.__defineGetter__(command, function() { // eslint-disable-line no-underscore-dangle
     return require('./lib/' + file);
   });
 });
 
-IonicAppLib.__defineGetter__('semver', function () {
+IonicAppLib.__defineGetter__('semver', function() { // eslint-disable-line no-underscore-dangle
   return require('semver');
 });

lib/hooks/after_platform_add/010_install_plugins.js

@@ -5,25 +5,21 @@
  * https://raw.githubusercontent.com/diegonetto/generator-ionic/master/templates/hooks/after_platform_add/install_plugins.js
  */
 var exec = require('child_process').exec;
-var path = require('path');
 var sys = require('sys');
 
 var packageJSON = null;
 
 try {
   packageJSON = require('../../package.json');
-} catch(ex) {
-  console.log('\nThere was an error fetching your package.json file.')
-  console.log('\nPlease ensure a valid package.json is in the root of this project\n')
+} catch (ex) {
+  console.log('\nThere was an error fetching your package.json file.');
+  console.log('\nPlease ensure a valid package.json is in the root of this project\n');
   return;
 }
 
-var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
-// var script = path.resolve(__dirname, '../../node_modules/cordova/bin', cmd);
-
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
-packageJSON.cordovaPlugins.forEach(function (plugin) {
-  exec('cordova plugin add ' + plugin, function (error, stdout, stderr) {
+packageJSON.cordovaPlugins.forEach(function(plugin) {
+  exec('cordova plugin add ' + plugin, function(error, stdout) {
     sys.puts(stdout);
   });
 });

lib/hooks/after_plugin_add/010_register_plugin.js

@@ -3,52 +3,52 @@
 /**
  * Push plugins to cordovaPlugins array after_plugin_add
  */
-var fs = require('fs'),
-    packageJSON = require('../../package.json'),
-    path = require('path');
+var fs = require('fs');
+var packageJSON = require('../../package.json');
+var path = require('path');
 
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
-process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
-  var configString,
-      idRegEx,
-      id,
-      pluginXmlPath,
-      pluginToAdd;
+process.env.CORDOVA_PLUGINS.split(',').forEach(function(plugin) {
+  var configString;
+  var idRegEx;
+  var id;
+  var pluginXmlPath;
+  var pluginToAdd;
 
-  if(plugin.indexOf('https') != -1 || plugin.indexOf('git') != -1) {
+  if (plugin.indexOf('https') !== -1 || plugin.indexOf('git') !== -1) {
     console.log('Installing plugin from url');
   }
 
-  if(plugin.indexOf('/') != -1) {
+  if (plugin.indexOf('/') !== -1) {
     try {
       pluginXmlPath = path.resolve(plugin, 'plugin.xml');
       console.log('got pluginXmlPath:', pluginXmlPath);
       if (!fs.existsSync(pluginXmlPath)) {
-        var errorMessage = ['There was no plugin.xml file found for path: ', pluginXmlPath].join('');
+        ['There was no plugin.xml file found for path: ', pluginXmlPath].join('');
         return;
       }
 
-      configString = fs.readFileSync(pluginXmlPath,{encoding: 'utf8'});
+      configString = fs.readFileSync(pluginXmlPath, { encoding: 'utf8' });
       idRegEx = new RegExp('<plugin[^>]*id="(.*)"', 'i');
-      id = idRegEx.exec(configString)[1]
-      pluginToAdd = {id: id, locator: plugin};
-    } catch(ex) {
+      id = idRegEx.exec(configString)[1];
+      pluginToAdd = { id: id, locator: plugin };
+    } catch (ex) {
       console.log('There was an error retrieving the plugin.xml filr from the 010_register_plugin.js hook', ex);
     }
   } else {
     pluginToAdd = plugin;
   }
 
-  if(typeof pluginToAdd == 'string' && packageJSON.cordovaPlugins.indexOf(pluginToAdd) == -1) {
+  if (typeof pluginToAdd == 'string' && packageJSON.cordovaPlugins.indexOf(pluginToAdd) === -1) {
     packageJSON.cordovaPlugins.push(pluginToAdd);
   } else if (typeof pluginToAdd == 'object') {
     var pluginExists = false;
     packageJSON.cordovaPlugins.forEach(function(checkPlugin) {
-      if(typeof checkPlugin == 'object' && checkPlugin.id == pluginToAdd.id) {
+      if (typeof checkPlugin == 'object' && checkPlugin.id === pluginToAdd.id) {
         pluginExists = true;
       }
-    })
-    if(!pluginExists) {
+    });
+    if (!pluginExists) {
       packageJSON.cordovaPlugins.push(pluginToAdd);
     }
   }

lib/hooks/after_plugin_rm/010_deregister_plugin.js

@@ -8,15 +8,16 @@ var packageJSON = require('../../package.json');
 
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
 
-process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
+process.env.CORDOVA_PLUGINS.split(',').forEach(function(plugin) {
   var index = packageJSON.cordovaPlugins.indexOf(plugin);
   if (index > -1) {
     packageJSON.cordovaPlugins.splice(index, 1);
   } else {
-    //If it didnt find a match, it may be listed as {id,locator}
-    for(var i = 0, j = packageJSON.cordovaPlugins.length; i < j; i++) {
+
+    // If it didnt find a match, it may be listed as {id,locator}
+    for (var i = 0, j = packageJSON.cordovaPlugins.length; i < j; i += 1) {
       var packagePlugin = packageJSON.cordovaPlugins[i];
-      if(typeof packagePlugin == 'object' && packagePlugin.id == plugin) {
+      if (typeof packagePlugin == 'object' && packagePlugin.id === plugin) {
         packageJSON.cordovaPlugins.splice(index, 1);
         break;
       }

lib/hooks/after_prepare/010_add_platform_class.js

@@ -14,6 +14,7 @@ var path = require('path');
 var rootdir = process.argv[2];
 
 function addPlatformBodyTag(indexPath, platform) {
+
   // add the platform class to the body tag
   try {
     var platformClass = 'platform-' + platform;
@@ -22,21 +23,23 @@ function addPlatformBodyTag(indexPath, platform) {
     var html = fs.readFileSync(indexPath, 'utf8');
 
     var bodyTag = findBodyTag(html);
-    if(!bodyTag) return; // no opening body tag, something's wrong
+    if (!bodyTag) return; // no opening body tag, something's wrong
 
-    if(bodyTag.indexOf(platformClass) > -1) return; // already added
+    if (bodyTag.indexOf(platformClass) > -1) return; // already added
 
     var newBodyTag = bodyTag;
 
     var classAttr = findClassAttr(bodyTag);
-    if(classAttr) {
+    if (classAttr) {
+
       // body tag has existing class attribute, add the classname
-      var endingQuote = classAttr.substring(classAttr.length-1);
-      var newClassAttr = classAttr.substring(0, classAttr.length-1);
+      var endingQuote = classAttr.substring(classAttr.length - 1);
+      var newClassAttr = classAttr.substring(0, classAttr.length - 1);
       newClassAttr += ' ' + platformClass + ' ' + cordovaClass + endingQuote;
       newBodyTag = bodyTag.replace(classAttr, newClassAttr);
 
     } else {
+
       // add class attribute to the body tag
       newBodyTag = bodyTag.replace('>', ' class="' + platformClass + ' ' + cordovaClass + '">');
     }
@@ -46,49 +49,51 @@ function addPlatformBodyTag(indexPath, platform) {
     fs.writeFileSync(indexPath, html, 'utf8');
 
     process.stdout.write('add to body class: ' + platformClass + '\n');
-  } catch(e) {
+  } catch (e) {
     process.stdout.write(e);
   }
 }
 
 function findBodyTag(html) {
+
   // get the body tag
-  try{
+  try {
     return html.match(/<body(?=[\s>])(.*?)>/gi)[0];
-  }catch(e){}
+  } catch (e) {} // eslint-disable-line no-empty
 }
 
 function findClassAttr(bodyTag) {
+
   // get the body tag's class attribute
-  try{
+  try {
     return bodyTag.match(/ class=["|'](.*?)["|']/gi)[0];
-  }catch(e){}
+  } catch (e) {} // eslint-disable-line no-empty
 }
 
 if (rootdir) {
 
   // go through each of the platform directories that have been prepared
   var platforms = (process.env.CORDOVA_PLATFORMS ? process.env.CORDOVA_PLATFORMS.split(',') : []);
 
-  for(var x=0; x<platforms.length; x++) {
+  for (var x = 0; x < platforms.length; x += 1) {
+
     // open up the index.html file at the www root
     try {
       var platform = platforms[x].trim().toLowerCase();
       var indexPath;
 
-      if(platform == 'android') {
+      if (platform === 'android') {
         indexPath = path.join('platforms', platform, 'assets', 'www', 'index.html');
       } else {
         indexPath = path.join('platforms', platform, 'www', 'index.html');
       }
 
-      if(fs.existsSync(indexPath)) {
+      if (fs.existsSync(indexPath)) {
         addPlatformBodyTag(indexPath, platform);
       }
 
-    } catch(e) {
+    } catch (e) {
       process.stdout.write(e);
     }
   }
-
 }

lib/hooks/after_prepare/020_remove_sass_from_platforms.js

@@ -7,19 +7,19 @@
 var fs = require('fs');
 var path = require('path');
 
-var deleteFolderRecursive = function(removePath) {
-  if( fs.existsSync(removePath) ) {
-    fs.readdirSync(removePath).forEach(function(file,index){
+function deleteFolderRecursive(removePath) {
+  if (fs.existsSync(removePath)) {
+    fs.readdirSync(removePath).forEach(function(file) {
       var curPath = path.join(removePath, file);
-      if(fs.lstatSync(curPath).isDirectory()) { // recurse
+      if (fs.lstatSync(curPath).isDirectory()) { // recurse
         deleteFolderRecursive(curPath);
       } else { // delete file
         fs.unlinkSync(curPath);
       }
     });
     fs.rmdirSync(removePath);
   }
-};
+}
 
 var iosPlatformsDir = path.resolve(__dirname, '../../platforms/ios/www/lib/ionic/scss');
 var androidPlatformsDir = path.resolve(__dirname, '../../platforms/android/assets/www/lib/ionic/scss');

lib/hooks/before_platform_add/init_directories.js

@@ -11,13 +11,13 @@ var platformsDir = path.resolve(__dirname, '../../platforms');
 var pluginsDir = path.resolve(__dirname, '../../plugins');
 
 try {
-  fs.mkdirSync(platformsDir, function (err) {
+  fs.mkdirSync(platformsDir, function(err) {
     if (err) { console.error(err); }
   });
-} catch(ex) {}
+} catch (ex) {} // eslint-disable-line no-empty
 
 try {
-  fs.mkdirSync(pluginsDir, function (err) {
+  fs.mkdirSync(pluginsDir, function(err) {
     if (err) { console.error(err); }
   });
-} catch(ex) {}
+} catch (ex) {} // eslint-disable-line no-empty

package.json

@@ -70,15 +70,15 @@
   },
   "devDependencies": {
     "coveralls": "^2.11.9",
+    "eslint": "^2.8.0",
     "istanbul": "^0.4.3",
     "jasmine-node": "1.14.5",
-    "jshint": "^2.9.1",
     "rewire": "2.5.1"
   },
   "scripts": {
     "test": "npm run jasmine",
-    "jshint": "jshint lib spec --exclude lib/assets",
     "jasmine": "jasmine-node --captureExceptions spec/",
+    "lint": "eslint .",
     "coveralls": "istanbul cover node_modules/jasmine-node/bin/jasmine-node --captureExceptions spec/ && cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js && rm -rf coverage"
   }
 }