Moving Machine, VBox & Docker management utils to utils dir

src/Main.js

@@ -6,7 +6,7 @@ var React = require('react');
 var SetupStore = require('./stores/SetupStore');
 var bugsnag = require('bugsnag-js');
 var ipc = require('ipc');
-var machine = require('./DockerMachine');
+var machine = require('./utils/DockerMachineUtil');
 var metrics = require('./Metrics');
 var router = require('./Router');
 var template = require('./MenuTemplate');

src/MenuTemplate.js

@@ -3,8 +3,8 @@ var app = remote.require('app');
 var router = require('./Router');
 var util = require('./utils/Util');
 var metrics = require('./Metrics');
-var machine = require('./DockerMachine');
-var docker = require('./Docker');
+var machine = require('./utils/DockerMachineUtil');
+var docker = require('./utils/DockerUtil');
 
 // main.js
 var MenuTemplate = function () {

src/components/ContainerDetailsSubheader.react.js

@@ -6,7 +6,7 @@ var path =  require('path');
 var metrics = require('../Metrics');
 var ContainerStore = require('../stores/ContainerStore');
 var ContainerUtil = require('../utils/ContainerUtil');
-var machine = require('../DockerMachine');
+var machine = require('../utils/DockerMachineUtil');
 var RetinaImage = require('react-retina-image');
 var webPorts = require('../utils/Util').webPorts;
 var classNames = require('classnames');

src/components/Containers.react.js

@@ -9,7 +9,7 @@ var remote = require('remote');
 var metrics = require('../Metrics');
 var autoUpdater = remote.require('auto-updater');
 var RetinaImage = require('react-retina-image');
-var machine = require('../DockerMachine');
+var machine = require('../utils/DockerMachineUtil');
 var util = require('../utils/Util');
 
 var Containers = React.createClass({

src/stores/ContainerStore.js

@@ -2,9 +2,9 @@ var _ = require('underscore');
 var EventEmitter = require('events').EventEmitter;
 var async = require('async');
 var assign = require('object-assign');
-var docker = require('../Docker');
+var docker = require('../util/DockerUtil');
 var metrics = require('../Metrics');
-var registry = require('../Registry');
+var registry = require('../utils/RegistryUtil');
 var logstore = require('../stores/LogStore');
 var bugsnag = require('bugsnag-js');
 

src/stores/LogStore.js

@@ -1,7 +1,7 @@
 var EventEmitter = require('events').EventEmitter;
 var assign = require('object-assign');
 var Convert = require('ansi-to-html');
-var docker = require('../Docker');
+var docker = require('../utils/DockerUtil');
 var stream = require('stream');
 
 var _convert = new Convert();

src/stores/SetupStore-test.js

@@ -1,8 +1,8 @@
 jest.dontMock('./SetupStore');
 var setupStore = require('./SetupStore');
-var virtualBox = require('../VirtualBox');
+var virtualBox = require('../utils/VirtualBoxUtil');
 var util = require('../utils/Util');
-var machine = require('../DockerMachine');
+var machine = require('../utils/DockerMachineUtil');
 var setupUtil = require('../utils/SetupUtil');
 
 describe('SetupStore', function () {

src/stores/SetupStore.js

@@ -3,14 +3,14 @@ var _ = require('underscore');
 var path = require('path');
 var fs = require('fs');
 var Promise = require('bluebird');
-var machine = require('../DockerMachine');
-var virtualBox = require('../VirtualBox');
+var machine = require('../utils/DockerMachineUtil');
+var virtualBox = require('../utils/VirtualBoxUtil');
 var setupUtil = require('../utils/SetupUtil');
 var util = require('../utils/Util');
 var assign = require('object-assign');
 var metrics = require('../Metrics');
 var bugsnag = require('bugsnag-js');
-var docker = require('../Docker');
+var docker = require('../utils/DockerUtil');
 
 var _currentStep = null;
 var _error = null;

src/utils/ContainerUtil.js

@@ -1,5 +1,5 @@
 var _ = require('underscore');
-var docker = require('../Docker');
+var docker = require('../utils/DockerUtil');
 
 var ContainerUtil = {
   env: function (container) {
@@ -12,6 +12,7 @@ var ContainerUtil = {
       return splits;
     }));
   },
+  // TODO (jeffdm): inject host here instead of requiring Docker
   ports: function (container) {
     if (!container.NetworkSettings) {
       return {};

src/utils/DockerMachineUtil.js

@@ -3,7 +3,7 @@ var path = require('path');
 var Promise = require('bluebird');
 var _ = require('underscore');
 var fs = require('fs');
-var util = require('./utils/Util');
+var util = require('./Util');
 
 var NAME = 'dev';
 

src/utils/VirtualBoxUtil-test.js

@@ -1,6 +1,6 @@
-jest.dontMock('./VirtualBox');
-var virtualBox = require('./VirtualBox');
-var util = require('./utils/Util');
+jest.dontMock('./VirtualBoxUtil');
+var virtualBox = require('./VirtualBoxUtil');
+var util = require('./Util');
 
 describe('VirtualBox', function () {
   it('returns the right command', function () {

src/utils/VirtualBoxUtil.js

@@ -1,5 +1,5 @@
 var fs = require('fs');
-var util = require('./utils/Util');
+var util = require('./Util');
 var Promise = require('bluebird');
 
 var VirtualBox = {