Update code style

Author: oliversalzburg

.editorconfig

@@ -15,6 +15,8 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-# Settings specific to Markdown files
-[*.md]
-trim_trailing_whitespace = false
+[*.hbs]
+insert_final_newline = false
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

.eslintrc

@@ -15,6 +15,8 @@
     "semi": [2, "always"],
     "comma-style": [2, "last"],
     "one-var": [2, "never"],
+    "strict": [2, "global"],
+    "prefer-template": 2,
     "no-console": 0,
     "no-use-before-define": [2, "nofunc"],
     "no-underscore-dangle": 0,

config/config.node.js

@@ -1 +1,3 @@
+'use strict';
+
 app.controller('SshDeployController', require('./controller'));

lib/bundler.js

@@ -7,7 +7,7 @@ module.exports = {
   // A generic solution would be to use git-archive;
   // See https://github.com/Strider-CD/strider-ssh-deploy/issues/2
   bundleProject: function (dataDir, name, progress, done) {
-    var bundlePath = '/tmp/' + name + '.tar.gz';
+    var bundlePath = `/tmp/${name}.tar.gz`;
     var progstream = require('progress-stream');
     var progressEmitter = progstream({time: 1000});
     progressEmitter.on('progress', progress);
@@ -23,6 +23,6 @@ module.exports = {
       });
   },
   untarCmd: function (bundlePath, extractDir) {
-    return 'tar -zxf ' + bundlePath + ' -C ' + extractDir + ' --strip-components=1';
+    return `tar -zxf ${bundlePath} -C ${extractDir} --strip-components=1`;
   }
 };

lib/deploy.js

@@ -74,15 +74,15 @@ module.exports = {
 
         if (config.scp) {
           bundler.bundleProject(context.dataDir, projectName, function (tar) {
-            context.comment('Compressing ... ' + Math.round(tar.percentage) + '%');
+            context.comment(`Compressing ... ${Math.round(tar.percentage)}%`);
           }, function (err, bundlePath) {
             if (err) {
-              return done(new Error('Could not create bundle ' + bundlePath));
+              return done(new Error(`Could not create bundle ${bundlePath}`));
             } else {
               proceed({
                 localBundlePath: bundlePath,
                 progress: function (sftp) {
-                  context.comment('Uploading ... ' + Math.round(sftp.percentage) + '%');
+                  context.comment(`Uploading ... ${Math.round(sftp.percentage)}%`);
                 }
               });
             }

lib/keys.js

@@ -12,7 +12,7 @@ module.exports = {
   whatIsMyPublicKey: function () {
     var pubKey = this.branch.pubkey;
     if (pubKey)
-      return 'Your public key on this branch:\n' + pubKey;
+      return `Your public key on this branch:\n${pubKey}`;
     else
       return 'You do not have a public key on this worker.';
   },
@@ -30,7 +30,7 @@ function findBranch(branches, name) {
   var foundBranch = false;
   branches.some(function (branch) {
     if (branch.name) {
-      var regEx = new RegExp('^' + branch.name.replace(/\*/g, '.*') + '$');
+      var regEx = new RegExp(`^${branch.name.replace(/\*/g, '.*')}$`);
       if (regEx.test(name)) {
         foundBranch = branch;
         return true;

lib/parse_host_string.js

@@ -31,7 +31,7 @@ module.exports = function (str) {
     port = 22;
   }
   return {
-    string: user+'@'+host+':'+port,
+    string: `${user}@${host}:${port}`,
     user: user,
     host: host,
     port: port

lib/remote_paths.js

@@ -1,13 +1,13 @@
 'use strict';
 
 module.exports = function (name) {
-  var remote = '$HOME/' + name;
+  var remote = `$HOME/${name}`;
   var randomId = Math.random().toString(36).substring(7);
 
   return {
     name: name,
     remote: remote,
-    old: remote + '.old',
-    bundle: '/tmp/package-' + randomId + '.tar.gz'
+    old: `${remote}.old`,
+    bundle: `/tmp/package-${randomId}.tar.gz`
   };
 };

lib/remotely.js

@@ -7,14 +7,14 @@ var progress = require('progress-stream');
 var bundler = require('./bundler');
 
 function devnull(str) {
-  return str + ' > /dev/null 2>&1';
+  return `${str} > /dev/null 2>&1`;
 }
 
 function prepare(paths) {
   return [
-    devnull('rm -rf ' + paths.old),
-    devnull('mv ' + paths.remote + ' ' + paths.old),
-    devnull('mkdir ' + paths.remote),
+    devnull(`rm -rf ${paths.old}`),
+    devnull(`mv ${paths.remote} ${paths.old}`),
+    devnull(`mkdir ${paths.remote}`),
     devnull(bundler.untarCmd(paths.bundle, paths.remote)),
     '\n' // keep this newline so you can simply concat more onto this output
   ].join('\n');
@@ -39,7 +39,7 @@ function runScript(conn, script, out, done) {
 
 module.exports = {
   deploy: function (out, projectName, script, connectOptions, scp) {
-    var prefix = 'Host ' + connectOptions.host + ':' + connectOptions.port + ' -- ';
+    var prefix = `Host ${connectOptions.host}:${connectOptions.port} -- `;
     var paths = require('./remote_paths')(projectName);
     return new Promise(function (resolve, reject) {
       if (!connectOptions.username)
@@ -68,14 +68,14 @@ module.exports = {
         }
       }).on('error', function (err) {
         if (/Authentication failure/.test(err.message)) {
-          reject(new Error(prefix + 'Public key is not authorized.\nCheck your key on the Branch tab.'));
+          reject(new Error(`${prefix}Public key is not authorized.\nCheck your key on the Branch tab.`));
         } else
-          reject(new Error(prefix + err.name + ': ' + err.message));
+          reject(new Error(`${prefix}${err.name}: ${err.message}`));
       }).on('close', function (hadError) {
         if (hadError)
-          reject(new Error(prefix + 'Remote connection had errors.')); // should have rejected already
+          reject(new Error(`${prefix}Remote connection had errors.`)); // should have rejected already
         else if (exitCode !== 0)
-          reject(new Error(prefix + 'Remote script exited non-zero ' + exitCode));
+          reject(new Error(`${prefix}Remote script exited non-zero ${exitCode}`));
         else
           resolve();
       }).connect(connectOptions);