style: update spacing to follow eslint (#412)

This commit enables the spacing checking rules in eslint, and also updates the code
to follow said rules.

Author: LinusU

.eslintrc

@@ -1,12 +1,9 @@
 {
   "extends": "standard",
   "rules": {
-    "block-spacing": 0,
     "brace-style": 0,
     "comma-dangle": 0,
     "indent": 0,
-    "key-spacing": 0,
-    "keyword-spacing": 0,
     "no-duplicate-imports": 0,
     "no-multiple-empty-lines": 0,
     "no-path-concat": 0,
@@ -16,10 +13,6 @@
     "operator-linebreak": 0,
     "padded-blocks": 0,
     "quotes": 0,
-    "semi-spacing": 0,
-    "semi": 0,
-    "space-before-blocks": 0,
-    "space-before-function-paren": 0,
-    "space-infix-ops": 0
+    "semi": 0
   }
 }

src/cli/commitizen.js

@@ -13,7 +13,7 @@ export {
  * This is the main cli entry point.
  * environment may be used for debugging.
  */
-function bootstrap(environment = {}) {
+function bootstrap (environment = {}) {
 
   // Get cli args
   let rawGitArgs = process.argv.slice(2, process.argv.length);
@@ -29,7 +29,7 @@ function bootstrap(environment = {}) {
       console.log(`Attempting to initialize using the npm package ${adapterNpmName}`);
       try {
         init(sh, process.cwd(), adapterNpmName, parsedArgs);  
-      } catch(e) {
+      } catch (e) {
         console.error(`Error: ${e}`);
       }
     } else {

src/cli/git-cz.js

@@ -10,15 +10,15 @@ export {
  * This is the main cli entry point.
  * environment may be used for debugging.
  */
-function bootstrap(environment = {}) {
+function bootstrap (environment = {}) {
 
   // Get cli args
   let rawGitArgs = process.argv.slice(2, process.argv.length);
 
   let adapterConfig = environment.config || configLoader.load();
 
   // Choose a strategy based on the existance the adapter config
-  if(typeof adapterConfig !== 'undefined') {
+  if (typeof adapterConfig !== 'undefined') {
     // This tells commitizen we're in business
     useGitCzStrategy(rawGitArgs, environment, adapterConfig);
   } else {

src/cli/parsers/commitizen.js

@@ -11,7 +11,7 @@ export {
  * 
  * TODO: Aww shit this is ugly. Rewrite with mega leet tests plz, kthnx.
  */
-function parse(rawGitArgs) {
+function parse (rawGitArgs) {
 
    var args = minimist(rawGitArgs, { 
      boolean: true

src/cli/parsers/git-cz.js

@@ -11,7 +11,7 @@ export {
  * 
  * TODO: Aww shit this is ugly. Rewrite with mega leet tests plz, kthnx.
  */
-function parse(rawGitArgs) {
+function parse (rawGitArgs) {
 
   var args = minimist(rawGitArgs, { 
     alias: {
@@ -49,7 +49,7 @@ function parse(rawGitArgs) {
       continue;
     } else if (isString(value)) {
       output += '-' + key + ' ' + value + ' ';
-    } else if (isArray(value) && value.length>0) {
+    } else if (isArray(value) && value.length > 0) {
       output += '-' + key + ' ' + value.join(' -' + key) + ' ';
     } else if (value === true || value === false) {
       output += '-' + key + ' ';
@@ -62,7 +62,7 @@ function parse(rawGitArgs) {
     }
   }
 
-  if(output.trim().length < 1) {
+  if (output.trim().length < 1) {
     return '';
   } else {
     return output;

src/cli/strategies/git-cz.js

@@ -17,20 +17,20 @@ let { isClean } = staging;
 
 export default gitCz;
 
-function gitCz(rawGitArgs, environment, adapterConfig) {
+function gitCz (rawGitArgs, environment, adapterConfig) {
 
   // See if any override conditions exist.
 
   // In these very specific scenarios we may want to use a different
   // commit strategy than git-cz. For example, in the case of --amend
   let parsedCommitizenArgs = commitizenParser.parse(rawGitArgs);
 
-  if(parsedCommitizenArgs.a) {
+  if (parsedCommitizenArgs.a) {
     // console.log('override -a in place');
     addPath(sh, process.cwd());
   }
 
-  if(parsedCommitizenArgs.amend) {
+  if (parsedCommitizenArgs.amend) {
     // console.log('override --amend in place');
     gitStrategy.default(rawGitArgs, environment);
     return;
@@ -47,12 +47,12 @@ function gitCz(rawGitArgs, environment, adapterConfig) {
   let resolvedAdapterRootPath = findRoot(resolvedAdapterConfigPath);
   let prompter = getPrompter(adapterConfig.path);
 
-  isClean(process.cwd(), function(error, stagingIsClean){
+  isClean(process.cwd(), function (error, stagingIsClean) {
     if (error) {
       throw error;
     }
 
-    if(stagingIsClean) {
+    if (stagingIsClean) {
       throw new Error('No files added to staging! Did you forget to run git add?');
     }
 
@@ -66,7 +66,7 @@ function gitCz(rawGitArgs, environment, adapterConfig) {
       emitData: true,
       quiet: false,
       retryLastCommit
-    }, function(error) {
+    }, function (error) {
       if (error) {
         throw error;
       }

src/cli/strategies/git.js

@@ -4,8 +4,8 @@ export default git;
 
 // We don't have a config, so either we use raw args to try to commit
 // or if debug is enabled then we do a strict check for a config file.
-function git(rawGitArgs, environment) {
-  if(environment.debug === true) {
+function git (rawGitArgs, environment) {
+  if (environment.debug === true) {
     console.error('COMMITIZEN DEBUG: No git-cz friendly config was detected. I looked for .czrc, .cz.json, or czConfig in package.json.');
   } else {
     var vanillaGitArgs = ["commit"].concat(rawGitArgs);

src/commitizen/adapter.js

@@ -30,7 +30,7 @@ export {
  * Modifies the package.json, sets config.commitizen.path to the path of the adapter
  * Must be passed an absolute path to the cli's root
  */
-function addPathToAdapterConfig(sh, cliPath, repoPath, adapterNpmName) {
+function addPathToAdapterConfig (sh, cliPath, repoPath, adapterNpmName) {
 
   let commitizenAdapterConfig = {
     config: {
@@ -46,7 +46,7 @@ function addPathToAdapterConfig(sh, cliPath, repoPath, adapterNpmName) {
   let indent = detectIndent(packageJsonString).indent || '  ';
   let packageJsonContent = JSON.parse(packageJsonString);
   let newPackageJsonContent = '';
-  if(_.get(packageJsonContent, 'config.commitizen.path') !== adapterNpmName) {
+  if (_.get(packageJsonContent, 'config.commitizen.path') !== adapterNpmName) {
     newPackageJsonContent = _.merge(packageJsonContent, commitizenAdapterConfig);
   }
   fs.writeFileSync(packageJsonPath, JSON.stringify(newPackageJsonContent, null, indent) + '\n');
@@ -55,14 +55,14 @@ function addPathToAdapterConfig(sh, cliPath, repoPath, adapterNpmName) {
 /**
  * Generates an npm install command given a map of strings and a package name
  */
-function generateNpmInstallAdapterCommand(stringMappings, adapterNpmName) {
+function generateNpmInstallAdapterCommand (stringMappings, adapterNpmName) {
 
   // Start with an initial npm install command
   let installAdapterCommand = `npm install ${adapterNpmName}`;
 
   // Append the neccesary arguments to it based on user preferences
-  for(let [key, value] of stringMappings.entries()) {
-    if(value) {
+  for (let [key, value] of stringMappings.entries()) {
+    if (value) {
       installAdapterCommand = installAdapterCommand + ' ' + value;
     }
   }
@@ -73,15 +73,15 @@ function generateNpmInstallAdapterCommand(stringMappings, adapterNpmName) {
 /**
  * Gets the nearest npm_modules directory
  */
-function getNearestNodeModulesDirectory(options) {
+function getNearestNodeModulesDirectory (options) {
 
   // Get the nearest node_modules directories to the current working directory
   let nodeModulesDirectories = findNodeModules(options);
 
   // Make sure we find a node_modules folder
 
   /* istanbul ignore else */
-  if(nodeModulesDirectories && nodeModulesDirectories.length > 0) {
+  if (nodeModulesDirectories && nodeModulesDirectories.length > 0) {
     return nodeModulesDirectories[0];
   } else {
     console.error(`Error: Could not locate node_modules in your project's root directory. Did you forget to npm init or npm install?`)
@@ -91,33 +91,33 @@ function getNearestNodeModulesDirectory(options) {
 /**
  * Gets the nearest project root directory
  */
-function getNearestProjectRootDirectory(options) {
+function getNearestProjectRootDirectory (options) {
   return path.join(process.cwd(), getNearestNodeModulesDirectory(options), '/../');
 }
 
 /**
  * Gets a map of arguments where the value is the corresponding npm strings
  */
-function getNpmInstallStringMappings(save, saveDev, saveExact, force) {
+function getNpmInstallStringMappings (save, saveDev, saveExact, force) {
   return new Map()
-    .set('save', (save && !saveDev) ? '--save':undefined)
-    .set('saveDev', saveDev ? '--save-dev':undefined)
-    .set('saveExact', saveExact ? '--save-exact':undefined)
-    .set('force', force ? '--force':undefined);
+    .set('save', (save && !saveDev) ? '--save' : undefined)
+    .set('saveDev', saveDev ? '--save-dev' : undefined)
+    .set('saveExact', saveExact ? '--save-exact' : undefined)
+    .set('force', force ? '--force' : undefined);
 }
 
 /**
  * Gets the prompter from an adapter given an adapter path
  */
-function getPrompter(adapterPath) {
+function getPrompter (adapterPath) {
   // Resolve the adapter path
   let resolvedAdapterPath = resolveAdapterPath(adapterPath);
 
   // Load the adapter
   let adapter = require(resolvedAdapterPath);
 
   /* istanbul ignore next */
-  if(adapter && adapter.prompter && isFunction(adapter.prompter)) {
+  if (adapter && adapter.prompter && isFunction(adapter.prompter)) {
      return adapter.prompter;
   } else if (adapter && adapter.default && adapter.default.prompter && isFunction(adapter.default.prompter)) {
      return adapter.default.prompter;
@@ -130,7 +130,7 @@ function getPrompter(adapterPath) {
  * Given a resolvable module name or path, which can be a directory or file, will
  * return a located adapter path or will throw.
  */
-function resolveAdapterPath(inboundAdapterPath) {
+function resolveAdapterPath (inboundAdapterPath) {
   // Check if inboundAdapterPath is a path or node module name
   let parsed = path.parse(inboundAdapterPath);
   let isPath = parsed.dir.length > 0 && parsed.dir.charAt(0) !== "@";
@@ -149,6 +149,6 @@ function resolveAdapterPath(inboundAdapterPath) {
   }
 }
 
-function getGitRootPath() {
+function getGitRootPath () {
   return sh.exec('git rev-parse --show-toplevel').stdout.trim();
 }

src/commitizen/cache.js

@@ -10,14 +10,14 @@ export {
 /**
  * Reads the entire cache
  */
-function readCacheSync(cachePath) {
+function readCacheSync (cachePath) {
   return JSON.parse(fs.readFileSync(cachePath, 'utf8'));
 }
 
 /**
  * Sets a cache value and writes the file to disk
  */
-function setCacheValueSync(cachePath, key, value) {
+function setCacheValueSync (cachePath, key, value) {
   var originalCache;
   try {
     originalCache = readCacheSync(cachePath); 
@@ -34,11 +34,11 @@ function setCacheValueSync(cachePath, key, value) {
 /**
  * Gets a single value from the cache given a key
  */
-function getCacheValueSync(cachePath, repoPath) {
+function getCacheValueSync (cachePath, repoPath) {
   try {
     let cache = readCacheSync(cachePath);
     return cache[repoPath];
-  } catch(e) {
+  } catch (e) {
     return;
   }
 }

src/commitizen/commit.js

@@ -11,26 +11,26 @@ export default commit;
 /**
  * Takes all of the final inputs needed in order to make dispatch a git commit
  */
-function dispatchGitCommit(sh, repoPath, template, options, overrideOptions, done) {
+function dispatchGitCommit (sh, repoPath, template, options, overrideOptions, done) {
     // Commit the user input -- side effect that we'll test
-    gitCommit(sh, repoPath, template, { ...options, ...overrideOptions }, function(error) {
+    gitCommit(sh, repoPath, template, { ...options, ...overrideOptions }, function (error) {
       done(error, template);
     });
 }
 
  /**
   * Asynchronously commits files using commitizen
   */
-function commit(sh, inquirer, repoPath, prompter, options, done) {
+function commit (sh, inquirer, repoPath, prompter, options, done) {
   var cacheDirectory = cacheDir('commitizen');
   var cachePath = path.join(cacheDirectory, 'commitizen.json');
 
-  ensureDir(cacheDirectory, function(error) {
+  ensureDir(cacheDirectory, function (error) {
     if (error) {
       console.error("Couldn't create commitizen cache directory: ", error);
       // TODO: properly handle error?
     } else {
-      if(options.retryLastCommit) {
+      if (options.retryLastCommit) {
 
         console.log('Retrying last commit attempt.');
 
@@ -45,7 +45,7 @@ function commit(sh, inquirer, repoPath, prompter, options, done) {
 
       } else {
         // Get user input -- side effect that is hard to test
-        prompter(inquirer, function(error, template, overrideOptions) {
+        prompter(inquirer, function (error, template, overrideOptions) {
           // Allow adapters to error out
           // (error: Error?, template: String, overrideOptions: Object)
           if (!(error instanceof Error)) {