Cleanup

Author: oliversalzburg

.editorconfig

@@ -1,15 +1,22 @@
-# editorconfig.org
+# Strider Editor/IDE Settings
+# This file is used to promote consistent source code standards
+# amongst all Strider-CD contributors.
+# More information can be found here: http://editorconfig.org/
+
+# General Settings
 root = true
 
+# Settings for all files
 [*]
 indent_style = space
 indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-continuation_indent = 4
 
-[package.json]
-indent_style = space
-indent_size = 2
+[*.hbs]
+insert_final_newline = false
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

.eslintrc

@@ -0,0 +1,27 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "script"
+  },
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "extends": "eslint:recommended",
+  "rules": {
+    "indent": [2, 2],
+    "brace-style": [2, "1tbs"],
+    "quotes": [2, "single"],
+    "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,
+    "no-constant-condition": 0,
+    "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
+    "func-style": [2, "declaration"]
+  }
+}

.jshintrc

@@ -2,5 +2,3 @@ language: node_js
 node_js:
   - "4"
   - "node"
-
-sudo: false

.travis.yml

@@ -16,7 +16,11 @@ module.exports = {
   getFile: getFile,
   getBranches: getBranches,
   createHooks: createHooks,
-  deleteHooks: deleteHooks
+  deleteHooks: deleteHooks,
+  get_oauth2:get_oauth2,
+  api_call:api_call,
+  parse_link_header:parse_link_header,
+  pageinated_api_call:pageinated_api_call
 };
 
 /**
@@ -32,7 +36,7 @@ module.exports = {
  */
 function createHooks(reponame, url, secret, token, callback) {
   var qpm = {access_token: token};
-  var post_url = GITHUB_API_ENDPOINT + '/repos/' + reponame + '/hooks';
+  var post_url = `${GITHUB_API_ENDPOINT}/repos/${reponame}/hooks`;
   debug('CREATE WEBHOOK URL:', post_url, url);
   superagent
     .post(post_url)
@@ -52,12 +56,11 @@ function createHooks(reponame, url, secret, token, callback) {
 
       var badStatusErr;
       if (res.statusCode === 404) {
-        badStatusErr = new Error('Cannot create webhooks; are you sure you have admin rights?\nFeel free to manually create a webhook for ' + url);
+        badStatusErr = new Error(`Cannot create webhooks; are you sure you have admin rights?\nFeel free to manually create a webhook for ${url}`);
         badStatusErr.statusCode = res.statusCode;
         return callback(badStatusErr);
-      }
-      else if (res.statusCode !== 201) {
-        badStatusErr = new Error('Bad status code: ' + res.statusCode);
+      } else if (res.statusCode !== 201) {
+        badStatusErr = new Error(`Bad status code: ${res.statusCode}`);
         badStatusErr.statusCode = res.statusCode;
         return callback(badStatusErr);
       }
@@ -76,11 +79,11 @@ function createHooks(reponame, url, secret, token, callback) {
  * @param {Function} callback function(error, response, body)
  */
 function deleteHooks(reponame, url, token, callback) {
-  var apiUrl = GITHUB_API_ENDPOINT + '/repos/' + reponame + '/hooks';
-  debug('Delete hooks for ' + reponame + ', identified by ' + url);
+  var apiUrl = `${GITHUB_API_ENDPOINT}/repos/${reponame}/hooks`;
+  debug(`Delete hooks for ${reponame}, identified by ${url}`);
   superagent
     .get(apiUrl)
-    .set('Authorization', 'token ' + token)
+    .set('Authorization', `token ${token}`)
     .set('User-Agent', 'StriderCD (http://stridercd.com)')
     .end(function (err, res) {
       if(err) return callback(err);
@@ -95,13 +98,13 @@ function deleteHooks(reponame, url, token, callback) {
         hooks.push(function (next) {
           superagent
             .del(hook.url)
-            .set('Authorization', 'token ' + token)
+            .set('Authorization', `token ${token}`)
             .set('User-Agent', 'StriderCD (http://stridercd.com)')
             .end(function (err, res) {
-              if(err) return next(new Error('Failed to delete webhook ' + hook.url + 'Error: ' + err));
+              if(err) return next(new Error(`Failed to delete webhook ${hook.url}Error: ${err}`));
               if (res.status !== 204) {
                 debug('bad status', res.status, hook.id, hook.url);
-                return next(new Error('Failed to delete a webhook: status for url ' + hook.url + ': ' + res.status));
+                return next(new Error(`Failed to delete a webhook: status for url ${hook.url}: ${res.status}`));
               }
               next();
             });
@@ -115,9 +118,8 @@ function deleteHooks(reponame, url, token, callback) {
     });
 }
 
-
 function getBranches(accessToken, owner, repo, done) {
-  var path = '/repos/' + owner + '/' + repo + '/git/refs/heads';
+  var path = `/repos/${owner}/${repo}/git/refs/heads`;
   pageinated_api_call(path, accessToken, function (err, res) {
     var branches = [];
     if (res && res.data) {
@@ -130,13 +132,13 @@ function getBranches(accessToken, owner, repo, done) {
 }
 
 function getFile(filename, ref, accessToken, owner, repo, done) {
-  var uri = GITHUB_API_ENDPOINT + '/repos/' + owner + '/' + repo + '/contents/' + filename;
+  var uri = `${GITHUB_API_ENDPOINT}/repos/${owner}/${repo}/contents/${filename}`;
   var req = superagent.get(uri).set('User-Agent', 'StriderCD (http://stridercd.com)');
   if (ref) {
     req = req.query({ref: ref});
   }
   if (accessToken) {
-    req = req.set('Authorization', 'token ' + accessToken);
+    req = req.set('Authorization', `token ${accessToken}`);
   }
   req.end(function (err, res) {
     if(err) return done(err, null);
@@ -158,19 +160,19 @@ function getFile(filename, ref, accessToken, owner, repo, done) {
  * @param {Function} callback function(error, response, body)
  * @param {Object} client An alternative superagent instance to use.
  */
-var get_oauth2 = module.exports.get_oauth2 = function (url, q_params, access_token, callback, client) {
+function get_oauth2(url, q_params, access_token, callback, client) {
   // If the user provided a superagent instance, use that.
   client = client || superagent;
   // Construct the query. Allow the user to override the access_token through q_params.
   var query = _.assign({}, {access_token : access_token}, q_params);
   debug('GET OAUTH2 URL:', url);
-  debug('Inside get_oauth2: Callback type: ' + typeof callback + ' Number of arguments expected by: ' + callback.length);
+  debug(`Inside get_oauth2: Callback type: ${typeof callback} Number of arguments expected by: ${callback.length}`);
   client
     .get(url)
     .query(query)
     .set('User-Agent', 'StriderCD (http://stridercd.com)')
     .end(callback);
-};
+}
 
 /**
  * api_call()
@@ -182,7 +184,7 @@ var get_oauth2 = module.exports.get_oauth2 = function (url, q_params, access_tok
  * @param {Function} callback function(error, response, de-serialized json)
  * @param {Object} client An alternative superagent instance to use.
  */
-var api_call = module.exports.api_call = function (path, access_token, callback, client) {
+function api_call(path, access_token, callback, client) {
   // If the user provided a superagent instance, use that.
   client = client || superagent;
   var url = GITHUB_API_ENDPOINT + path;
@@ -192,19 +194,19 @@ var api_call = module.exports.api_call = function (path, access_token, callback,
       var data = res.body;
       callback(null, res, data);
     } else {
-      debug("We get an error from the API: " + error);
+      debug(`We get an error from the API: ${error}`);
       callback(error, res, null);
     }
   }, client);
-};
+}
 
 /**
  * parse_link_header()
  *
  * Parse the Github Link HTTP header used for pagination
  * http://developer.github.com/v3/#pagination
  */
-var parse_link_header = module.exports.parse_link_header = function parse_link_header(header) {
+function parse_link_header(header) {
   if (header.length === 0) {
     throw new Error('input must not be of zero length');
   }
@@ -224,8 +226,7 @@ var parse_link_header = module.exports.parse_link_header = function parse_link_h
   });
 
   return links;
-};
-
+}
 
 /**
  * pageinated_api_call()
@@ -238,7 +239,7 @@ var parse_link_header = module.exports.parse_link_header = function parse_link_h
  * @param {Function} callback function(error, response, de-serialized json)
  * @param {Object} client An alternative superagent instance to use.
  */
-var pageinated_api_call = module.exports.pageinated_api_call = function (path, access_token, callback, client) {
+function pageinated_api_call(path, access_token, callback, client) {
   // If the user provided a superagent instance, use that.
   client = client || superagent;
 
@@ -282,13 +283,13 @@ var pageinated_api_call = module.exports.pageinated_api_call = function (path, a
         }
       } else {
         if (!error) {
-          debug("We did not get an error, but status code was: " + res.statusCode);
+          debug(`We did not get an error, but status code was: ${res.statusCode}`);
           if (res.statusCode === 401 || res.statusCode === 403) {
-            return callback(new Error('Github app is not authorized. Did you revoke access?'))
+            return callback(new Error('Github app is not authorized. Did you revoke access?'));
           }
-          return callback(new Error('Status code is ' + res.statusCode + ' not 200. Body: ' + res.body))
+          return callback(new Error(`Status code is ${res.statusCode} not 200. Body: ${res.body}`));
         } else {
-          debug("We did get an error from the API " + error);
+          debug(`We did get an error from the API ${error}`);
           return callback(error, null);
         }
       }
@@ -297,7 +298,7 @@ var pageinated_api_call = module.exports.pageinated_api_call = function (path, a
 
   // Start from page 1
   loop(base_url, 1);
-};
+}
 
 /**
  * get_github_repos()
@@ -343,7 +344,7 @@ function getRepos(token, username, callback) {
           group: githubRepo.owner.login,
           display_url: githubRepo.html_url,
           config: {
-            url: 'git://' + githubRepo.clone_url.split('//')[1],
+            url: `git://${githubRepo.clone_url.split('//')[1]}`,
             owner: githubRepo.owner.login,
             repo: githubRepo.name,
             auth: {
@@ -356,7 +357,7 @@ function getRepos(token, username, callback) {
       // For each Org, fetch the teams it has in parallel
       var group = this.group();
       _.each(org_memberships, function (org) {
-        api_call('/orgs/' + org.login + '/teams', token, group());
+        api_call(`/orgs/${org.login}/teams`, token, group());
       });
     },
     function fetchTeamDetails(err, results) {
@@ -382,7 +383,7 @@ function getRepos(token, username, callback) {
       // For each Team, fetch the detailed info (including privileges)
       var group = this.group();
       _.each(teams, function (team) {
-        api_call('/teams/' + team.id, token, group());
+        api_call(`/teams/${team.id}`, token, group());
       });
     },
     function filterTeams(err, results) {
@@ -408,7 +409,7 @@ function getRepos(token, username, callback) {
           return;
         }
         team_detail_requests[team_details.id] = team_details;
-        var url = '/teams/' + team_details.id + '/members/' + username;
+        var url = `/teams/${team_details.id}/members/${username}`;
         debug('TEAM DETAIL URL', url);
         api_call(url, token, group());
       });
@@ -419,21 +420,17 @@ function getRepos(token, username, callback) {
     function fetchFilteredTeamRepos(err, results) {
       if (err) {
         debug('get_github_repos(): Error with admin team memberships: %s', err);
-        return callback(err)
+        return callback(err);
       }
-      var team_detail_requests = this.team_detail_requests;
       var group = this.group();
 
       _.each(results, function (result) {
         var team_id = result.req.path.match(/teams\/([0-9]*)/i)[1];
-        debug("We get the following repo path: " + util.inspect(result.req.path));
+        debug(`We get the following repo path: ${util.inspect(result.req.path)}`);
 
-        // todo team_detail is unused
-        var team_detail = team_detail_requests[parseInt(team_id, 10)];
         if (result.statusCode === 204) {
-          pageinated_api_call('/teams/' + team_id + '/repos', token, group());
+          pageinated_api_call(`/teams/${team_id}/repos`, token, group());
         }
-
       });
     },
     // Reduce all the results and call output callback.
@@ -453,7 +450,7 @@ function getRepos(token, username, callback) {
               display_name: team_repo.full_name,
               group: team_repo.owner.login,
               config: {
-                url: 'git://' + team_repo.clone_url.split('//')[1],
+                url: `git://${team_repo.clone_url.split('//')[1]}`,
                 owner: team_repo.owner.login,
                 repo: team_repo.name,
                 auth: {

lib/api.js

@@ -60,7 +60,7 @@ module.exports.github_metadata = function (req, res) {
       req.user['github_metadata'] = {};
       req.user['github_metadata'][req.user.github.id] = data;
       addConfiguredKeys(req.user, data.repos);
-      req.user.save(function (err, user) {
+      req.user.save(function () {
         var output = JSON.stringify(data, null, '\t');
         res.end(output);
       });
@@ -120,7 +120,7 @@ module.exports.post_manual_setup = function (req, res) {
   User.findOne({'github_config.url': github_url.toLowerCase()}, function (err, user) {
     var r;
     if (user) {
-      debug('Dupe repo: ' + github_url + ' requested by ' + req.user.email);
+      debug(`Dupe repo: ${github_url} requested by ${req.user.email}`);
       res.statusCode = 400;
       r = {
         status: 'error',
@@ -132,17 +132,17 @@ module.exports.post_manual_setup = function (req, res) {
     // validate again (after backbone validation) bc api request could be from other source
     var p = gh.parse_github_url(github_url);
     if (p === null) {
-      debug('invalid github url: ' + github_url);
+      debug(`invalid github url: ${github_url}`);
       res.statusCode = 400;
       r = {
         status: 'error',
         errors: 'Not a valid Github URL'
       };
       return res.end(JSON.stringify(r), null, '\t');
     }
-    debug('org: ' + p.org + ' - name: ' + p.repo);
+    debug(`org: ${p.org} - name: ${p.repo}`);
 
-    var repo_url = 'https://github.com/' + p.org + '/' + p.repo;
+    var repo_url = `https://github.com/${p.org}/${p.repo}`;
 
     gh.setup_integration_manual(req, p.org, repo_url,
       function (webhook, deploy_key_title, deploy_public_key) {