From 0a0cf3f64fef25b87e9099abb29e256067c82399 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 21 Apr 2015 20:39:43 -0400 Subject: [PATCH] Moving to a flux-like folder structure --- gulpfile.js | 1 + src/DockerMachine.js | 4 ++-- src/Main.js | 6 ++--- src/MenuTemplate.js | 2 +- src/Metrics.js | 2 +- src/Routes.js | 22 +++++++++---------- src/VirtualBox.js | 2 +- src/Virtualbox-test.js | 2 +- .../ContainerDetails.react.js | 0 .../ContainerDetailsHeader.react.js | 0 .../ContainerDetailsSubheader.react.js | 10 ++++----- src/{ => components}/ContainerHome.react.js | 6 ++--- .../ContainerHomeFolders.react.js | 6 ++--- .../ContainerHomeLogs.react.js | 4 ++-- .../ContainerHomePreview.react.js | 8 +++---- src/{ => components}/ContainerList.react.js | 0 .../ContainerListItem.react.js | 4 ++-- .../ContainerListNewItem.react.js | 4 ++-- src/{ => components}/ContainerLogs.react.js | 2 +- .../ContainerSettings.react.js | 0 .../ContainerSettingsGeneral.react.js | 7 +++--- .../ContainerSettingsPorts.react.js | 8 +++---- .../ContainerSettingsVolumes.react.js | 4 ++-- src/{ => components}/Containers.react.js | 10 ++++----- src/{ => components}/Header.react.js | 0 src/{ => components}/ImageCard.react.js | 6 ++--- src/{ => components}/NewContainer.react.js | 2 +- src/{ => components}/Preferences.react.js | 2 +- src/{ => components}/Radial.react.js | 0 src/{ => components}/Setup.react.js | 6 ++--- src/{ => stores}/ContainerStore.js | 8 +++---- src/{ => stores}/LogStore.js | 2 +- src/{ => stores}/SetupStore-test.js | 8 +++---- src/{ => stores}/SetupStore.js | 12 +++++----- src/{ => utils}/ContainerUtil.js | 2 +- src/{ => utils}/SetupUtil.js | 0 src/{ => utils}/Util-test.js | 0 src/{ => utils}/Util.js | 2 +- src/{ => utils}/WebUtil.js | 0 39 files changed, 81 insertions(+), 83 deletions(-) rename src/{ => components}/ContainerDetails.react.js (100%) rename src/{ => components}/ContainerDetailsHeader.react.js (100%) rename src/{ => components}/ContainerDetailsSubheader.react.js (96%) rename src/{ => components}/ContainerHome.react.js (97%) rename src/{ => components}/ContainerHomeFolders.react.js (94%) rename src/{ => components}/ContainerHomeLogs.react.js (96%) rename src/{ => components}/ContainerHomePreview.react.js (94%) rename src/{ => components}/ContainerList.react.js (100%) rename src/{ => components}/ContainerListItem.react.js (97%) rename src/{ => components}/ContainerListNewItem.react.js (94%) rename src/{ => components}/ContainerLogs.react.js (97%) rename src/{ => components}/ContainerSettings.react.js (100%) rename src/{ => components}/ContainerSettingsGeneral.react.js (98%) rename src/{ => components}/ContainerSettingsPorts.react.js (91%) rename src/{ => components}/ContainerSettingsVolumes.react.js (97%) rename src/{ => components}/Containers.react.js (96%) rename src/{ => components}/Header.react.js (100%) rename src/{ => components}/ImageCard.react.js (97%) rename src/{ => components}/NewContainer.react.js (99%) rename src/{ => components}/Preferences.react.js (98%) rename src/{ => components}/Radial.react.js (100%) rename src/{ => components}/Setup.react.js (97%) rename src/{ => stores}/ContainerStore.js (98%) rename src/{ => stores}/LogStore.js (98%) rename src/{ => stores}/SetupStore-test.js (95%) rename src/{ => stores}/SetupStore.js (96%) rename src/{ => utils}/ContainerUtil.js (96%) rename src/{ => utils}/SetupUtil.js (100%) rename src/{ => utils}/Util-test.js (100%) rename src/{ => utils}/Util.js (94%) rename src/{ => utils}/WebUtil.js (100%) diff --git a/gulpfile.js b/gulpfile.js index ac3590581a..e3404ac9cf 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,6 +15,7 @@ var react = require('gulp-react'); var runSequence = require('run-sequence'); var shell = require('gulp-shell'); var sourcemaps = require('gulp-sourcemaps'); +var path = require('path'); var dependencies = Object.keys(packagejson.dependencies); var argv = require('minimist')(process.argv.slice(2)); diff --git a/src/DockerMachine.js b/src/DockerMachine.js index 6601fafb3a..b17e6002b6 100644 --- a/src/DockerMachine.js +++ b/src/DockerMachine.js @@ -3,7 +3,7 @@ var path = require('path'); var Promise = require('bluebird'); var _ = require('underscore'); var fs = require('fs'); -var util = require('./Util'); +var util = require('./utils/Util'); var NAME = 'dev'; @@ -16,7 +16,7 @@ var DockerMachine = { }, version: function () { try { - return JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'))['docker-machine-version']; + return util.packagejson()['docker-machine-version']; } catch (err) { return null; } diff --git a/src/Main.js b/src/Main.js index 9637fce357..cd87f2832e 100644 --- a/src/Main.js +++ b/src/Main.js @@ -1,16 +1,16 @@ require.main.paths.splice(0, 0, process.env.NODE_PATH); var remote = require('remote'); -var ContainerStore = require('./ContainerStore'); +var ContainerStore = require('./stores/ContainerStore'); var Menu = remote.require('menu'); var React = require('react'); -var SetupStore = require('./SetupStore'); +var SetupStore = require('./stores/SetupStore'); var bugsnag = require('bugsnag-js'); var ipc = require('ipc'); var machine = require('./DockerMachine'); var metrics = require('./Metrics'); var router = require('./Router'); var template = require('./MenuTemplate'); -var webUtil = require('./WebUtil'); +var webUtil = require('./utils/WebUtil'); webUtil.addWindowSizeSaving(); webUtil.addLiveReload(); diff --git a/src/MenuTemplate.js b/src/MenuTemplate.js index f81485e8ae..36eafffda5 100644 --- a/src/MenuTemplate.js +++ b/src/MenuTemplate.js @@ -1,7 +1,7 @@ var remote = require('remote'); var app = remote.require('app'); var router = require('./Router'); -var util = require('./Util'); +var util = require('./utils/Util'); var metrics = require('./Metrics'); var machine = require('./DockerMachine'); var docker = require('./Docker'); diff --git a/src/Metrics.js b/src/Metrics.js index 3447f0f577..682ec46c45 100644 --- a/src/Metrics.js +++ b/src/Metrics.js @@ -3,7 +3,7 @@ var Mixpanel = require('mixpanel'); var uuid = require('node-uuid'); var fs = require('fs'); var path = require('path'); -var util = require('./Util'); +var util = require('./utils/Util'); var settings; try { diff --git a/src/Routes.js b/src/Routes.js index eab468fa1c..95a8a99a81 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -1,15 +1,15 @@ var React = require('react/addons'); -var Setup = require('./Setup.react'); -var Containers = require('./Containers.react'); -var ContainerDetails = require('./ContainerDetails.react'); -var ContainerHome = require('./ContainerHome.react'); -var ContainerLogs = require('./ContainerLogs.react'); -var ContainerSettings = require('./ContainerSettings.react'); -var ContainerSettingsGeneral = require('./ContainerSettingsGeneral.react'); -var ContainerSettingsPorts = require('./ContainerSettingsPorts.react'); -var ContainerSettingsVolumes = require('./ContainerSettingsVolumes.react'); -var Preferences = require('./Preferences.react'); -var NewContainer = require('./NewContainer.react'); +var Setup = require('./components/Setup.react'); +var Containers = require('./components/Containers.react'); +var ContainerDetails = require('./components/ContainerDetails.react'); +var ContainerHome = require('./components/ContainerHome.react'); +var ContainerLogs = require('./components/ContainerLogs.react'); +var ContainerSettings = require('./components/ContainerSettings.react'); +var ContainerSettingsGeneral = require('./components/ContainerSettingsGeneral.react'); +var ContainerSettingsPorts = require('./components/ContainerSettingsPorts.react'); +var ContainerSettingsVolumes = require('./components/ContainerSettingsVolumes.react'); +var Preferences = require('./components/Preferences.react'); +var NewContainer = require('./components/NewContainer.react'); var Router = require('react-router'); var Route = Router.Route; diff --git a/src/VirtualBox.js b/src/VirtualBox.js index 43e550dc7c..e290353909 100644 --- a/src/VirtualBox.js +++ b/src/VirtualBox.js @@ -1,5 +1,5 @@ var fs = require('fs'); -var util = require('./Util'); +var util = require('./utils/Util'); var Promise = require('bluebird'); var VirtualBox = { diff --git a/src/Virtualbox-test.js b/src/Virtualbox-test.js index 567210a08a..6a293a913c 100644 --- a/src/Virtualbox-test.js +++ b/src/Virtualbox-test.js @@ -1,6 +1,6 @@ jest.dontMock('./VirtualBox'); var virtualBox = require('./VirtualBox'); -var util = require('./Util'); +var util = require('./utils/Util'); describe('VirtualBox', function () { it('returns the right command', function () { diff --git a/src/ContainerDetails.react.js b/src/components/ContainerDetails.react.js similarity index 100% rename from src/ContainerDetails.react.js rename to src/components/ContainerDetails.react.js diff --git a/src/ContainerDetailsHeader.react.js b/src/components/ContainerDetailsHeader.react.js similarity index 100% rename from src/ContainerDetailsHeader.react.js rename to src/components/ContainerDetailsHeader.react.js diff --git a/src/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js similarity index 96% rename from src/ContainerDetailsSubheader.react.js rename to src/components/ContainerDetailsSubheader.react.js index 8f9b2f3879..b405828708 100644 --- a/src/ContainerDetailsSubheader.react.js +++ b/src/components/ContainerDetailsSubheader.react.js @@ -3,12 +3,12 @@ var $ = require('jquery'); var React = require('react'); var exec = require('exec'); var path = require('path'); -var metrics = require('./Metrics'); -var ContainerStore = require('./ContainerStore'); -var ContainerUtil = require('./ContainerUtil'); -var machine = require('./DockerMachine'); +var metrics = require('../Metrics'); +var ContainerStore = require('../stores/ContainerStore'); +var ContainerUtil = require('../utils/ContainerUtil'); +var machine = require('../DockerMachine'); var RetinaImage = require('react-retina-image'); -var webPorts = require('./Util').webPorts; +var webPorts = require('../utils/Util').webPorts; var classNames = require('classnames'); var ContainerDetailsSubheader = React.createClass({ diff --git a/src/ContainerHome.react.js b/src/components/ContainerHome.react.js similarity index 97% rename from src/ContainerHome.react.js rename to src/components/ContainerHome.react.js index 0e458e49d9..7c032cda8f 100644 --- a/src/ContainerHome.react.js +++ b/src/components/ContainerHome.react.js @@ -1,13 +1,13 @@ var _ = require('underscore'); var $ = require('jquery'); var React = require('react/addons'); -var ContainerStore = require('./ContainerStore'); +var ContainerStore = require('../stores/ContainerStore'); var Radial = require('./Radial.react'); var ContainerHomePreview = require('./ContainerHomePreview.react'); var ContainerHomeLogs = require('./ContainerHomeLogs.react'); var ContainerHomeFolders = require('./ContainerHomeFolders.react'); -var ContainerUtil = require('./ContainerUtil'); -var util = require('./Util'); +var ContainerUtil = require('../utils/ContainerUtil'); +var util = require('../utils/Util'); var resizeWindow = function () { $('.left .wrapper').height(window.innerHeight - 240); diff --git a/src/ContainerHomeFolders.react.js b/src/components/ContainerHomeFolders.react.js similarity index 94% rename from src/ContainerHomeFolders.react.js rename to src/components/ContainerHomeFolders.react.js index ca2760c3db..ee672c0071 100644 --- a/src/ContainerHomeFolders.react.js +++ b/src/components/ContainerHomeFolders.react.js @@ -3,9 +3,9 @@ var React = require('react/addons'); var RetinaImage = require('react-retina-image'); var path = require('path'); var shell = require('shell'); -var util = require('./Util'); -var metrics = require('./Metrics'); -var ContainerStore = require('./ContainerStore'); +var util = require('../utils/Util'); +var metrics = require('../Metrics'); +var ContainerStore = require('../stores/ContainerStore'); var ContainerHomeFolder = React.createClass({ contextTypes: { diff --git a/src/ContainerHomeLogs.react.js b/src/components/ContainerHomeLogs.react.js similarity index 96% rename from src/ContainerHomeLogs.react.js rename to src/components/ContainerHomeLogs.react.js index 771765dfa9..0c4414361c 100644 --- a/src/ContainerHomeLogs.react.js +++ b/src/components/ContainerHomeLogs.react.js @@ -1,8 +1,8 @@ var $ = require('jquery'); var React = require('react/addons'); -var LogStore = require('./LogStore'); +var LogStore = require('../stores/LogStore'); var Router = require('react-router'); -var metrics = require('./Metrics'); +var metrics = require('../Metrics'); var _prevBottom = 0; diff --git a/src/ContainerHomePreview.react.js b/src/components/ContainerHomePreview.react.js similarity index 94% rename from src/ContainerHomePreview.react.js rename to src/components/ContainerHomePreview.react.js index 34fa82bd26..f39f40cddc 100644 --- a/src/ContainerHomePreview.react.js +++ b/src/components/ContainerHomePreview.react.js @@ -1,11 +1,11 @@ var _ = require('underscore'); var React = require('react/addons'); var exec = require('exec'); -var ContainerStore = require('./ContainerStore'); -var ContainerUtil = require('./ContainerUtil'); +var ContainerStore = require('../stores/ContainerStore'); +var ContainerUtil = require('../utils/ContainerUtil'); var request = require('request'); -var metrics = require('./Metrics'); -var webPorts = require('./Util').webPorts; +var metrics = require('../Metrics'); +var webPorts = require('../utils/Util').webPorts; var ContainerHomePreview = React.createClass({ contextTypes: { diff --git a/src/ContainerList.react.js b/src/components/ContainerList.react.js similarity index 100% rename from src/ContainerList.react.js rename to src/components/ContainerList.react.js diff --git a/src/ContainerListItem.react.js b/src/components/ContainerListItem.react.js similarity index 97% rename from src/ContainerListItem.react.js rename to src/components/ContainerListItem.react.js index 2ed466bda8..bdf41eefc7 100644 --- a/src/ContainerListItem.react.js +++ b/src/components/ContainerListItem.react.js @@ -3,8 +3,8 @@ var React = require('react/addons'); var Router = require('react-router'); var remote = require('remote'); var dialog = remote.require('dialog'); -var metrics = require('./Metrics'); -var ContainerStore = require('./ContainerStore'); +var metrics = require('../Metrics'); +var ContainerStore = require('../stores/ContainerStore'); var OverlayTrigger = require('react-bootstrap').OverlayTrigger; var Tooltip = require('react-bootstrap').Tooltip; diff --git a/src/ContainerListNewItem.react.js b/src/components/ContainerListNewItem.react.js similarity index 94% rename from src/ContainerListNewItem.react.js rename to src/components/ContainerListNewItem.react.js index 108e7b78e4..4a0ac199c3 100644 --- a/src/ContainerListNewItem.react.js +++ b/src/components/ContainerListNewItem.react.js @@ -1,8 +1,8 @@ var $ = require('jquery'); var React = require('react/addons'); var Router = require('react-router'); -var ContainerStore = require('./ContainerStore'); -var metrics = require('./Metrics'); +var ContainerStore = require('../stores/ContainerStore'); +var metrics = require('../Metrics'); var ContainerListNewItem = React.createClass({ handleItemMouseEnter: function () { diff --git a/src/ContainerLogs.react.js b/src/components/ContainerLogs.react.js similarity index 97% rename from src/ContainerLogs.react.js rename to src/components/ContainerLogs.react.js index 36689c44af..6355154ee4 100644 --- a/src/ContainerLogs.react.js +++ b/src/components/ContainerLogs.react.js @@ -1,6 +1,6 @@ var $ = require('jquery'); var React = require('react/addons'); -var LogStore = require('./LogStore'); +var LogStore = require('../stores/LogStore'); var _prevBottom = 0; diff --git a/src/ContainerSettings.react.js b/src/components/ContainerSettings.react.js similarity index 100% rename from src/ContainerSettings.react.js rename to src/components/ContainerSettings.react.js diff --git a/src/ContainerSettingsGeneral.react.js b/src/components/ContainerSettingsGeneral.react.js similarity index 98% rename from src/ContainerSettingsGeneral.react.js rename to src/components/ContainerSettingsGeneral.react.js index f54728cff7..462ed3d9cc 100644 --- a/src/ContainerSettingsGeneral.react.js +++ b/src/components/ContainerSettingsGeneral.react.js @@ -1,15 +1,14 @@ var _ = require('underscore'); var $ = require('jquery'); var React = require('react/addons'); -var Router = require('react-router'); var path = require('path'); var remote = require('remote'); var rimraf = require('rimraf'); var fs = require('fs'); -var metrics = require('./Metrics'); +var metrics = require('../Metrics'); var dialog = remote.require('dialog'); -var ContainerStore = require('./ContainerStore'); -var ContainerUtil = require('./ContainerUtil'); +var ContainerStore = require('../stores/ContainerStore'); +var ContainerUtil = require('../utils/ContainerUtil'); var containerNameSlugify = function (text) { text = text.replace(/^\s+|\s+$/g, ''); // Trim diff --git a/src/ContainerSettingsPorts.react.js b/src/components/ContainerSettingsPorts.react.js similarity index 91% rename from src/ContainerSettingsPorts.react.js rename to src/components/ContainerSettingsPorts.react.js index 21581e76bd..95ef7a277a 100644 --- a/src/ContainerSettingsPorts.react.js +++ b/src/components/ContainerSettingsPorts.react.js @@ -1,10 +1,10 @@ var _ = require('underscore'); var React = require('react/addons'); var exec = require('exec'); -var ContainerStore = require('./ContainerStore'); -var ContainerUtil = require('./ContainerUtil'); -var metrics = require('./Metrics'); -var webPorts = require('./Util').webPorts; +var ContainerStore = require('../stores/ContainerStore'); +var ContainerUtil = require('../utils/ContainerUtil'); +var metrics = require('../Metrics'); +var webPorts = require('../utils/Util').webPorts; var ContainerSettingsPorts = React.createClass({ contextTypes: { diff --git a/src/ContainerSettingsVolumes.react.js b/src/components/ContainerSettingsVolumes.react.js similarity index 97% rename from src/ContainerSettingsVolumes.react.js rename to src/components/ContainerSettingsVolumes.react.js index 6108398a0f..1670434d83 100644 --- a/src/ContainerSettingsVolumes.react.js +++ b/src/components/ContainerSettingsVolumes.react.js @@ -3,8 +3,8 @@ var React = require('react/addons'); var remote = require('remote'); var exec = require('exec'); var dialog = remote.require('dialog'); -var metrics = require('./Metrics'); -var ContainerStore = require('./ContainerStore'); +var metrics = require('../Metrics'); +var ContainerStore = require('../stores/ContainerStore'); var ContainerSettingsVolumes = React.createClass({ handleChooseVolumeClick: function (dockerVol) { diff --git a/src/Containers.react.js b/src/components/Containers.react.js similarity index 96% rename from src/Containers.react.js rename to src/components/Containers.react.js index b75d9ea4c9..e221e6180c 100644 --- a/src/Containers.react.js +++ b/src/components/Containers.react.js @@ -1,18 +1,16 @@ var $ = require('jquery'); var React = require('react/addons'); var Router = require('react-router'); -var ContainerStore = require('./ContainerStore'); +var ContainerStore = require('../stores/ContainerStore'); var ContainerList = require('./ContainerList.react'); var Header = require('./Header.react'); var ipc = require('ipc'); var remote = require('remote'); -var metrics = require('./Metrics'); +var metrics = require('../Metrics'); var autoUpdater = remote.require('auto-updater'); var RetinaImage = require('react-retina-image'); -var machine = require('./DockerMachine'); -var OverlayTrigger = require('react-bootstrap').OverlayTrigger; -var Tooltip = require('react-bootstrap').Tooltip; -var util = require('./Util'); +var machine = require('../DockerMachine'); +var util = require('../utils/Util'); var Containers = React.createClass({ contextTypes: { diff --git a/src/Header.react.js b/src/components/Header.react.js similarity index 100% rename from src/Header.react.js rename to src/components/Header.react.js diff --git a/src/ImageCard.react.js b/src/components/ImageCard.react.js similarity index 97% rename from src/ImageCard.react.js rename to src/components/ImageCard.react.js index 659d1407e6..685493684d 100644 --- a/src/ImageCard.react.js +++ b/src/components/ImageCard.react.js @@ -1,11 +1,11 @@ var $ = require('jquery'); var React = require('react/addons'); var RetinaImage = require('react-retina-image'); -var ContainerStore = require('./ContainerStore'); -var metrics = require('./Metrics'); +var ContainerStore = require('../stores/ContainerStore'); +var metrics = require('../Metrics'); var OverlayTrigger = require('react-bootstrap').OverlayTrigger; var Tooltip = require('react-bootstrap').Tooltip; -var util = require('./Util'); +var util = require('../utils/Util'); var ImageCard = React.createClass({ getInitialState: function () { diff --git a/src/NewContainer.react.js b/src/components/NewContainer.react.js similarity index 99% rename from src/NewContainer.react.js rename to src/components/NewContainer.react.js index 39de7011f8..93acf59ce7 100644 --- a/src/NewContainer.react.js +++ b/src/components/NewContainer.react.js @@ -5,7 +5,7 @@ var RetinaImage = require('react-retina-image'); var Radial = require('./Radial.react'); var ImageCard = require('./ImageCard.react'); var Promise = require('bluebird'); -var metrics = require('./Metrics'); +var metrics = require('../Metrics'); var classNames = require('classnames'); var _recommended = []; diff --git a/src/Preferences.react.js b/src/components/Preferences.react.js similarity index 98% rename from src/Preferences.react.js rename to src/components/Preferences.react.js index c4cdad8b28..63f59711b8 100644 --- a/src/Preferences.react.js +++ b/src/components/Preferences.react.js @@ -1,5 +1,5 @@ var React = require('react/addons'); -var metrics = require('./Metrics'); +var metrics = require('../Metrics'); var Router = require('react-router'); var Preferences = React.createClass({ diff --git a/src/Radial.react.js b/src/components/Radial.react.js similarity index 100% rename from src/Radial.react.js rename to src/components/Radial.react.js diff --git a/src/Setup.react.js b/src/components/Setup.react.js similarity index 97% rename from src/Setup.react.js rename to src/components/Setup.react.js index fc76aecf03..307069e309 100644 --- a/src/Setup.react.js +++ b/src/components/Setup.react.js @@ -1,11 +1,11 @@ var React = require('react/addons'); var Router = require('react-router'); var Radial = require('./Radial.react.js'); -var SetupStore = require('./SetupStore'); +var SetupStore = require('../stores/SetupStore'); var RetinaImage = require('react-retina-image'); var Header = require('./Header.react'); -var Util = require('./Util'); -var metrics = require('./Metrics'); +var Util = require('../utils/Util'); +var metrics = require('../Metrics'); var Setup = React.createClass({ mixins: [ Router.Navigation ], diff --git a/src/ContainerStore.js b/src/stores/ContainerStore.js similarity index 98% rename from src/ContainerStore.js rename to src/stores/ContainerStore.js index ef9bfb28a9..bd09d16c90 100644 --- a/src/ContainerStore.js +++ b/src/stores/ContainerStore.js @@ -2,10 +2,10 @@ var _ = require('underscore'); var EventEmitter = require('events').EventEmitter; var async = require('async'); var assign = require('object-assign'); -var docker = require('./Docker'); -var metrics = require('./Metrics'); -var registry = require('./Registry'); -var logstore = require('./LogStore'); +var docker = require('../Docker'); +var metrics = require('../Metrics'); +var registry = require('../Registry'); +var logstore = require('../stores/LogStore'); var bugsnag = require('bugsnag-js'); var _placeholders = {}; diff --git a/src/LogStore.js b/src/stores/LogStore.js similarity index 98% rename from src/LogStore.js rename to src/stores/LogStore.js index 60f707ce80..6f4c203db1 100644 --- a/src/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('../Docker'); var stream = require('stream'); var _convert = new Convert(); diff --git a/src/SetupStore-test.js b/src/stores/SetupStore-test.js similarity index 95% rename from src/SetupStore-test.js rename to src/stores/SetupStore-test.js index 6a62e4bb64..1483b67c61 100644 --- a/src/SetupStore-test.js +++ b/src/stores/SetupStore-test.js @@ -1,9 +1,9 @@ jest.dontMock('./SetupStore'); var setupStore = require('./SetupStore'); -var virtualBox = require('./VirtualBox'); -var util = require('./Util'); -var machine = require('./DockerMachine'); -var setupUtil = require('./SetupUtil'); +var virtualBox = require('../VirtualBox'); +var util = require('../utils/Util'); +var machine = require('../DockerMachine'); +var setupUtil = require('../utils/SetupUtil'); describe('SetupStore', function () { describe('download step', function () { diff --git a/src/SetupStore.js b/src/stores/SetupStore.js similarity index 96% rename from src/SetupStore.js rename to src/stores/SetupStore.js index ec72828e93..73924f55a6 100644 --- a/src/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 setupUtil = require('./SetupUtil'); -var util = require('./Util'); +var machine = require('../DockerMachine'); +var virtualBox = require('../VirtualBox'); +var setupUtil = require('../utils/SetupUtil'); +var util = require('../utils/Util'); var assign = require('object-assign'); -var metrics = require('./Metrics'); +var metrics = require('../Metrics'); var bugsnag = require('bugsnag-js'); -var docker = require('./Docker'); +var docker = require('../Docker'); var _currentStep = null; var _error = null; diff --git a/src/ContainerUtil.js b/src/utils/ContainerUtil.js similarity index 96% rename from src/ContainerUtil.js rename to src/utils/ContainerUtil.js index bae761d0cc..cff2273669 100644 --- a/src/ContainerUtil.js +++ b/src/utils/ContainerUtil.js @@ -1,5 +1,5 @@ var _ = require('underscore'); -var docker = require('./Docker'); +var docker = require('../Docker'); var ContainerUtil = { env: function (container) { diff --git a/src/SetupUtil.js b/src/utils/SetupUtil.js similarity index 100% rename from src/SetupUtil.js rename to src/utils/SetupUtil.js diff --git a/src/Util-test.js b/src/utils/Util-test.js similarity index 100% rename from src/Util-test.js rename to src/utils/Util-test.js diff --git a/src/Util.js b/src/utils/Util.js similarity index 94% rename from src/Util.js rename to src/utils/Util.js index e68d3b953c..5b23058f7d 100644 --- a/src/Util.js +++ b/src/utils/Util.js @@ -43,7 +43,7 @@ module.exports = { return process.env.RESOURCES_PATH; }, packagejson: function () { - return JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8')); + return JSON.parse(fs.readFileSync(path.join(__dirname, '../..', 'package.json'), 'utf8')); }, settingsjson: function () { var settingsjson = {}; diff --git a/src/WebUtil.js b/src/utils/WebUtil.js similarity index 100% rename from src/WebUtil.js rename to src/utils/WebUtil.js