Merge pull request #385 from kitematic/bump-16

Bumping to 0.5.14 with docker 1.6 and docker-machine 0.2.0

gulpfile.js

@@ -106,6 +106,7 @@ gulp.task('dist', function () {
     'mkdir -p dist/osx/<%= filename %>/Contents/Resources/app/resources',
     'cp -v resources/* dist/osx/<%= filename %>/Contents/Resources/app/resources/ || :',
     'cp <%= icon %> dist/osx/<%= filename %>/Contents/Resources/atom.icns',
+    'cp ./util/Info.plist dist/osx/<%= filename %>/Contents/Info.plist',
     '/usr/libexec/PlistBuddy -c "Set :CFBundleVersion <%= version %>" dist/osx/<%= filename %>/Contents/Info.plist',
     '/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName <%= name %>" dist/osx/<%= filename %>/Contents/Info.plist',
     '/usr/libexec/PlistBuddy -c "Set :CFBundleName <%= name %>" dist/osx/<%= filename %>/Contents/Info.plist',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
@@ -12,11 +12,10 @@
   "bugs": "https://github.com/kitematic/kitematic/issues",
   "scripts": {
     "start": "gulp",
-    "test": "jest --coverage",
+    "test": "jest",
     "release": "gulp release",
     "release:beta": "gulp release --beta",
     "preinstall": "./util/deps",
-    "postinstall": "if [ `uname` == 'Darwin' ]; then gulp download  && cp util/Info.plist cache/Atom.app/Contents/Info.plist && cp util/kitematic.icns cache/Atom.app/Contents/Resources/atom.icns; fi",
     "lint": "jsxhint src && jsxhint browser"
   },
   "licenses": [
@@ -45,8 +44,8 @@
       "<rootDir>/node_modules/bluebird"
     ]
   },
-  "docker-version": "1.5.0",
+  "docker-version": "1.6.0",
-  "docker-machine-version": "0.1.0-kitematic-0.5.10",
+  "docker-machine-version": "0.2.0",
   "atom-shell-version": "0.23.0",
   "virtualbox-version": "4.3.26",
   "virtualbox-filename": "VirtualBox-4.3.26.pkg",

src/SetupStore-test.js

@@ -76,19 +76,16 @@ describe('SetupStore', function () {
       machine.isoversion.mockReturnValue('1.0');
       machine.stop.mockReturnValue(Promise.resolve());
       machine.start.mockReturnValue(Promise.resolve());
-      machine.regenerateCerts.mockReturnValue(Promise.resolve());
       machine.upgrade.mockReturnValue(Promise.resolve());
       setupUtil.compareVersions.mockReturnValue(-1);
       machine.create.mockClear();
       machine.upgrade.mockClear();
       machine.stop.mockClear();
       machine.start.mockClear();
-      machine.regenerateCerts.mockClear();
       return setupStore.steps().init.run(() => {}).then(() => {
         expect(machine.create).not.toBeCalled();
         expect(machine.stop).toBeCalled();
         expect(machine.upgrade).toBeCalled();
-        expect(machine.regenerateCerts).toBeCalled();
         expect(machine.start).toBeCalled();
       });
     });

src/SetupStore.js

@@ -77,10 +77,6 @@ var _steps = [{
       return;
     }
 
-    if ((yield machine.state()) === 'Saved') {
-      yield virtualBox.wake(machine.name());
-    }
-
     var isoversion = machine.isoversion();
     var packagejson = util.packagejson();
     if (!isoversion || setupUtil.compareVersions(isoversion, packagejson['docker-version']) < 0) {
@@ -89,7 +85,6 @@ var _steps = [{
     }
     if ((yield machine.state()) !== 'Running') {
       yield machine.start();
-      yield machine.regenerateCerts();
     }
   })
 }];

util/deps

@@ -21,9 +21,7 @@ fi
 if [ ! -f $DOCKER_MACHINE_CLI_FILE ]; then
   echo "-----> Downloading Docker Machine CLI..."
   rm -rf docker-machine*
-  # Use temporary, new version of docker-machine that has some important fixes
+  curl -L -o $DOCKER_MACHINE_CLI_FILE https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_CLI_VERSION/docker-machine_darwin-amd64
-  # curl -L -o $DOCKER_MACHINE_CLI_FILE https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_CLI_VERSION/docker-machine_darwin-amd64
-  curl -L -o $DOCKER_MACHINE_CLI_FILE https://github.com/kitematic/kitematic/releases/download/v0.5.10/docker-machine_darwin-amd64
   chmod +x $DOCKER_MACHINE_CLI_FILE
 fi