Reorganize require calls; consolidate test dependency requires

Source:

- alphabetize dependencies
- split into three categories

Tests:

- consolidate into test/common/boostrap.js
- alphabetize dependencies
- split into three categories

Gruntfile.js

@@ -9,27 +9,25 @@ module.exports = function(grunt) {
       ]
     },
     jshint: {
-      options: {
-        jshintrc: '.jshintrc'
+      all: {
+        options: {
+          jshintrc: '.jshintrc'
+        },
+        src: [
+          'bin/*',
+          'lib/**/*.js',
+          'Gruntfile.js',
+        ]
       },
-      all: [
-        'bin/*',
-        'lib/**/*.js',
-        'test/**/*.js',
-        'Gruntfile.js',
-        '!test/unit/fixtures/syntax-error/**/*.js',
-
-        // This is commented out because there are
-        // too many errors to address. I went through
-        // half of them and still:
-        //
-        // >> 75 errors in 3 files
-        //
-        // There are a lot of undefined vars being used
-        // and without fully understanding these files, it's
-        // not worth the effort to fix them all.
-        // 'resources/**/*.js',
-      ]
+      tests: {
+        options: {
+          jshintrc: 'test/.jshintrc'
+        },
+        src: [
+          'test/**/*.js',
+          '!test/unit/fixtures/syntax-error/**/*.js',
+        ]
+      }
     },
     jscs: {
       all: [

bin/tessel-2.js

@@ -1,10 +1,15 @@
 #!/usr/bin/env node
 
+// System Objects
 var path = require('path');
+
+// Third Party Dependencies
 var parser = require('nomnom').script('t2');
+
+// Internal
 var controller = require('../lib/controller');
-var key = require('../lib/key');
 var init = require('../lib/init');
+var key = require('../lib/key');
 var logs = require('../lib/logs');
 var Tessel = require('../lib/tessel/tessel');
 var drivers = require('./tessel-install-drivers');

bin/tessel-install-drivers.js

@@ -1,8 +1,14 @@
 #!/usr/bin/env node
 
+// System Objects
+var child_process = require('child_process');
 var fs = require('fs');
+
+// Third Party Dependencies
+// ...
+
+// Internal
 var logs = require('../lib/logs');
-var child_process = require('child_process');
 
 module.exports.install = function() {
   if (process.platform === 'linux') {

lib/controller.js

@@ -1,16 +1,23 @@
-var Tessel = require('./tessel/tessel');
-var logs = require('./logs');
-var Promise = require('bluebird');
-var _ = require('lodash');
-var discover = require('./discover');
-var sprintf = require('sprintf-js').sprintf;
+// System Objects
 var cp = require('child_process');
+var util = require('util');
+
+// Third Party Dependencies
+var _ = require('lodash');
 var async = require('async');
-var updates = require('./update-fetch');
-var inquirer = require('inquirer');
 var colors = require('colors');
-var util = require('util');
+var inquirer = require('inquirer');
+var Promise = require('bluebird');
+var sprintf = require('sprintf-js').sprintf;
+
+// Internal
+var discover = require('./discover');
+var logs = require('./logs');
+var updates = require('./update-fetch');
 var provision = require('./tessel/provision');
+var Tessel = require('./tessel/tessel');
+
+
 var controller = {};
 var responses = {
   noAuth: 'No Authorized Tessels Found.',

lib/discover.js

@@ -1,18 +1,26 @@
-var usb = require('./usb_connection'),
-  lan = require('./lan_connection'),
-  Tessel = require('./tessel/tessel'),
-  util = require('util'),
-  EventEmitter = require('events').EventEmitter,
-  debug = require('debug')('discovery'),
-  logs = require('./logs');
+// System Objects
+var events = require('events');
+var util = require('util');
+
+var Emitter = events.EventEmitter;
+
+// Third Party Dependencies
+var debug = require('debug')('discovery');
+
+// Internal
+var lan = require('./lan_connection');
+var logs = require('./logs');
+var Tessel = require('./tessel/tessel');
+var usb = require('./usb_connection');
+
 
 function TesselSeeker() {
   this.lanScan = undefined;
   this.seekDuration = undefined;
   this.scanTimeout = undefined;
 }
 
-util.inherits(TesselSeeker, EventEmitter);
+util.inherits(TesselSeeker, Emitter);
 
 TesselSeeker.prototype.start = function(opts) {
   var self = this;

lib/init.js

@@ -1,8 +1,16 @@
-var Promise = require('bluebird'),
-  path = require('path'),
-  fs = Promise.promisifyAll(require('fs')),
-  PZ = require('promzard').PromZard,
-  NPM = require('npm');
+// System Objects
+var path = require('path');
+var fs;
+
+// Third Party Dependencies
+var Promise = require('bluebird');
+var PZ = require('promzard').PromZard;
+var NPM = require('npm');
+
+// Internal
+// ...
+
+fs = Promise.promisifyAll(require('fs'));
 
 var packageJson = path.resolve('./package.json');
 var pkg, ctx, options;

lib/lan_connection.js

@@ -1,13 +1,20 @@
-var ssh = require('ssh2'),
-  fs = require('fs'),
-  Promise = require('bluebird'),
-  mdns = require('mdns-js'),
-  shellescape = require('shell-escape'),
-  util = require('util'),
-  EventEmitter = require('events').EventEmitter,
-  path = require('path'),
-  Tessel = require('./tessel/tessel'),
-  debug = require('debug')('discovery:lan');
+// System Objects
+var events = require('events');
+var path = require('path');
+var util = require('util');
+
+var Emitter = events.EventEmitter;
+
+// Third Party Dependencies
+var debug = require('debug')('discovery:lan');
+var fs = require('fs-extra');
+var mdns = require('mdns-js');
+var Promise = require('bluebird');
+var shellescape = require('shell-escape');
+var ssh = require('ssh2');
+
+// Internal
+var Tessel = require('./tessel/tessel');
 
 //if you have another mdns daemon running, like avahi or bonjour, uncomment following line
 mdns.excludeInterface('0.0.0.0');
@@ -136,7 +143,7 @@ LAN.Scanner = function() {
   this.discovered = [];
 };
 
-util.inherits(LAN.Scanner, EventEmitter);
+util.inherits(LAN.Scanner, Emitter);
 
 LAN.Scanner.prototype.start = function() {
   var self = this;

lib/logs.js

@@ -1,5 +1,11 @@
-var colors = require('colors'),
-  util = require('util');
+// System Objects
+var util = require('util');
+
+// Third Party Dependencies
+var colors = require('colors');
+
+// Internal
+// ...
 
 function warn() {
   console.error(colors.yellow('WARN'), util.format.apply(util, arguments));

lib/tessel/access-point.js

@@ -1,6 +1,14 @@
-var Tessel = require('./tessel'),
-  commands = require('./commands'),
-  logs = require('../logs');
+// System Objects
+// ...
+
+// Third Party Dependencies
+// ...
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
+
 
 function commitAndClose(tessel, status, resolve) {
   var waitForClose = function(remoteProcess) {

lib/tessel/deploy.js

@@ -1,15 +1,20 @@
-var Tessel = require('./tessel');
-var commands = require('./commands');
-var logs = require('../logs');
-var fs = require('fs-extra');
+// System Objects
 var path = require('path');
-var tar = require('tar');
+
+// Third Party Dependencies
+var browserify = require('browserify');
+var fs = require('fs-extra');
+var fsTemp = require('fs-temp');
+var glob = require('glob');
 var Ignore = require('fstream-ignore');
 var Reader = require('fstream').Reader;
-var fsTemp = require('fs-temp');
-var browserify = require('browserify');
+var tar = require('tar');
 var uglify = require('uglify-js');
-var glob = require('glob');
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
 
 var PUSH_START_SCRIPT_NAME = 'start';
 var NODE_PUSH_SCRIPT = __dirname + '/../../resources/start_node_script.sh';

lib/tessel/erase.js

@@ -1,6 +1,13 @@
-var Tessel = require('./tessel'),
-  commands = require('./commands'),
-  logs = require('../logs');
+// System Objects
+// ...
+
+// Third Party Dependencies
+// ...
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
 
 Tessel.prototype.eraseScript = function() {
   var self = this;

lib/tessel/name.js

@@ -1,6 +1,13 @@
-var Tessel = require('./tessel'),
-  commands = require('./commands'),
-  logs = require('../logs');
+// System Objects
+// ...
+
+// Third Party Dependencies
+// ...
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
 
 var defaultNamePrefix = 'Tessel-';
 

lib/tessel/provision.js

@@ -1,15 +1,23 @@
 //creates a .tessel folder with ssh keys in your home directory and uses those ssh keys to authorize you to push code to the USB-connected Tessel
 
-var util = require('util');
-var osenv = require('osenv');
-var fs = require('fs-extra');
+
+// System Objects
 var path = require('path');
+var util = require('util');
+
+// Third Party Dependencies
 var async = require('async');
-var Tessel = require('./tessel');
-var commands = require('./commands');
-var logs = require('../logs');
+var fs = require('fs-extra');
 var NodeRSA = require('node-rsa');
+var osenv = require('osenv');
 var sshpk = require('sshpk');
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
+
+
 var authPath = path.join(osenv.home(), '.tessel');
 var idrsa = 'id_rsa';
 var authKey = path.join(authPath, idrsa);

lib/tessel/tessel.js

@@ -109,10 +109,10 @@ Tessel.RUN_PATH = '/tmp/remote-script/';
 
 module.exports = Tessel;
 
-require('./provision');
-require('./name');
+require('./access-point');
 require('./deploy');
 require('./erase');
-require('./wifi');
+require('./name');
+require('./provision');
 require('./update');
-require('./access-point');
+require('./wifi');

lib/tessel/update.js

@@ -1,10 +1,17 @@
-var Tessel = require('./tessel');
-var commands = require('./commands');
+// System Objects
 var path = require('path');
+
+// Third Party Dependencies
+// ...
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
 var updates = require('../update-fetch');
+
 var updatePath = path.join('/tmp/', updates.OPENWRT_BINARY_FILE);
 var remoteVersioningFile = '/etc/tessel-version';
-var logs = require('.././logs');
 
 /*
   Gathers openWRT and SAMD21 Firmware

lib/tessel/wifi.js

@@ -1,6 +1,14 @@
-var Tessel = require('./tessel'),
-  commands = require('./commands'),
-  logs = require('../logs');
+// System Objects
+// ...
+
+// Third Party Dependencies
+// ...
+
+// Internal
+var commands = require('./commands');
+var logs = require('../logs');
+var Tessel = require('./tessel');
+
 
 Tessel.prototype.findAvailableNetworks = function() {
   logs.info('Scanning for available networks...');