From d684428089adffa28791ea067c99fe73a2fc888a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 21 Apr 2015 21:12:58 -0400 Subject: [PATCH] Moving Machine, VBox & Docker management utils to utils dir --- src/Main.js | 2 +- src/MenuTemplate.js | 4 ++-- src/components/ContainerDetailsSubheader.react.js | 2 +- src/components/Containers.react.js | 2 +- src/stores/ContainerStore.js | 4 ++-- src/stores/LogStore.js | 2 +- src/stores/SetupStore-test.js | 4 ++-- src/stores/SetupStore.js | 6 +++--- src/utils/ContainerUtil.js | 3 ++- src/{DockerMachine.js => utils/DockerMachineUtil.js} | 2 +- src/{Docker.js => utils/DockerUtil.js} | 0 src/{Registry.js => utils/RegistryUtil.js} | 0 src/{Virtualbox-test.js => utils/VirtualBoxUtil-test.js} | 6 +++--- src/{VirtualBox.js => utils/VirtualBoxUtil.js} | 2 +- 14 files changed, 20 insertions(+), 19 deletions(-) rename src/{DockerMachine.js => utils/DockerMachineUtil.js} (99%) rename src/{Docker.js => utils/DockerUtil.js} (100%) rename src/{Registry.js => utils/RegistryUtil.js} (100%) rename src/{Virtualbox-test.js => utils/VirtualBoxUtil-test.js} (81%) rename src/{VirtualBox.js => utils/VirtualBoxUtil.js} (98%) diff --git a/src/Main.js b/src/Main.js index cd87f2832e..2b2487d986 100644 --- a/src/Main.js +++ b/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'); diff --git a/src/MenuTemplate.js b/src/MenuTemplate.js index 36eafffda5..c373145709 100644 --- a/src/MenuTemplate.js +++ b/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 () { diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js index b405828708..6ba3b33796 100644 --- a/src/components/ContainerDetailsSubheader.react.js +++ b/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'); diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js index e221e6180c..4376564630 100644 --- a/src/components/Containers.react.js +++ b/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({ diff --git a/src/stores/ContainerStore.js b/src/stores/ContainerStore.js index bd09d16c90..b5f331beb1 100644 --- a/src/stores/ContainerStore.js +++ b/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'); diff --git a/src/stores/LogStore.js b/src/stores/LogStore.js index 6f4c203db1..a3ba515f80 100644 --- a/src/stores/LogStore.js +++ b/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(); diff --git a/src/stores/SetupStore-test.js b/src/stores/SetupStore-test.js index 1483b67c61..38bd33dec4 100644 --- a/src/stores/SetupStore-test.js +++ b/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 () { diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js index 73924f55a6..a065fb1e60 100644 --- a/src/stores/SetupStore.js +++ b/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; diff --git a/src/utils/ContainerUtil.js b/src/utils/ContainerUtil.js index cff2273669..2f895ad4c1 100644 --- a/src/utils/ContainerUtil.js +++ b/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 {}; diff --git a/src/DockerMachine.js b/src/utils/DockerMachineUtil.js similarity index 99% rename from src/DockerMachine.js rename to src/utils/DockerMachineUtil.js index b17e6002b6..acb79cc195 100644 --- a/src/DockerMachine.js +++ b/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'; diff --git a/src/Docker.js b/src/utils/DockerUtil.js similarity index 100% rename from src/Docker.js rename to src/utils/DockerUtil.js diff --git a/src/Registry.js b/src/utils/RegistryUtil.js similarity index 100% rename from src/Registry.js rename to src/utils/RegistryUtil.js diff --git a/src/Virtualbox-test.js b/src/utils/VirtualBoxUtil-test.js similarity index 81% rename from src/Virtualbox-test.js rename to src/utils/VirtualBoxUtil-test.js index 6a293a913c..7af88edd99 100644 --- a/src/Virtualbox-test.js +++ b/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 () { diff --git a/src/VirtualBox.js b/src/utils/VirtualBoxUtil.js similarity index 98% rename from src/VirtualBox.js rename to src/utils/VirtualBoxUtil.js index e290353909..43e550dc7c 100644 --- a/src/VirtualBox.js +++ b/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 = {