Moving to a flux-like folder structure

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));

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;
     }

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();

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');

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 {

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;

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 = {

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 () {

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({

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);

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: {

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;
 

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: {

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;
 

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 () {

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;
 

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

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: {

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) {

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: {

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 () {

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 = [];

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({

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 ],

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 = {};

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();

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 () {

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;

src/utils/ContainerUtil.js

@@ -1,5 +1,5 @@
 var _ = require('underscore');
-var docker = require('./Docker');
+var docker = require('../Docker');
 
 var ContainerUtil = {
   env: function (container) {

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 = {};