chore: remove as many undescores as a can from route exports

.gitignore

@@ -1,6 +1,7 @@
 # IntelliJ IDEA project files
 .idea/*
 !.idea/codeStyleSettings.xml
+.vscode/
 
 # NodeJS dependencies
 node_modules/

lib/app.js

@@ -36,22 +36,22 @@ var auth = require('./auth');
 var pluginTemplates = require('./plugin-templates');
 var pjson = require('../package.json');
 
-var routes_admin = require('./routes/admin');
-var routes_jobs = require('./routes/jobs');
+var routesAdmin = require('./routes/admin');
+var routesJobs = require('./routes/jobs');
 var api = require('./routes/api');
 var collaboratorsRouter = require('./routes/collaborators');
-var api_branches = require('./routes/api/branches');
-var api_jobs = require('./routes/api/jobs');
-var api_repo = require('./routes/api/repo');
-var api_config = require('./routes/api/config');
+var apiBranches = require('./routes/api/branches');
+var apiJobs = require('./routes/api/jobs');
+var apiRepo = require('./routes/api/repo');
+var apiConfig = require('./routes/api/config');
 
 var mongoStore = connectMongo(expressSession);
 var MONTH_IN_MILLISECONDS = 2629743000;
 var env = process.env.NODE_ENV || 'development';
 var isDevelopment = env === 'development';
 var isProduction = env === 'production';
 var isTest = env === 'test';
-var session_store;
+var sessionStore;
 
 exports.init = function (config) {
   var mongodbUrl = config.db_uri;
@@ -68,7 +68,9 @@ exports.init = function (config) {
     debug('MongoDB connection error: %s', error);
   });
 
-  session_store = new mongoStore({mongooseConnection: mongoose.connection});
+  sessionStore = new mongoStore({
+    mongooseConnection: mongoose.connection
+  });
 
   swig.init({
     root: config.viewpath,
@@ -109,7 +111,7 @@ exports.init = function (config) {
   app.use(serveFavicon(path.join(__dirname, '..', 'public', 'favicon.ico'), {maxAge: 2592000000}));
 
   app.use(expressSession({
-    secret: config.session_secret, store: session_store,
+    secret: config.session_secret, store: sessionStore,
     cookie: {maxAge: MONTH_IN_MILLISECONDS},
     resave: false,
     saveUninitialized: true
@@ -157,39 +159,39 @@ exports.init = function (config) {
   app.post('/reset/:token', auth.resetPost);
 
   // Compiled plugin config assets
-  app.get('/scripts/plugin-config-compiled.js', api_config.server('config', 'js'));
-  app.get('/styles/plugin-config-compiled.css', api_config.server('config', 'css'));
-  app.get('/scripts/account-plugins-compiled.js', api_config.server('account', 'js'));
-  app.get('/styles/account-plugins-compiled.css', api_config.server('account', 'css'));
-  app.get('/scripts/plugin-status-compiled.js', api_config.server('status', 'js'));
-  app.get('/styles/plugin-status-compiled.css', api_config.server('status', 'css'));
-
-  app.get('/admin/projects', auth.requireAdminOr401, routes_admin.projects);
-  app.get('/admin/users', auth.requireAdminOr401, routes_admin.users);
+  app.get('/scripts/plugin-config-compiled.js', apiConfig.server('config', 'js'));
+  app.get('/styles/plugin-config-compiled.css', apiConfig.server('config', 'css'));
+  app.get('/scripts/account-plugins-compiled.js', apiConfig.server('account', 'js'));
+  app.get('/styles/account-plugins-compiled.css', apiConfig.server('account', 'css'));
+  app.get('/scripts/plugin-status-compiled.js', apiConfig.server('status', 'js'));
+  app.get('/styles/plugin-status-compiled.css', apiConfig.server('status', 'css'));
+
+  app.get('/admin/projects', auth.requireAdminOr401, routesAdmin.projects);
+  app.get('/admin/users', auth.requireAdminOr401, routesAdmin.users);
   app.get('/admin/jobs', auth.requireAdminOr401, function (req, res) {
     res.render('admin/jobs.html', {
       version: pjson.version
     });
   });
-  app.get('/admin/make_admin', auth.requireAdminOr401, routes_admin.make_admin);
-  app.post('/admin/remove_user', auth.requireAdminOr401, routes_admin.remove_user);
-  app.get('/admin/invites', auth.requireAdminOr401, routes_admin.invites);
-  app.get('/admin/:org/:repo/job/:job_id', auth.requireAdminOr401, routes_admin.job);
-  app.get('/admin/plugins', auth.requireAdminOr401, routes_admin.plugins.get);
-  app.put('/admin/plugins', auth.requireAdminOr401, routes_admin.plugins.put);
+  app.get('/admin/make_admin', auth.requireAdminOr401, routesAdmin.makeAdmin);
+  app.post('/admin/remove_user', auth.requireAdminOr401, routesAdmin.removeUser);
+  app.get('/admin/invites', auth.requireAdminOr401, routesAdmin.invites);
+  app.get('/admin/:org/:repo/job/:job_id', auth.requireAdminOr401, routesAdmin.job);
+  app.get('/admin/plugins', auth.requireAdminOr401, routesAdmin.plugins.get);
+  app.put('/admin/plugins', auth.requireAdminOr401, routesAdmin.plugins.put);
 
   app.use('/account', auth.requireUser, require('./routes/account'));
   app.use('/projects', auth.requireUser, require('./routes/projects'));
 
   // Requires at least read-only access to the repository in the path
-  app.get('/:org/:repo/', middleware.project, routes_jobs.html);
-  app.put('/:org/:repo/', auth.requireUser, api_repo.create_project);
-  app.get('/:org/:repo/job/:job_id?', middleware.project, routes_jobs.multijob);
-  app.get('/:org/:repo/jobs/', middleware.project, routes_jobs.jobs);
-  app.post('/:org/:repo/start', auth.requireUser, middleware.project, auth.requireProjectAdmin, api_jobs.jobs_start);
-  app.delete('/:org/:repo/cache', auth.requireUser, middleware.project, auth.requireProjectAdmin, api_repo.clear_cache);
+  app.get('/:org/:repo/', middleware.project, routesJobs.html);
+  app.put('/:org/:repo/', auth.requireUser, apiRepo.createProject);
+  app.get('/:org/:repo/job/:job_id?', middleware.project, routesJobs.multijob);
+  app.get('/:org/:repo/jobs/', middleware.project, routesJobs.jobs);
+  app.post('/:org/:repo/start', auth.requireUser, middleware.project, auth.requireProjectAdmin, apiJobs.jobsStart);
+  app.delete('/:org/:repo/cache', auth.requireUser, middleware.project, auth.requireProjectAdmin, apiRepo.clearCache);
 
-  app.delete('/:org/:repo/', middleware.project, auth.requireProjectAdmin, api_repo.delete_project);
+  app.delete('/:org/:repo/', middleware.project, auth.requireProjectAdmin, apiRepo.deleteProject);
 
   // provider
   app.use(providerRouter);
@@ -202,11 +204,11 @@ exports.init = function (config) {
     auth.requireUserOr401,
     middleware.project,
     auth.requireProjectAdmin,
-    api_branches
+    apiBranches
   );
 
   // keygen
-  app.post('/:org/:repo/keygen/', auth.requireUser, middleware.project, auth.requireProjectAdmin, api_config.keygen);
+  app.post('/:org/:repo/keygen/', auth.requireUser, middleware.project, auth.requireProjectAdmin, apiConfig.keygen);
 
   /* Requires admin access to the repository in the path */
   if ('development' === app.get('env')) {
@@ -237,22 +239,22 @@ exports.init = function (config) {
   app.put('/:org/:repo/config/branch/:plugin', routes.setPluginConfig);
   app.put('/:org/:repo/config/branch/', auth.requireUser, middleware.project, auth.requireProjectAdmin, routes.configureBranch);
 
-  // app.get('/api/job/:id', api_jobs.raw);
+  // app.get('/api/job/:id', apiJobs.raw);
   app.use('/api', api);
-  app.get('/api/jobs', auth.requireUserOr401, api_jobs.jobs);
-  // app.get('/api/jobs/:org/:repo', middleware.project, api_jobs.repo_jobs);
+  app.get('/api/jobs', auth.requireUserOr401, apiJobs.jobs);
+  // app.get('/api/jobs/:org/:repo', middleware.project, apiJobs.repoJobs);
 
   app.use(function (req, res, next) {
-    var user_created_timestamp = 0;
+    var userCreatedTimestamp = 0;
     if (req.user !== undefined) {
-      user_created_timestamp = parseInt(req.user.id.substr(0, 8), 16);
+      userCreatedTimestamp = parseInt(req.user.id.substr(0, 8), 16);
     }
-    res.locals.user_created_timestamp = user_created_timestamp;
+    res.locals.user_created_timestamp = userCreatedTimestamp;
     next();
   });
 
   common.app = app;
-  common.session_store = session_store;
+  common.session_store = sessionStore;
   //
   // ### Strider Webapp Event Emitter
   //
@@ -282,7 +284,7 @@ exports.run = function (app) {
 
   // Initialize socket.io
   var server = app.listen(config.port, config.host);
-  var sockets = websockets.init(server, session_store);
+  var sockets = websockets.init(server, sessionStore);
   new Backchannel(common.emitter, sockets);
 
   console.log(chalk.green('Express server listening on port %s in %s mode'), config.port, app.settings.env);

lib/backchannel.js

@@ -58,7 +58,7 @@ function striderJson(provider, project, ref, done) {
  * definitely move it around when we make strider OO.
  */
 function prepareJob(emitter, job) {
-  Project.findOne({name: job.project}).populate('creator').exec(function (err, project) {
+  Project.findOne({ name: job.project }).populate('creator').exec(function (err, project) {
     if (err || !project) return debug('job.prepare - failed to get project', job.project, err);
     // ok so the project is real, we can go ahead and save this job
     var provider = common.extensions.provider[project.provider.id];

lib/models/config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var mongoose = require('mongoose');
+var mongoose = require('../mongoose-shim');
 var Schema = mongoose.Schema;
 
 var Config = new Schema({

lib/models/index.js

@@ -1,6 +1,9 @@
 'use strict';
 
-require('mongoose').models = {};
+var mongoose = require('../mongoose-shim');
+
+mongoose.models = {};
+
 module.exports = {
   InviteCode: require('./invite'),
   Job: require('./job'),

lib/models/invite.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var mongoose = require('mongoose');
+var mongoose = require('../mongoose-shim');
 var Schema = mongoose.Schema;
 
 var InviteCodeSchema = new Schema({

lib/models/job.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var mongoose = require('mongoose');
+var mongoose = require('../mongoose-shim');
 var Schema = mongoose.Schema;
 
 var TriggerNotSchema = {

lib/models/project.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var _ = require('lodash');
-var mongoose = require('mongoose');
-var Schema = mongoose.Schema;
+var mongoose = require('../mongoose-shim');
 var findBranch = require('../utils').findBranch;
+var Schema = mongoose.Schema;
 
 var PluginConfig = new Schema({
   id: String,

lib/models/user.js

@@ -1,12 +1,12 @@
 'use strict';
 
-var mongoose = require('mongoose');
 var bcrypt = require('bcryptjs');
-var config = require('../config');
 var Activedirectory = require('activedirectory');
+var config = require('../config');
+var mongoose = require('../mongoose-shim');
 var InviteCode = require('./invite');
-var Schema = mongoose.Schema;
 
+var Schema = mongoose.Schema;
 var User;
 
 // active directory schema

lib/routes/admin/index.js

@@ -15,11 +15,11 @@ var users = require('../../users');
 var utils = require('../../utils');
 
 /*
- * make_invite_code()
+ * makeInviteCode()
  *
  * Generate a sweet BASE32 invite code
  */
-function make_invite_code() {
+function makeInviteCode() {
   var random = crypto.randomBytes(5).toString('hex');
   return base32.encode(random);
 }
@@ -35,7 +35,7 @@ exports.invites = function (req, res) {
     });
 
     res.render('admin/invites.html', {
-      invite_code: make_invite_code(),
+      invite_code: makeInviteCode(),
       invite_codes: results,
       version: pjson.version
     });
@@ -59,7 +59,7 @@ exports.users = function (req, res) {
   });
 };
 
-exports.make_admin = function (req, res) {
+exports.makeAdmin = function (req, res) {
   if (!req.query.user) {
     return res.redirect('/admin/users');
   }
@@ -72,7 +72,7 @@ exports.make_admin = function (req, res) {
   });
 };
 
-exports.remove_user = function (req, res) {
+exports.removeUser = function (req, res) {
   User.findOne({email: req.body.email}, function (err, user) {
     if (err || !user) {
       req.flash('admin', 'Failed to find user');
@@ -118,32 +118,31 @@ exports.plugins = require('./plugins');
  * this is very similar although slightly different from the job function above.
  * at some point they should be refactored to combine redundant func.
  */
-
 exports.job = function (req, res) {
   res.statusCode = 200;
   var org = req.params.org;
   var repo = req.params.repo;
-  var job_id = req.params.job_id;
-  var repo_url = `https://github.com/${org}/${repo}`;
+  var jobId = req.params.job_id;
+  var repoUrl = `https://github.com/${org}/${repo}`;
 
-  repo_url = repo_url.toLowerCase();
+  repoUrl = repoUrl.toLowerCase();
 
   Step(
     function runQueries() {
-      debug(`Querying for job id: ${job_id}`);
-      Job.findById(job_id).populate('_owner').exec(this.parallel());
+      debug(`Querying for job id: ${jobId}`);
+      Job.findById(jobId).populate('_owner').exec(this.parallel());
 
-      debug(`Querying for last 20 jobs for ${repo_url}`);
+      debug(`Querying for last 20 jobs for ${repoUrl}`);
       Job.find()
         .sort({'finished_timestamp': -1})
         .where('finished_timestamp').ne(null)
-        .where('repo_url', repo_url)
+        .where('repo_url', repoUrl)
         .where('type').in(['TEST_ONLY', 'TEST_AND_DEPLOY'])
         .limit(20)
         .populate('_owner')
         .exec(this.parallel());
     },
-    function processAndRender(err, results_detail, results) {
+    function processAndRender(err, resultsDetail, results) {
       if (err) throw err;
 
       results.forEach(function (job) {
@@ -164,44 +163,43 @@ exports.job = function (req, res) {
         job.url = `/admin/${org}/${repo}/job/${job.id}`;
       });
 
-      // if results_detail did not return, that means this is not a valid job id
-      if (results_detail === undefined) {
+      // if resultsDetail did not return, that means this is not a valid job id
+      if (resultsDetail === undefined) {
         res.render(404, 'invalid job id');
       } else {
+        resultsDetail.duration = Math.round((resultsDetail.finished_timestamp - resultsDetail.created_timestamp) / 1000);
+        resultsDetail.finished_at = humane.humaneDate(resultsDetail.finished_timestamp);
 
-        results_detail.duration = Math.round((results_detail.finished_timestamp - results_detail.created_timestamp) / 1000);
-        results_detail.finished_at = humane.humaneDate(results_detail.finished_timestamp);
+        var triggeredByCommit = false;
 
-        var triggered_by_commit = false;
-        if (results_detail.github_commit_info.id !== undefined) {
-          triggered_by_commit = true;
-          results_detail.gravatar_url = utils.gravatar(results_detail.github_commit_info.author.email);
+        if (resultsDetail.github_commit_info.id !== undefined) {
+          triggeredByCommit = true;
+          resultsDetail.gravatar_url = utils.gravatar(resultsDetail.github_commit_info.author.email);
 
-          if (results_detail.github_commit_info.author.username !== undefined) {
-            results_detail.committer = results_detail.github_commit_info.author.username;
-            results_detail.committer_is_username = true;
+          if (resultsDetail.github_commit_info.author.username !== undefined) {
+            resultsDetail.committer = resultsDetail.github_commit_info.author.username;
+            resultsDetail.committer_is_username = true;
           } else {
-            results_detail.committer = results_detail.github_commit_info.author.name;
-            results_detail.committer_is_username = false;
+            resultsDetail.committer = resultsDetail.github_commit_info.author.name;
+            resultsDetail.committer_is_username = false;
           }
         }
 
-        results_detail.output = results_detail.stdmerged.replace(/\[(\d)?\d*m/gi, '');
-
+        resultsDetail.output = resultsDetail.stdmerged.replace(/\[(\d)?\d*m/gi, '');
 
-        var has_prod_deploy_target = false;
-        var admin_view = true;
+        var hasProdDeployTarget = false;
+        var adminView = true;
 
         res.render('job.html', {
-          admin_view: admin_view,
+          admin_view: adminView,
           jobs: results,
-          results_detail: results_detail,
+          results_detail: resultsDetail,
           job_id: results[0].id.substr(0, 8),
-          triggered_by_commit: triggered_by_commit,
+          triggered_by_commit: triggeredByCommit,
           org: org,
           repo: repo,
-          repo_url: repo_url,
-          has_prod_deploy_target: has_prod_deploy_target,
+          repo_url: repoUrl,
+          has_prod_deploy_target: hasProdDeployTarget,
           version: pjson.version
         });
       }