Merge branch 'master' into hub

CONTRIBUTING.md

@@ -6,6 +6,7 @@ Before you fil an issue or a pull request, quickly read of the following tips on
 
 ## Table of Contents
 
+ - [Prerequisites](#prerequisites)
  - [Getting Started](#getting-started)
  - [Architecture](#architecture)
  - [GitHub Issues](#github-issues)
@@ -14,6 +15,18 @@ Before you fil an issue or a pull request, quickly read of the following tips on
  - [Testing](#testing)
  - [License](#license)
 
+### Prerequisites
+
+Most of the time, you'll have installed Kitematic before contibuting, but for the
+sake of completeness, you can also install [Node.js](https://nodejs.org/) and then
+run from your Git clone.
+
+Running `npm start` will download and install the OS X Docker client,
+[Docker machine](https://github.com/docker/machine),
+the [Boot2Docker iso](https://github.com/boot2docker/boot2docker),
+[Electron](http://electron.atom.io/), and [VirtualBox](https://www.virtualbox.org/)
+if needed.
+
 ### Getting Started
 
 - `npm install`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
@@ -48,14 +48,14 @@
       "<rootDir>/node_modules/source-map-support"
     ]
   },
-  "docker-version": "1.6.1",
+  "docker-version": "1.6.2",
   "docker-machine-version": "0.2.0",
-  "electron-version": "0.24.0",
-  "virtualbox-version": "4.3.26",
-  "virtualbox-filename": "VirtualBox-4.3.26.pkg",
-  "virtualbox-filename-win": "VirtualBox-4.3.26.exe",
-  "virtualbox-checksum": "668f61c95efe37f8fc65cafe95b866fba64e37f2492dfc1e2b44a7ac3dcafa3b",
-  "virtualbox-checksum-win": "9cb265babf307d825f5178693af95ffca077f80ae22cf43868c3538c159123ff",
+  "electron-version": "0.26.0",
+  "virtualbox-version": "4.3.28",
+  "virtualbox-filename": "VirtualBox-4.3.28.pkg",
+  "virtualbox-filename-win": "VirtualBox-4.3.28.exe",
+  "virtualbox-checksum": "60521caff652fc32ad733eee2eea27f03d0b4f7239af3bf4b21dc6f0251cf47a",
+  "virtualbox-checksum-win": "82039b615bf18dfff92ac1d9a15b2cbd5c59c608631ccf77e2371d0fd67a6cf7",
   "dependencies": {
     "alt": "^0.16.2",
     "ansi-to-html": "0.3.0",

resources/terminal

@@ -9,37 +9,42 @@ end try
 return doesExist
 EOF`
 
-if [ $ITERM_EXISTS == "true" ]; then
+function open_iterm () {
   osascript > /dev/null <<EOF
-tell application "iTerm"
-  activate
-  try
-    tell the first terminal
-      launch session "Default Session"
-      tell the last session
-        write text "bash -c \"clear && $*\""
+  tell application "iTerm"
+    activate
+    try
+      tell the first terminal
+        launch session "Default Session"
+        tell the last session
+          write text "bash -c \"clear && $*\""
+        end tell
       end tell
-    end tell
-  on error
-    tell (make new terminal)
-      launch session "Default Session"
-      tell the last session
-        write text "bash -c \"clear && $*\""
+    on error
+      tell (make new terminal)
+        launch session "Default Session"
+        tell the last session
+          write text "bash -c \"clear && $*\""
+        end tell
       end tell
-    end tell
-  end try
-end tell
+    end try
+  end tell
 EOF
+}
 
+function open_terminal () {
+  osascript > /dev/null <<EOF
+  tell application "Terminal" to activate
+  delay 0.4
+  tell application "System Events" to keystroke "t" using command down
+  tell application "Terminal"
+    do script "bash -c \"clear && $*\"" in window 1
+  end tell
+EOF
+}
+
+if [ $ITERM_EXISTS == "true" ]; then
+  open_iterm $* || open_terminal $*
 else
-osascript > /dev/null <<EOF
-tell application "Terminal" to activate
-delay 0.4
-tell application "System Events" to keystroke "t" using command down
-tell application "Terminal"
-  do script "bash -c \"clear && $*\"" in window 1
-end tell
-
-EOF
-
+  open_terminal $*
 fi

src/utils/DockerMachineUtil.js

@@ -42,9 +42,9 @@ var DockerMachine = {
         machines[machine.name] = machine;
       });
       if (machines[NAME]) {
-        return machines[NAME];
+        return Promise.resolve(machines[NAME]);
       } else {
-        throw new Error('Machine does not exist.');
+        return Promise.reject(new Error('Machine does not exist.'));
       }
     });
   },