From 1445c62ed15e97a8fedc678eb32980cf4b4fd27d Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 16:54:21 -0800 Subject: [PATCH 01/13] Setup fixes & unit tests --- __tests__/README.md | 1 + __tests__/SetupStore-test.js | 25 +++++++--- browser/main.js | 1 + resources/cocoasudo | Bin 47704 -> 0 bytes resources/macsudo | Bin 0 -> 13916 bytes src/ContainerStore.js | 90 ++++++++++------------------------- src/Setup.react.js | 2 +- src/SetupStore.js | 34 +++++++------ src/SetupUtil.js | 11 +++++ 9 files changed, 75 insertions(+), 89 deletions(-) create mode 100644 __tests__/README.md delete mode 100755 resources/cocoasudo create mode 100755 resources/macsudo diff --git a/__tests__/README.md b/__tests__/README.md new file mode 100644 index 0000000000..02f5488031 --- /dev/null +++ b/__tests__/README.md @@ -0,0 +1 @@ +### Manual tests diff --git a/__tests__/SetupStore-test.js b/__tests__/SetupStore-test.js index ee4fc5f071..2df2918ce1 100644 --- a/__tests__/SetupStore-test.js +++ b/__tests__/SetupStore-test.js @@ -13,7 +13,6 @@ describe('SetupStore', function () { virtualBox.installed.mockReturnValue(false); setupUtil.download.mockReturnValue(Promise.resolve()); return setupStore.steps().download.run().then(() => { - // TODO: make sure download was called with the right args expect(setupUtil.download).toBeCalled(); }); }); @@ -30,26 +29,38 @@ describe('SetupStore', function () { }); describe('install step', function () { + util.exec.mockReturnValue(Promise.resolve()); + util.copyBinariesCmd.mockReturnValue('copycmd'); + util.fixBinariesCmd.mockReturnValue('fixcmd'); + virtualBox.killall.mockReturnValue(Promise.resolve()); + setupUtil.installVirtualBoxCmd.mockReturnValue('installvb'); + setupUtil.macSudoCmd.mockImplementation(cmd => 'macsudo ' + cmd); + pit('installs virtualbox if it is not installed', function () { virtualBox.installed.mockReturnValue(false); - virtualBox.killall.mockReturnValue(Promise.resolve()); util.exec.mockReturnValue(Promise.resolve()); return setupStore.steps().install.run().then(() => { - // TODO: make sure that the right install command was executed - expect(util.exec).toBeCalled(); + expect(virtualBox.killall).toBeCalled(); + expect(util.exec).toBeCalledWith('macsudo copycmd && fixcmd && installvbcmd'); }); }); pit('installs virtualbox if it is installed but has an outdated version', function () { virtualBox.installed.mockReturnValue(true); virtualBox.version.mockReturnValue(Promise.resolve('4.3.16')); - virtualBox.killall.mockReturnValue(Promise.resolve()); setupUtil.compareVersions.mockReturnValue(-1); util.exec.mockReturnValue(Promise.resolve()); return setupStore.steps().install.run().then(() => { - // TODO: make sure the right install command was executed expect(virtualBox.killall).toBeCalled(); - expect(util.exec).toBeCalled(); + expect(util.exec).toBeCalledWith('macsudo copycmd && fixcmd && installvbcmd'); + }); + }); + + pit('only installs binaries if virtualbox is installed', function () { + virtualBox.installed.mockReturnValue(true); + setupUtil.compareVersions.mockReturnValue(0); + return setupStore.steps().install.run().then(() => { + expect(util.exec).toBeCalledWith('macsudo copycmd && fixcmd'); }); }); }); diff --git a/browser/main.js b/browser/main.js index 1a3a6a4852..04354c9407 100644 --- a/browser/main.js +++ b/browser/main.js @@ -16,6 +16,7 @@ try { process.env.NODE_PATH = __dirname + '/../node_modules'; process.env.RESOURCES_PATH = __dirname + '/../resources'; process.chdir(path.join(__dirname, '..')); +process.env.PATH = '/usr/local/bin:' + process.env.PATH; if (argv.integration) { process.env.TEST_TYPE = 'integration'; diff --git a/resources/cocoasudo b/resources/cocoasudo deleted file mode 100755 index ccf0bf8aa1979901080b7b8378ee966848ffc510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47704 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 literal 0 HcmV?d00001 diff --git a/src/ContainerStore.js b/src/ContainerStore.js index 1ec6b04b87..92fb1375aa 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -11,6 +11,7 @@ var ContainerUtil = require('./ContainerUtil'); var convert = new Convert(); var _recommended = []; +var _placeholders = {}; var _containers = {}; var _progress = {}; var _logs = {}; @@ -23,32 +24,8 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { SERVER_CONTAINER_EVENT: 'server_container_event', SERVER_PROGRESS_EVENT: 'server_progress_event', SERVER_LOGS_EVENT: 'server_logs_event', - _pullScratchImage: function (callback) { - var image = docker.client().getImage('scratch:latest'); - image.inspect(function (err, data) { - if (!data) { - docker.client().pull('scratch:latest', function (err, stream) { - if (err) { - callback(err); - return; - } - stream.setEncoding('utf8'); - stream.on('data', function () {}); - stream.on('end', function () { - callback(); - }); - }); - } else { - callback(); - } - }); - }, _pullImage: function (repository, tag, callback, progressCallback) { registry.layers(repository, tag, function (err, layerSizes) { - - // TODO: Support v2 registry API - // TODO: clean this up- It's messy to work with pulls from both the v1 and v2 registry APIs - // Use the per-layer pull progress % to update the total progress. docker.client().listImages({all: 1}, function(err, images) { var existingIds = new Set(images.map(function (image) { return image.Id.slice(0, 12); @@ -162,29 +139,14 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }, _createPlaceholderContainer: function (imageName, name, callback) { - var self = this; - this._pullScratchImage(function (err) { - if (err) { - callback(err); - return; + if (_placeholders[name]) { + delete _placeholders[name]; + } + _placeholders[name] = { + State: { } - docker.client().createContainer({ - Image: 'scratch:latest', - Tty: false, - Env: [ - 'KITEMATIC_DOWNLOADING=true', - 'KITEMATIC_DOWNLOADING_IMAGE=' + imageName - ], - Cmd: 'placeholder', - name: name - }, function (err) { - if (err) { - callback(err); - return; - } - self.fetchContainer(name, callback); - }); - }); + }; + return _placeholders[name]; }, _generateName: function (repository) { var base = _.last(repository.split('/')); @@ -386,28 +348,24 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { var self = this; var imageName = repository + ':' + tag; var containerName = this._generateName(repository); - // Pull image - self._createPlaceholderContainer(imageName, containerName, function (err, container) { - if (err) { - callback(err); - return; - } - _containers[containerName] = container; - self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); - _muted[containerName] = true; - _progress[containerName] = 0; - self._pullImage(repository, tag, function () { - self._createContainer(containerName, {Image: imageName}, function () { - delete _progress[containerName]; - _muted[containerName] = false; - self.emit(self.CLIENT_CONTAINER_EVENT, containerName); - }); - }, function (progress) { - _progress[containerName] = progress; - self.emit(self.SERVER_PROGRESS_EVENT, containerName); + + // Create placeholder container + var container = this._createPlaceholderContainer(imageName, containerName); + _containers[containerName] = container; + self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); + _muted[containerName] = true; + _progress[containerName] = 0; + self._pullImage(repository, tag, function () { + self._createContainer(containerName, {Image: imageName}, function () { + delete _progress[containerName]; + _muted[containerName] = false; + self.emit(self.CLIENT_CONTAINER_EVENT, containerName); }); - callback(null, containerName); + }, function (progress) { + _progress[containerName] = progress; + self.emit(self.SERVER_PROGRESS_EVENT, containerName); }); + callback(null, containerName); }, updateContainer: function (name, data, callback) { _muted[name] = true; diff --git a/src/Setup.react.js b/src/Setup.react.js index bf8b430f64..ea48750a43 100644 --- a/src/Setup.react.js +++ b/src/Setup.react.js @@ -43,7 +43,7 @@ var Setup = React.createClass({ }, renderContents: function () { var img = 'virtualbox.png'; - if (SetupStore.step().name.indexOf('Boot2Docker') !== -1) { + if (SetupStore.step().name.indexOf('start') !== -1 || SetupStore.step().name.indexOf('init') !== -1) { img = 'boot2docker.png'; } return ( diff --git a/src/SetupStore.js b/src/SetupStore.js index d5af39b9d4..e94b39243c 100644 --- a/src/SetupStore.js +++ b/src/SetupStore.js @@ -1,6 +1,7 @@ var EventEmitter = require('events').EventEmitter; var _ = require('underscore'); var path = require('path'); +var fs = require('fs'); var Promise = require('bluebird'); var boot2docker = require('./Boot2Docker'); var virtualBox = require('./VirtualBox'); @@ -20,13 +21,12 @@ var _steps = [{ message: 'VirtualBox is being downloaded. Kitematic requires VirtualBox to run containers.', totalPercent: 35, percent: 0, - run: Promise.coroutine(function* (progressCallback) { + run: function (progressCallback) { var packagejson = util.packagejson(); - var virtualBoxFile = `https://github.com/kitematic/virtualbox/releases/download/${packagejson['virtualbox-version']}/${packagejson['virtualbox-filename']}`; - yield setupUtil.download(virtualBoxFile, path.join(util.supportDir(), packagejson['virtualbox-filename']), packagejson['virtualbox-checksum'], percent => { + return setupUtil.download(setupUtil.virtualBoxUrl(), path.join(util.supportDir(), packagejson['virtualbox-filename']), packagejson['virtualbox-checksum'], percent => { progressCallback(percent); }); - }) + } }, { name: 'install', title: 'Installing Docker & VirtualBox', @@ -34,16 +34,16 @@ var _steps = [{ totalPercent: 5, percent: 0, seconds: 5, - run: Promise.coroutine(function* () { + run: Promise.coroutine(function* (progressCallback) { var packagejson = util.packagejson(); - var base = util.copyBinariesCmd() + ' && ' + util.fixBinariesCmd(); + var cmd = util.copyBinariesCmd() + ' && ' + util.fixBinariesCmd(); if (!virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0) { yield virtualBox.killall(); - base += ` && installer -pkg ${path.join(util.supportDir(), packagejson['virtualbox-filename'])} -target /`; + cmd += ' && ' + setupUtil.installVirtualBoxCmd(); } - var cmd = `${util.escapePath(path.join(util.resourceDir(), 'cocoasudo'))} --prompt="Kitematic requires administrative privileges to install VirtualBox." bash -c \"${base}\"`; try { - yield util.exec(cmd); + progressCallback(50); // TODO: detect when the installation has started so we can simulate progress + yield util.exec(setupUtil.macSudoCmd(cmd)); } catch (err) { throw null; } @@ -130,12 +130,16 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { _retryPromise = Promise.defer(); return _retryPromise.promise; }, - init: Promise.coroutine(function* () { + requiredSteps: Promise.coroutine(function* () { + if (_requiredSteps.length) { + return Promise.resolve(_requiredSteps); + } var packagejson = util.packagejson(); var isoversion = boot2docker.isoversion(); var required = {}; - required.download = !virtualBox.installed() || setupUtil.compareVersions(yield virtualBox.version(), packagejson['virtualbox-required-version']) < 0; - required.install = required.download || setupUtil.needsBinaryFix(); + var vboxfile = path.join(util.supportDir(), packagejson['virtualbox-filename']); + required.download = !virtualBox.installed() && (!fs.existsSync(vboxfile) || setupUtil.checksum(vboxfile) !== packagejson['virtualbox-checksum']); + required.install = !virtualBox.installed() || setupUtil.needsBinaryFix(); required.init = !(yield boot2docker.exists()) || !isoversion || setupUtil.compareVersions(isoversion, boot2docker.version()) < 0; required.start = required.init || (yield boot2docker.status()) !== 'running'; @@ -147,6 +151,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { _requiredSteps = _steps.filter(function (step) { return required[step.name]; }); + return Promise.resolve(_requiredSteps); }), updateBinaries: function () { if (setupUtil.needsBinaryFix()) { @@ -158,9 +163,9 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { return Promise.resolve(); }, run: Promise.coroutine(function* () { - yield this.init(); yield this.updateBinaries(); - for (let step of _requiredSteps) { + var steps = yield this.requiredSteps(); + for (let step of steps) { _currentStep = step; step.percent = 0; while (true) { @@ -176,7 +181,6 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { break; } catch (err) { if (err) { - console.log(err.stack); _error = err; this.emit(this.ERROR_EVENT); } else { diff --git a/src/SetupUtil.js b/src/SetupUtil.js index c18b0cab99..a2597bffd4 100644 --- a/src/SetupUtil.js +++ b/src/SetupUtil.js @@ -29,6 +29,17 @@ var SetupUtil = { this.checksum('/usr/local/bin/boot2docker') !== this.checksum(path.join(util.resourceDir(), 'boot2docker-' + packagejson['boot2docker-version'])) || this.checksum('/usr/local/bin/docker') !== this.checksum(path.join(util.resourceDir(), 'docker-' + packagejson['docker-version'])); }, + installVirtualBoxCmd: function () { + var packagejson = util.packagejson(); + return `installer -pkg ${util.escapePath(path.join(util.supportDir(), packagejson['virtualbox-filename']))} -target /`; + }, + virtualBoxUrl: function () { + var packagejson = util.packagejson(); + return `https://github.com/kitematic/virtualbox/releases/download/${packagejson['virtualbox-version']}/${packagejson['virtualbox-filename']}`; + }, + macSudoCmd: function (cmd) { + return `${util.escapePath(path.join(util.resourceDir(), 'macsudo'))} -p "Kitematic requires administrative privileges to install VirtualBox." sh -c \"${cmd}\"`; + }, simulateProgress: function (estimateSeconds, progress) { var times = _.range(0, estimateSeconds * 1000, 200); var timers = []; From 02e0cb1dbbd77417a330f452a81bcb37aea252c4 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 17:17:38 -0800 Subject: [PATCH 02/13] Adding manual test guide --- __tests__/README.md | 25 ++- __tests__/util/VirtualBox_Uninstall.tool | 245 +++++++++++++++++++++++ __tests__/util/reset | 10 + 3 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 __tests__/util/VirtualBox_Uninstall.tool create mode 100644 __tests__/util/reset diff --git a/__tests__/README.md b/__tests__/README.md index 02f5488031..68a39ba8b2 100644 --- a/__tests__/README.md +++ b/__tests__/README.md @@ -1 +1,24 @@ -### Manual tests +# Kitematic Testing + +## Unit Tests + +Simply run `npm test` + +## Integration Tests + +*Coming Soon* + +## Manual Setup Tests + +Use the reset script under `__tests__/util/reset` to reset your environment for each manual test. WARNING: This will erase your existing VirtualBox, Docker & Kitematic installation. + +The expected result for all test cases is that the setup finishes and an HTML container can be created, and that there are no error logs in the output of Kitematic. + +### Test Cases + +- Clean state +- Clean state with an old version of VirtualBox installed and running `4.3.16<` +- Clean state with VirtualBox installed `4.3.18+` +- Clean state with an old Boot2Docker VM & installation `0.12+` +- Clean state with the latest Boot2Docker VM & installation +- `FAILING` Clean state with an aborted Boot2Docker VM diff --git a/__tests__/util/VirtualBox_Uninstall.tool b/__tests__/util/VirtualBox_Uninstall.tool new file mode 100644 index 0000000000..becb743bc6 --- /dev/null +++ b/__tests__/util/VirtualBox_Uninstall.tool @@ -0,0 +1,245 @@ +#!/bin/bash +# $Id: VirtualBox_Uninstall.tool 89624 2013-10-07 16:13:23Z bird $ +## @file +# VirtualBox Uninstaller Script. +# + +# +# Copyright (C) 2007-2013 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +# Override any funny stuff from the user. +export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$PATH" + +# +# Display a simple welcome message first. +# +echo "" +echo "Welcome to the VirtualBox uninstaller script." +echo "" + +# +# Check for arguments and display +# +my_default_prompt=0 +if test "$#" != "0"; then + if test "$#" != "1" -o "$1" != "--unattended"; then + echo "Error: Unknown argument(s): $*" + echo "" + echo "Usage: uninstall.sh [--unattended]" + echo "" + echo "If the '--unattended' option is not given, you will be prompted" + echo "for a Yes/No before doing the actual uninstallation." + echo "" + exit 4; + fi + my_default_prompt="Yes" +fi + +# +# Collect directories and files to remove. +# Note: Do NOT attempt adding directories or filenames with spaces! +# +declare -a my_directories +declare -a my_files + +# Users files first +test -f "${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist" && my_files+=("${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist") + +test -d /Library/StartupItems/VirtualBox/ && my_directories+=("/Library/StartupItems/VirtualBox/") +test -d /Library/Receipts/VBoxStartupItems.pkg/ && my_directories+=("/Library/Receipts/VBoxStartupItems.pkg/") + +test -d "/Library/Application Support/VirtualBox/LaunchDaemons/" && my_directories+=("/Library/Application Support/VirtualBox/LaunchDaemons/") +test -d "/Library/Application Support/VirtualBox/VBoxDrv.kext/" && my_directories+=("/Library/Application Support/VirtualBox/VBoxDrv.kext/") +test -d "/Library/Application Support/VirtualBox/VBoxUSB.kext/" && my_directories+=("/Library/Application Support/VirtualBox/VBoxUSB.kext/") +test -d "/Library/Application Support/VirtualBox/VBoxNetFlt.kext/" && my_directories+=("/Library/Application Support/VirtualBox/VBoxNetFlt.kext/") +test -d "/Library/Application Support/VirtualBox/VBoxNetAdp.kext/" && my_directories+=("/Library/Application Support/VirtualBox/VBoxNetAdp.kext/") +# Pre 4.3.0rc1 locations: +test -d /Library/Extensions/VBoxDrv.kext/ && my_directories+=("/Library/Extensions/VBoxDrv.kext/") +test -d /Library/Extensions/VBoxUSB.kext/ && my_directories+=("/Library/Extensions/VBoxUSB.kext/") +test -d /Library/Extensions/VBoxNetFlt.kext/ && my_directories+=("/Library/Extensions/VBoxNetFlt.kext/") +test -d /Library/Extensions/VBoxNetAdp.kext/ && my_directories+=("/Library/Extensions/VBoxNetAdp.kext/") +# Tiger support is obsolete, but we leave it here for a clean removing of older +# VirtualBox versions +test -d /Library/Extensions/VBoxDrvTiger.kext/ && my_directories+=("/Library/Extensions/VBoxDrvTiger.kext/") +test -d /Library/Extensions/VBoxUSBTiger.kext/ && my_directories+=("/Library/Extensions/VBoxUSBTiger.kext/") +test -d /Library/Receipts/VBoxKEXTs.pkg/ && my_directories+=("/Library/Receipts/VBoxKEXTs.pkg/") + +test -f /usr/bin/VirtualBox && my_files+=("/usr/bin/VirtualBox") +test -f /usr/bin/VBoxManage && my_files+=("/usr/bin/VBoxManage") +test -f /usr/bin/VBoxVRDP && my_files+=("/usr/bin/VBoxVRDP") +test -f /usr/bin/VBoxHeadless && my_files+=("/usr/bin/VBoxHeadless") +test -f /usr/bin/vboxwebsrv && my_files+=("/usr/bin/vboxwebsrv") +test -f /usr/bin/VBoxBalloonCtrl && my_files+=("/usr/bin/VBoxBalloonCtrl") +test -f /usr/bin/VBoxAutostart && my_files+=("/usr/bin/VBoxAutostart") +test -f /usr/bin/vbox-img && my_files+=("/usr/bin/vbox-img") +test -d /Library/Receipts/VirtualBoxCLI.pkg/ && my_directories+=("/Library/Receipts/VirtualBoxCLI.pkg/") +test -f /Library/LaunchDaemons/org.virtualbox.startup.plist && my_files+=("/Library/LaunchDaemons/org.virtualbox.startup.plist") + +test -d /Applications/VirtualBox.app/ && my_directories+=("/Applications/VirtualBox.app/") +test -d /Library/Receipts/VirtualBox.pkg/ && my_directories+=("/Library/Receipts/VirtualBox.pkg/") + +# legacy +test -d /Library/Receipts/VBoxDrv.pkg/ && my_directories+=("/Library/Receipts/VBoxDrv.pkg/") +test -d /Library/Receipts/VBoxUSB.pkg/ && my_directories+=("/Library/Receipts/VBoxUSB.pkg/") + +# python stuff +python_versions="2.3 2.5 2.6 2.7" +for p in $python_versions; do + test -f /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.py && my_files+=("/Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.py") + test -f /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.pyc && my_files+=("/Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.pyc") + test -f /Library/Python/$p/site-packages/vboxapi/__init__.py && my_files+=("/Library/Python/$p/site-packages/vboxapi/__init__.py") + test -f /Library/Python/$p/site-packages/vboxapi/__init__.pyc && my_files+=("/Library/Python/$p/site-packages/vboxapi/__init__.pyc") + test -f /Library/Python/$p/site-packages/vboxapi-1.0-py$p.egg-info && my_files+=("/Library/Python/$p/site-packages/vboxapi-1.0-py$p.egg-info") + test -d /Library/Python/$p/site-packages/vboxapi/ && my_directories+=("/Library/Python/$p/site-packages/vboxapi/") +done + +# +# Collect KEXTs to remove. +# Note that the unload order is significant. +# +declare -a my_kexts +for kext in org.virtualbox.kext.VBoxUSB org.virtualbox.kext.VBoxNetFlt org.virtualbox.kext.VBoxNetAdp org.virtualbox.kext.VBoxDrv; do + if /usr/sbin/kextstat -b $kext -l | grep -q $kext; then + my_kexts+=("$kext") + fi +done + +# +# Collect packages to forget +# +my_pb='org\.virtualbox\.pkg\.' +my_pkgs=`/usr/sbin/pkgutil --pkgs="${my_pb}vboxkexts|${my_pb}vboxstartupitems|${my_pb}virtualbox|${my_pb}virtualboxcli"` + +# +# Did we find anything to uninstall? +# +if test -z "${my_directories[*]}" -a -z "${my_files[*]}" -a -z "${my_kexts[*]}" -a -z "$my_pkgs"; then + echo "No VirtualBox files, directories, KEXTs or packages to uninstall." + echo "Done." + exit 0; +fi + +# +# Look for running VirtualBox processes and warn the user +# if something is running. Since deleting the files of +# running processes isn't fatal as such, we will leave it +# to the user to choose whether to continue or not. +# +# Note! comm isn't supported on Tiger, so we make -c to do the stripping. +# +my_processes="`ps -axco 'pid uid command' | grep -wEe '(VirtualBox|VirtualBoxVM|VBoxManage|VBoxHeadless|vboxwebsrv|VBoxXPCOMIPCD|VBoxSVC|VBoxNetDHCP|VBoxNetNAT)' | grep -vw grep | grep -vw VirtualBox_Uninstall.tool | tr '\n' '\a'`"; +if test -n "$my_processes"; then + echo 'Warning! Found the following active VirtualBox processes:' + echo "$my_processes" | tr '\a' '\n' + echo "" + echo "We recommend that you quit all VirtualBox processes before" + echo "uninstalling the product." + echo "" + if test "$my_default_prompt" != "Yes"; then + echo "Do you wish to continue none the less (Yes/No)?" + read my_answer + if test "$my_answer" != "Yes" -a "$my_answer" != "YES" -a "$my_answer" != "yes"; then + echo "Aborting uninstall. (answer: '$my_answer')". + exit 2; + fi + echo "" + my_answer="" + fi +fi + +# +# Display the files and directories that will be removed +# and get the user's consent before continuing. +# +if test -n "${my_files[*]}" -o -n "${my_directories[*]}"; then + echo "The following files and directories (bundles) will be removed:" + for file in "${my_files[@]}"; do echo " $file"; done + for dir in "${my_directories[@]}"; do echo " $dir"; done + echo "" +fi +if test -n "${my_kexts[*]}"; then + echo "And the following KEXTs will be unloaded:" + for kext in "${my_kexts[@]}"; do echo " $kext"; done + echo "" +fi +if test -n "$my_pkgs"; then + echo "And the traces of following packages will be removed:" + for kext in $my_pkgs; do echo " $kext"; done + echo "" +fi + +if test "$my_default_prompt" != "Yes"; then + echo "Do you wish to uninstall VirtualBox (Yes/No)?" + read my_answer + if test "$my_answer" != "Yes" -a "$my_answer" != "YES" -a "$my_answer" != "yes"; then + echo "Aborting uninstall. (answer: '$my_answer')". + exit 2; + fi + echo "" +fi + +# +# Unregister has to be done before the files are removed. +# +LSREGISTER=/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister +if [ -e ${LSREGISTER} ]; then + ${LSREGISTER} -u /Applications/VirtualBox.app > /dev/null + ${LSREGISTER} -u /Applications/VirtualBox.app/Contents/Resources/vmstarter.app > /dev/null +fi + +# +# Display the sudo usage instructions and execute the command. +# +echo "The uninstallation processes requires administrative privileges" +echo "because some of the installed files cannot be removed by a normal" +echo "user. You may be prompted for your password now..." +echo "" + +if test -n "${my_files[*]}" -o -n "${my_directories[*]}"; then + /usr/bin/sudo -p "Please enter %u's password:" /bin/rm -Rf "${my_files[@]}" "${my_directories[@]}" + my_rc=$? + if test "$my_rc" -ne 0; then + echo "An error occurred durning 'sudo rm', there should be a message above. (rc=$my_rc)" + test -x /usr/bin/sudo || echo "warning: Cannot find /usr/bin/sudo or it's not an executable." + test -x /bin/rm || echo "warning: Cannot find /bin/rm or it's not an executable" + echo "" + echo "The uninstall failed. Please retry." + exit 1; + fi +fi + +my_rc=0 +for kext in "${my_kexts[@]}"; do + echo unloading $kext + /usr/bin/sudo -p "Please enter %u's password (unloading $kext):" /sbin/kextunload -m $kext + my_rc2=$? + if test "$my_rc2" -ne 0; then + echo "An error occurred durning 'sudo /sbin/kextunload -m $kext', there should be a message above. (rc=$my_rc2)" + test -x /usr/bin/sudo || echo "warning: Cannot find /usr/bin/sudo or it's not an executable." + test -x /sbin/kextunload || echo "warning: Cannot find /sbin/kextunload or it's not an executable" + my_rc=$my_rc2 + fi +done +if test "$my_rc" -eq 0; then + echo "Successfully unloaded VirtualBox kernel extensions." +else + echo "Failed to unload one or more KEXTs, please reboot the machine to complete the uninstall." + exit 1; +fi + +# Cleaning up pkgutil database +for my_pkg in $my_pkgs; do + /usr/bin/sudo -p "Please enter %u's password (removing $my_pkg):" /usr/sbin/pkgutil --forget "$my_pkg" +done + +echo "Done." +exit 0; diff --git a/__tests__/util/reset b/__tests__/util/reset new file mode 100644 index 0000000000..01f01d5bad --- /dev/null +++ b/__tests__/util/reset @@ -0,0 +1,10 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +rm -rf ~/Library/Application\ Support/Kitematic/ +pkill VBox +pkill VirtualBox +$DIR/VirtualBox_Uninstall.tool +rm -rf ~/.boot2docker +rm -rf ~/VirtualBox\ VMs/boot2docker-vm From fa75c1a93c2589e55a88b599fc6a4a77718d0234 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 17:19:30 -0800 Subject: [PATCH 03/13] Reverting containerstore --- src/ContainerStore.js | 90 +++++++++++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/src/ContainerStore.js b/src/ContainerStore.js index 92fb1375aa..1ec6b04b87 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -11,7 +11,6 @@ var ContainerUtil = require('./ContainerUtil'); var convert = new Convert(); var _recommended = []; -var _placeholders = {}; var _containers = {}; var _progress = {}; var _logs = {}; @@ -24,8 +23,32 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { SERVER_CONTAINER_EVENT: 'server_container_event', SERVER_PROGRESS_EVENT: 'server_progress_event', SERVER_LOGS_EVENT: 'server_logs_event', + _pullScratchImage: function (callback) { + var image = docker.client().getImage('scratch:latest'); + image.inspect(function (err, data) { + if (!data) { + docker.client().pull('scratch:latest', function (err, stream) { + if (err) { + callback(err); + return; + } + stream.setEncoding('utf8'); + stream.on('data', function () {}); + stream.on('end', function () { + callback(); + }); + }); + } else { + callback(); + } + }); + }, _pullImage: function (repository, tag, callback, progressCallback) { registry.layers(repository, tag, function (err, layerSizes) { + + // TODO: Support v2 registry API + // TODO: clean this up- It's messy to work with pulls from both the v1 and v2 registry APIs + // Use the per-layer pull progress % to update the total progress. docker.client().listImages({all: 1}, function(err, images) { var existingIds = new Set(images.map(function (image) { return image.Id.slice(0, 12); @@ -139,14 +162,29 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }, _createPlaceholderContainer: function (imageName, name, callback) { - if (_placeholders[name]) { - delete _placeholders[name]; - } - _placeholders[name] = { - State: { + var self = this; + this._pullScratchImage(function (err) { + if (err) { + callback(err); + return; } - }; - return _placeholders[name]; + docker.client().createContainer({ + Image: 'scratch:latest', + Tty: false, + Env: [ + 'KITEMATIC_DOWNLOADING=true', + 'KITEMATIC_DOWNLOADING_IMAGE=' + imageName + ], + Cmd: 'placeholder', + name: name + }, function (err) { + if (err) { + callback(err); + return; + } + self.fetchContainer(name, callback); + }); + }); }, _generateName: function (repository) { var base = _.last(repository.split('/')); @@ -348,24 +386,28 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { var self = this; var imageName = repository + ':' + tag; var containerName = this._generateName(repository); - - // Create placeholder container - var container = this._createPlaceholderContainer(imageName, containerName); - _containers[containerName] = container; - self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); - _muted[containerName] = true; - _progress[containerName] = 0; - self._pullImage(repository, tag, function () { - self._createContainer(containerName, {Image: imageName}, function () { - delete _progress[containerName]; - _muted[containerName] = false; - self.emit(self.CLIENT_CONTAINER_EVENT, containerName); + // Pull image + self._createPlaceholderContainer(imageName, containerName, function (err, container) { + if (err) { + callback(err); + return; + } + _containers[containerName] = container; + self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); + _muted[containerName] = true; + _progress[containerName] = 0; + self._pullImage(repository, tag, function () { + self._createContainer(containerName, {Image: imageName}, function () { + delete _progress[containerName]; + _muted[containerName] = false; + self.emit(self.CLIENT_CONTAINER_EVENT, containerName); + }); + }, function (progress) { + _progress[containerName] = progress; + self.emit(self.SERVER_PROGRESS_EVENT, containerName); }); - }, function (progress) { - _progress[containerName] = progress; - self.emit(self.SERVER_PROGRESS_EVENT, containerName); + callback(null, containerName); }); - callback(null, containerName); }, updateContainer: function (name, data, callback) { _muted[name] = true; From 48bf7c057d11fb43b65abc23cd9a5de5a194870c Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 17:23:40 -0800 Subject: [PATCH 04/13] Update README.md --- __tests__/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__tests__/README.md b/__tests__/README.md index 68a39ba8b2..e75e2b8b0d 100644 --- a/__tests__/README.md +++ b/__tests__/README.md @@ -10,12 +10,12 @@ Simply run `npm test` ## Manual Setup Tests -Use the reset script under `__tests__/util/reset` to reset your environment for each manual test. WARNING: This will erase your existing VirtualBox, Docker & Kitematic installation. - The expected result for all test cases is that the setup finishes and an HTML container can be created, and that there are no error logs in the output of Kitematic. ### Test Cases +Clean state: run `__tests__/util/reset`. WARNING: This will erase your existing VirtualBox, Docker & Kitematic installation. + - Clean state - Clean state with an old version of VirtualBox installed and running `4.3.16<` - Clean state with VirtualBox installed `4.3.18+` From 30cc4ba4e68419d7149e0264867977830d63c262 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 17:23:49 -0800 Subject: [PATCH 05/13] Update README.md --- __tests__/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/README.md b/__tests__/README.md index e75e2b8b0d..979cf334dd 100644 --- a/__tests__/README.md +++ b/__tests__/README.md @@ -14,7 +14,7 @@ The expected result for all test cases is that the setup finishes and an HTML co ### Test Cases -Clean state: run `__tests__/util/reset`. WARNING: This will erase your existing VirtualBox, Docker & Kitematic installation. +**Clean state**: run `__tests__/util/reset`. WARNING: This will erase your existing VirtualBox, Docker & Kitematic installation. - Clean state - Clean state with an old version of VirtualBox installed and running `4.3.16<` From 7295d2db352e7353f710374f44e025ba109cd5ac Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 17:24:33 -0800 Subject: [PATCH 06/13] Update README.md --- __tests__/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/__tests__/README.md b/__tests__/README.md index 979cf334dd..ce34dde9ee 100644 --- a/__tests__/README.md +++ b/__tests__/README.md @@ -10,7 +10,9 @@ Simply run `npm test` ## Manual Setup Tests -The expected result for all test cases is that the setup finishes and an HTML container can be created, and that there are no error logs in the output of Kitematic. +These tests only need to be run if code in `src/SetupStore.js` or `src/Setup.react.js` are changed. + +The expected result for all test cases is that the setup finishes and an HTML container can be created, Also check that there are no errors in the output of Kitematic. ### Test Cases From 6a369b440bf49f5681b2103e09ecf679e61479fc Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 17:33:18 -0800 Subject: [PATCH 07/13] Make binaries executable --- __tests__/util/VirtualBox_Uninstall.tool | 0 __tests__/util/reset | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 __tests__/util/VirtualBox_Uninstall.tool mode change 100644 => 100755 __tests__/util/reset diff --git a/__tests__/util/VirtualBox_Uninstall.tool b/__tests__/util/VirtualBox_Uninstall.tool old mode 100644 new mode 100755 diff --git a/__tests__/util/reset b/__tests__/util/reset old mode 100644 new mode 100755 From 33a93f6a300a7d64c69f0e1d75d7f0e653b104bf Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 18:01:49 -0800 Subject: [PATCH 08/13] Moved recommended repos from ContainerStore to NewContainer.react.js --- src/ContainerStore.js | 33 ------------------------- src/NewContainer.react.js | 51 +++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/ContainerStore.js b/src/ContainerStore.js index 1ec6b04b87..cf7534574f 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -10,7 +10,6 @@ var registry = require('./Registry'); var ContainerUtil = require('./ContainerUtil'); var convert = new Convert(); -var _recommended = []; var _containers = {}; var _progress = {}; var _logs = {}; @@ -19,7 +18,6 @@ var _muted = {}; var ContainerStore = assign(Object.create(EventEmitter.prototype), { CLIENT_CONTAINER_EVENT: 'client_container_event', - CLIENT_RECOMMENDED_EVENT: 'client_recommended_event', SERVER_CONTAINER_EVENT: 'server_container_event', SERVER_PROGRESS_EVENT: 'server_progress_event', SERVER_LOGS_EVENT: 'server_logs_event', @@ -266,9 +264,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { this._resumePulling(); this._startListeningToEvents(); }.bind(this)); - this.fetchRecommended(function () { - this.emit(this.CLIENT_RECOMMENDED_EVENT); - }.bind(this)); }, fetchContainer: function (id, callback) { docker.client().getContainer(id).inspect(function (err, container) { @@ -311,34 +306,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }); }, - fetchRecommended: function (callback) { - if (_recommended.length) { - return; - } - $.ajax({ - url: 'https://kitematic.com/recommended.json', - cache: false, - dataType: 'json', - success: function (res) { - var recommended = res.repos; - async.map(recommended, function (rec, callback) { - $.get('https://registry.hub.docker.com/v1/search?q=' + rec.repo, function (data) { - var results = data.results; - var result = _.find(results, function (r) { - return r.name === rec.repo; - }); - callback(null, _.extend(result, rec)); - }); - }, function (err, results) { - _recommended = results.filter(function(r) { return !!r; }); - callback(); - }); - }, - error: function (err) { - console.log(err); - } - }); - }, fetchLogs: function (name, callback) { var index = 0; var self = this; diff --git a/src/NewContainer.react.js b/src/NewContainer.react.js index 02b3a17a07..48a1b29c0f 100644 --- a/src/NewContainer.react.js +++ b/src/NewContainer.react.js @@ -5,6 +5,9 @@ var RetinaImage = require('react-retina-image'); var ContainerStore = require('./ContainerStore'); var Radial = require('./Radial.react'); var assign = require('object-assign'); +var Promise = require('bluebird'); + +var _recommended = []; var NewContainer = React.createClass({ _searchRequest: null, @@ -23,15 +26,7 @@ var NewContainer = React.createClass({ creating: [] }); this.refs.searchInput.getDOMNode().focus(); - ContainerStore.on(ContainerStore.CLIENT_RECOMMENDED_EVENT, this.update); - this.update(); - }, - update: function () { - if (!this.state.query.length) { - this.setState({ - results: ContainerStore.recommended() - }); - } + this.recommended(); }, search: function (query) { if (this._searchRequest) { @@ -59,6 +54,42 @@ var NewContainer = React.createClass({ } }); }, + recommended: function () { + if (this._searchRequest) { + this._searchRequest.abort(); + this._searchRequest = null; + } + + if (_recommended.length) { + return; + } + Promise.resolve($.ajax({ + url: 'https://kitematic.com/recommended.json', + cache: false, + dataType: 'json', + })).then(res => { + console.log(res); + return res.repos; + }).map(repo => { + console.log(repo); + return $.get('https://registry.hub.docker.com/v1/search?q=' + repo.repo).then(data => { + var results = data.results; + var result = _.find(results, function (r) { + return r.name === repo.repo; + }); + return _.extend(result, repo); + }); + }).then(results => { + _recommended = results.filter(r => !!r); + if (!this.state.query.length) { + this.setState({ + results: _recommended + }); + } + }).catch(err => { + console.log(err); + }); + }, handleChange: function (e) { var query = e.target.value; @@ -70,7 +101,7 @@ var NewContainer = React.createClass({ if (!query.length) { this.setState({ query: query, - results: ContainerStore.recommended() + results: _recommended }); } else { var self = this; From 5110b5c14452a0761e745ec5f8b2f58a8d5fe2f6 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 22:14:11 -0800 Subject: [PATCH 09/13] Moved log data to LogStore --- src/ContainerDetailsbak.react.js | 640 ------------------------------- src/ContainerHome.react.js | 4 +- src/ContainerHomeLogs.react.js | 8 +- src/ContainerLogs.react.js | 8 +- src/ContainerStore.js | 63 --- src/LogStore.js | 68 ++++ src/Main.js | 33 +- src/NewContainer.react.js | 20 +- src/Util.js | 1 - 9 files changed, 98 insertions(+), 747 deletions(-) delete mode 100644 src/ContainerDetailsbak.react.js create mode 100644 src/LogStore.js diff --git a/src/ContainerDetailsbak.react.js b/src/ContainerDetailsbak.react.js deleted file mode 100644 index 049f41b690..0000000000 --- a/src/ContainerDetailsbak.react.js +++ /dev/null @@ -1,640 +0,0 @@ -var _ = require('underscore'); -var $ = require('jquery'); -var React = require('react/addons'); -var Router = require('react-router'); -var exec = require('exec'); -var path = require('path'); -var remote = require('remote'); -var rimraf = require('rimraf'); -var fs = require('fs'); -var dialog = remote.require('dialog'); -var ContainerStore = require('./ContainerStore'); -var ContainerUtil = require('./ContainerUtil'); -var boot2docker = require('./Boot2Docker'); -var ContainerDetailsHeader = require('./ContainerDetailsHeader.react'); -var ContainerHome = require('./ContainerHome.react'); -var RetinaImage = require('react-retina-image'); -var Radial = require('./Radial.react'); - -var _oldHeight = 0; - -var ContainerDetailsbak = React.createClass({ - mixins: [Router.State, Router.Navigation], - PAGE_HOME: 'home', - PAGE_LOGS: 'logs', - PAGE_SETTINGS: 'settings', - PAGE_PORTS: 'ports', - PAGE_VOLUMES: 'volumes', - getInitialState: function () { - return { - logs: [], - page: this.PAGE_HOME, - env: {}, - pendingEnv: {}, - ports: {}, - volumes: {}, - defaultPort: null - }; - }, - componentWillReceiveProps: function () { - this.init(); - }, - componentDidMount: function () { - this.init(); - ContainerStore.on(ContainerStore.SERVER_PROGRESS_EVENT, this.updateProgress); - ContainerStore.on(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); - }, - componentWillUnmount: function () { - ContainerStore.removeListener(ContainerStore.SERVER_PROGRESS_EVENT, this.updateProgress); - ContainerStore.removeListener(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); - }, - componentDidUpdate: function () { - // Scroll logs to bottom - var parent = $('.details-logs'); - if (parent.length) { - if (parent.scrollTop() >= _oldHeight) { - parent.stop(); - parent.scrollTop(parent[0].scrollHeight - parent.height()); - } - _oldHeight = parent[0].scrollHeight - parent.height(); - } - }, - init: function () { - var container = ContainerStore.container(this.getParams().name); - if (!container) { - return; - } - this.setState({ - progress: ContainerStore.progress(this.getParams().name), - env: ContainerUtil.env(container), - page: this.PAGE_HOME - }); - var ports = ContainerUtil.ports(container); - var webPorts = ['80', '8000', '8080', '3000', '5000', '2368']; - this.setState({ - ports: ports, - defaultPort: _.find(_.keys(ports), function (port) { - return webPorts.indexOf(port) !== -1; - }) - }); - this.updateLogs(); - }, - updateLogs: function (name) { - if (name && name !== this.getParams().name) { - return; - } - this.setState({ - logs: ContainerStore.logs(this.getParams().name) - }); - }, - updateProgress: function (name) { - if (name === this.getParams().name) { - this.setState({ - progress: ContainerStore.progress(name) - }); - } - }, - disableRun: function () { - return (!this.props.container.State.Running || !this.state.defaultPort); - }, - disableRestart: function () { - return (this.props.container.State.Downloading || this.props.container.State.Restarting); - }, - disableTerminal: function () { - return (!this.props.container.State.Running); - }, - disableTab: function () { - return (this.props.container.State.Downloading); - }, - showHome: function () { - if (!this.disableTab()) { - /*this.setState({ - page: this.PAGE_HOME - });*/ - this.transitionTo('containerHome', {name: this.getParams().name}); - } - }, - showLogs: function () { - if (!this.disableTab()) { - this.setState({ - page: this.PAGE_LOGS - }); - } - }, - showPorts: function () { - this.setState({ - page: this.PAGE_PORTS - }); - }, - showVolumes: function () { - this.setState({ - page: this.PAGE_VOLUMES - }); - }, - showSettings: function () { - if (!this.disableTab()) { - this.setState({ - page: this.PAGE_SETTINGS - }); - } - }, - handleRun: function () { - if (this.state.defaultPort && !this.disableRun()) { - exec(['open', this.state.ports[this.state.defaultPort].url], function (err) { - if (err) { throw err; } - }); - } - }, - handleRestart: function () { - if (!this.disableRestart()) { - ContainerStore.restart(this.props.container.Name, function (err) { - console.log(err); - }); - } - }, - handleTerminal: function () { - if (!this.disableTerminal()) { - var container = this.props.container; - var terminal = path.join(process.cwd(), 'resources', 'terminal'); - var cmd = [terminal, boot2docker.command().replace(/ /g, '\\\\\\\\ ').replace(/\(/g, '\\\\\\\\(').replace(/\)/g, '\\\\\\\\)'), 'ssh', '-t', 'sudo', 'docker', 'exec', '-i', '-t', container.Name, 'sh']; - exec(cmd, function (stderr, stdout, code) { - console.log(stderr); - console.log(stdout); - if (code) { - console.log(stderr); - } - }); - } - }, - handleViewLink: function (url) { - exec(['open', url], function (err) { - if (err) { throw err; } - }); - }, - handleChangeDefaultPort: function (port, e) { - if (e.target.checked) { - this.setState({ - defaultPort: null - }); - } else { - this.setState({ - defaultPort: port - }); - } - }, - handleChooseVolumeClick: function (dockerVol) { - var self = this; - dialog.showOpenDialog({properties: ['openDirectory', 'createDirectory']}, function (filenames) { - if (!filenames) { - return; - } - var directory = filenames[0]; - if (directory) { - var volumes = _.clone(self.props.container.Volumes); - volumes[dockerVol] = directory; - var binds = _.pairs(volumes).map(function (pair) { - return pair[1] + ':' + pair[0]; - }); - ContainerStore.updateContainer(self.props.container.Name, { - Binds: binds - }, function (err) { - if (err) { console.log(err); } - }); - } - }); - }, - handleOpenVolumeClick: function (path) { - exec(['open', path], function (err) { - if (err) { throw err; } - }); - }, - handleSaveContainerName: function () { - var newName = $('#input-container-name').val(); - if (newName === this.props.container.Name) { - return; - } - if (fs.existsSync(path.join(process.env.HOME, 'Kitematic', this.props.container.Name))) { - fs.renameSync(path.join(process.env.HOME, 'Kitematic', this.props.container.Name), path.join(process.env.HOME, 'Kitematic', newName)); - } - ContainerStore.updateContainer(this.props.container.Name, { - name: newName - }, function (err) { - this.transitionTo('container', {name: newName}); - if (err) { - console.error(err); - } - }.bind(this)); - }, - handleSaveEnvVar: function () { - var $rows = $('.env-vars .keyval-row'); - var envVarList = []; - $rows.each(function () { - var key = $(this).find('.key').val(); - var val = $(this).find('.val').val(); - if (!key.length || !val.length) { - return; - } - envVarList.push(key + '=' + val); - }); - var self = this; - ContainerStore.updateContainer(self.props.container.Name, { - Env: envVarList - }, function (err) { - if (err) { - console.error(err); - } else { - self.setState({ - pendingEnv: {} - }); - $('#new-env-key').val(''); - $('#new-env-val').val(''); - } - }); - }, - handleAddPendingEnvVar: function () { - var newKey = $('#new-env-key').val(); - var newVal = $('#new-env-val').val(); - var newEnv = {}; - newEnv[newKey] = newVal; - this.setState({ - pendingEnv: _.extend(this.state.pendingEnv, newEnv) - }); - $('#new-env-key').val(''); - $('#new-env-val').val(''); - }, - handleRemoveEnvVar: function (key) { - var newEnv = _.omit(this.state.env, key); - this.setState({ - env: newEnv - }); - }, - handleRemovePendingEnvVar: function (key) { - var newEnv = _.omit(this.state.pendingEnv, key); - this.setState({ - pendingEnv: newEnv - }); - }, - handleDeleteContainer: function () { - dialog.showMessageBox({ - message: 'Are you sure you want to delete this container?', - buttons: ['Delete', 'Cancel'] - }, function (index) { - var volumePath = path.join(process.env.HOME, 'Kitematic', this.props.container.Name); - if (fs.existsSync(volumePath)) { - rimraf(volumePath, function (err) { - console.log(err); - }); - } - if (index === 0) { - ContainerStore.remove(this.props.container.Name, function (err) { - console.error(err); - }); - } - }.bind(this)); - }, - handleItemMouseEnterRun: function () { - var $action = $(this.getDOMNode()).find('.action .run'); - $action.css("visibility", "visible"); - }, - handleItemMouseLeaveRun: function () { - var $action = $(this.getDOMNode()).find('.action .run'); - $action.css("visibility", "hidden"); - }, - handleItemMouseEnterRestart: function () { - var $action = $(this.getDOMNode()).find('.action .restart'); - $action.css("visibility", "visible"); - }, - handleItemMouseLeaveRestart: function () { - var $action = $(this.getDOMNode()).find('.action .restart'); - $action.css("visibility", "hidden"); - }, - handleItemMouseEnterTerminal: function () { - var $action = $(this.getDOMNode()).find('.action .terminal'); - $action.css("visibility", "visible"); - }, - handleItemMouseLeaveTerminal: function () { - var $action = $(this.getDOMNode()).find('.action .terminal'); - $action.css("visibility", "hidden"); - }, - render: function () { - var self = this; - - if (!this.state) { - return
; - } - - var logs = this.state.logs.map(function (l, i) { - return

; - }); - - if (!this.props.container) { - return false; - } - - var button; - if (this.state.progress === 1) { - button = View; - } else { - button = View; - } - - var envVars = _.map(this.state.env, function (val, key) { - return ( -
- - - -
- ); - }); - var pendingEnvVars = _.map(this.state.pendingEnv, function (val, key) { - return ( -
- - - -
- ); - }); - - var disabledClass = ''; - if (!this.props.container.State.Running) { - disabledClass = 'disabled'; - } - - /*var buttonClass = React.addons.classSet({ - btn: true, - 'btn-action': true, - 'with-icon': true, - disabled: !this.props.container.State.Running - }); - - var restartButtonClass = React.addons.classSet({ - btn: true, - 'btn-action': true, - 'with-icon': true, - disabled: this.props.container.State.Downloading || this.props.container.State.Restarting - }); - - var viewButtonClass = React.addons.classSet({ - btn: true, - 'btn-action': true, - 'with-icon': true, - disabled: !this.props.container.State.Running || !this.state.defaultPort - }); - - var kitematicVolumes = _.pairs(this.props.container.Volumes).filter(function (pair) { - return pair[1].indexOf(path.join(process.env.HOME, 'Kitematic')) !== -1; - }); - - var volumesButtonClass = React.addons.classSet({ - btn: true, - 'btn-action': true, - 'with-icon': true, - disabled: !kitematicVolumes.length - }); - - var textButtonClasses = React.addons.classSet({ - 'btn': true, - 'btn-action': true, - 'only-icon': true, - 'active': this.state.page === this.PAGE_LOGS, - disabled: this.props.container.State.Downloading - }); - - var gearButtonClass = React.addons.classSet({ - 'btn': true, - 'btn-action': true, - 'only-icon': true, - 'active': this.state.page === this.PAGE_SETTINGS, - disabled: this.props.container.State.Downloading - });*/ - - var ports = _.map(_.pairs(self.state.ports), function (pair) { - var key = pair[0]; - var val = pair[1]; - return ( -
- {key} - {val.display} -
- ); - }); - - var volumes = _.map(self.props.container.Volumes, function (val, key) { - if (!val || val.indexOf(process.env.HOME) === -1) { - val = 'No Host Folder'; - } - return ( - - ); - }); - - var body; - if (this.props.container.State.Downloading) { - if (this.state.progress) { - body = ( -
-

Downloading Image

- -
- ); - } else { - body = ( -
-

Connecting to Docker Hub

- -
- ); - } - } else { - if (this.state.page === this.PAGE_HOME) { - body = ( - - ); - } else if (this.state.page === this.PAGE_LOGS) { - body = ( -
- {logs} -
- ); - } else if (this.state.page === this.PAGE_PORTS) { - body = ( -
-
-

Configure Ports

-
-
-
DOCKER PORT
-
MAC PORT
-
- {ports} -
-
-
- ); - } else if (this.state.page === this.PAGE_VOLUMES) { - body = ( -
-
-

Configure Volumes

-
-
-
DOCKER FOLDER
-
MAC FOLDER
-
- {volumes} -
-
-
- ); - } else { - var rename = ( -
-

Container Name

-
- -
- Save -
- ); - body = ( -
-
- {rename} -
-

Environment Variables

-
-
KEY
-
VALUE
-
-
- {envVars} - {pendingEnvVars} -
- - - -
-
- Save -
-
-

Delete Container

- Delete Container -
-
-
- ); - } - } - - var tabHomeClasses = React.addons.classSet({ - 'tab': true, - 'active': this.state.page === this.PAGE_HOME, - disabled: this.disableTab() - }); - - var tabLogsClasses = React.addons.classSet({ - 'tab': true, - 'active': this.state.page === this.PAGE_LOGS, - disabled: this.disableTab() - }); - - var tabSettingsClasses = React.addons.classSet({ - 'tab': true, - 'active': this.state.page === this.PAGE_SETTINGS, - disabled: this.disableTab() - }); - - /*var ports = _.map(_.pairs(self.state.ports), function (pair, index, list) { - var key = pair[0]; - var val = pair[1]; - return ( -
- {key} - {val.display} - -
- ); - }); - - var volumes = _.map(self.props.container.Volumes, function (val, key) { - if (!val || val.indexOf(process.env.HOME) === -1) { - val = No folderChoose; - } else { - val = {val.replace(process.env.HOME, '~')} Choose; - } - return ( -
- {key} - {val} -
- ); - });*/ - - /* var view; - if (this.state.defaultPort) { - view = ( -
- View - -
- ); - } else { - view = ( - - ); - }*/ - - var runActionClass = React.addons.classSet({ - action: true, - disabled: this.disableRun() - }); - - var restartActionClass = React.addons.classSet({ - action: true, - disabled: this.disableRestart() - }); - - var terminalActionClass = React.addons.classSet({ - action: true, - disabled: this.disableTerminal() - }); - - return ( -
- -
-
-
- - Run -
-
- - Restart -
-
- - Terminal -
-
-
- Home - Logs - Settings -
-
- {body} -
- ); - } -}); - -module.exports = ContainerDetailsbak; diff --git a/src/ContainerHome.react.js b/src/ContainerHome.react.js index 394a6d692f..2126549f1a 100644 --- a/src/ContainerHome.react.js +++ b/src/ContainerHome.react.js @@ -90,7 +90,7 @@ var ContainerHome = React.createClass({
- +
@@ -116,7 +116,7 @@ var ContainerHome = React.createClass({
- +
{right}
diff --git a/src/ContainerHomeLogs.react.js b/src/ContainerHomeLogs.react.js index 2e66352ad1..d1778a36cf 100644 --- a/src/ContainerHomeLogs.react.js +++ b/src/ContainerHomeLogs.react.js @@ -1,6 +1,6 @@ var $ = require('jquery'); var React = require('react/addons'); -var ContainerStore = require('./ContainerStore'); +var LogStore = require('./LogStore'); var Router = require('react-router'); var ContainerHomeLogs = React.createClass({ @@ -15,10 +15,10 @@ var ContainerHomeLogs = React.createClass({ }, componentDidMount: function() { this.init(); - ContainerStore.on(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); + LogStore.on(LogStore.SERVER_LOGS_EVENT, this.updateLogs); }, componentWillUnmount: function() { - ContainerStore.removeListener(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); + LogStore.removeListener(LogStore.SERVER_LOGS_EVENT, this.updateLogs); }, componentDidUpdate: function () { // Scroll logs to bottom @@ -39,7 +39,7 @@ var ContainerHomeLogs = React.createClass({ return; } this.setState({ - logs: ContainerStore.logs(this.getParams().name) + logs: LogStore.logs(this.getParams().name) }); }, handleClickLogs: function () { diff --git a/src/ContainerLogs.react.js b/src/ContainerLogs.react.js index e95ccd9781..a08487aac0 100644 --- a/src/ContainerLogs.react.js +++ b/src/ContainerLogs.react.js @@ -1,6 +1,6 @@ var $ = require('jquery'); var React = require('react/addons'); -var ContainerStore = require('./ContainerStore'); +var LogStore = require('./LogStore'); var Router = require('react-router'); var ContainerLogs = React.createClass({ @@ -15,10 +15,10 @@ var ContainerLogs = React.createClass({ }, componentDidMount: function() { this.init(); - ContainerStore.on(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); + LogStore.on(LogStore.SERVER_LOGS_EVENT, this.updateLogs); }, componentWillUnmount: function() { - ContainerStore.removeListener(ContainerStore.SERVER_LOGS_EVENT, this.updateLogs); + LogStore.removeListener(LogStore.SERVER_LOGS_EVENT, this.updateLogs); }, componentDidUpdate: function () { // Scroll logs to bottom @@ -39,7 +39,7 @@ var ContainerLogs = React.createClass({ return; } this.setState({ - logs: ContainerStore.logs(this.getParams().name) + logs: LogStore.logs(this.getParams().name) }); }, render: function () { diff --git a/src/ContainerStore.js b/src/ContainerStore.js index cf7534574f..6c84e0f9fb 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -1,26 +1,20 @@ -var $ = require('jquery'); var _ = require('underscore'); var EventEmitter = require('events').EventEmitter; var async = require('async'); var path = require('path'); var assign = require('object-assign'); -var Convert = require('ansi-to-html'); var docker = require('./Docker'); var registry = require('./Registry'); var ContainerUtil = require('./ContainerUtil'); -var convert = new Convert(); var _containers = {}; var _progress = {}; -var _logs = {}; -var _streams = {}; var _muted = {}; var ContainerStore = assign(Object.create(EventEmitter.prototype), { CLIENT_CONTAINER_EVENT: 'client_container_event', SERVER_CONTAINER_EVENT: 'server_container_event', SERVER_PROGRESS_EVENT: 'server_progress_event', - SERVER_LOGS_EVENT: 'server_logs_event', _pullScratchImage: function (callback) { var image = docker.client().getImage('scratch:latest'); image.inspect(function (err, data) { @@ -99,12 +93,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }); }, - _escapeHTML: function (html) { - var text = document.createTextNode(html); - var div = document.createElement('div'); - div.appendChild(text); - return div.innerHTML; - }, _createContainer: function (name, containerData, callback) { var existing = docker.client().getContainer(name); var self = this; @@ -282,9 +270,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { container.State.Downloading = !!env.KITEMATIC_DOWNLOADING; container.KitematicDownloadingImage = env.KITEMATIC_DOWNLOADING_IMAGE; - this.fetchLogs(container.Name, function () { - }.bind(this)); - _containers[container.Name] = container; callback(null, container); } @@ -306,48 +291,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }); }, - fetchLogs: function (name, callback) { - var index = 0; - var self = this; - docker.client().getContainer(name).logs({ - follow: true, - stdout: true, - stderr: true, - timestamps: true - }, function (err, stream) { - callback(err); - if (_streams[name]) { - return; - } - _streams[name] = stream; - if (err) { - return; - } - _logs[name] = []; - stream.setEncoding('utf8'); - var timeout; - stream.on('data', function (buf) { - // Every other message is a header - if (index % 2 === 1) { - //var time = buf.substr(0,buf.indexOf(' ')); - var msg = buf.substr(buf.indexOf(' ')+1); - if (timeout) { - clearTimeout(timeout); - timeout = null; - } - timeout = setTimeout(function () { - timeout = null; - self.emit(self.SERVER_LOGS_EVENT, name); - }, 100); - _logs[name].push(convert.toHtml(self._escapeHTML(msg))); - } - index += 1; - }); - stream.on('end', function () { - delete _streams[name]; - }); - }); - }, create: function (repository, tag, callback) { tag = tag || 'latest'; var self = this; @@ -444,15 +387,9 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { return a.Name.localeCompare(b.Name); }); }, - recommended: function () { - return _recommended; - }, progress: function (name) { return _progress[name]; }, - logs: function (name) { - return _logs[name] || []; - } }); module.exports = ContainerStore; diff --git a/src/LogStore.js b/src/LogStore.js new file mode 100644 index 0000000000..c70cbf4630 --- /dev/null +++ b/src/LogStore.js @@ -0,0 +1,68 @@ +var EventEmitter = require('events').EventEmitter; +var assign = require('object-assign'); +var Convert = require('ansi-to-html'); +var docker = require('./Docker'); + +var _convert = new Convert(); +var _logs = {}; +var _streams = {}; + +var LogStore = assign(Object.create(EventEmitter.prototype), { + SERVER_LOGS_EVENT: 'server_logs_event', + _escapeHTML: function (html) { + var text = document.createTextNode(html); + var div = document.createElement('div'); + div.appendChild(text); + return div.innerHTML; + }, + fetchLogs: function (name, callback) { + var index = 0; + var self = this; + docker.client().getContainer(name).logs({ + follow: true, + stdout: true, + stderr: true, + timestamps: true + }, function (err, stream) { + callback(err); + if (_streams[name]) { + return; + } + _streams[name] = stream; + if (err) { + return; + } + _logs[name] = []; + stream.setEncoding('utf8'); + var timeout; + stream.on('data', function (buf) { + // Every other message is a header + if (index % 2 === 1) { + //var time = buf.substr(0,buf.indexOf(' ')); + var msg = buf.substr(buf.indexOf(' ')+1); + if (timeout) { + clearTimeout(timeout); + timeout = null; + } + timeout = setTimeout(function () { + timeout = null; + self.emit(self.SERVER_LOGS_EVENT, name); + }, 100); + _logs[name].push(_convert.toHtml(self._escapeHTML(msg))); + } + index += 1; + }); + stream.on('end', function () { + delete _streams[name]; + }); + }); + }, + logs: function (name) { + if (!_streams[name]) { + this.fetchLogs(name, () => {}); + } + return _logs[name] || []; + } +}); + +module.exports = LogStore; diff --git a/src/Main.js b/src/Main.js index 69beea6499..d7a271a0e7 100644 --- a/src/Main.js +++ b/src/Main.js @@ -33,27 +33,14 @@ bugsnag.releaseStage = process.env.NODE_ENV === 'development' ? 'development' : bugsnag.notifyReleaseStages = ['production']; bugsnag.appVersion = app.getVersion(); -router.run(Handler => React.render(, document.body)); -if (!window.location.hash.length || window.location.hash === '#/') { - SetupStore.run().then(boot2docker.ip).then(ip => { - console.log(ip); - docker.setHost(ip); - ContainerStore.init(function (err) { - if (err) { console.log(err); } - router.transitionTo('containers'); - }); - }).catch(err => { - bugsnag.notify(err); +SetupStore.run().then(boot2docker.ip).then(ip => { + console.log(ip); + docker.setHost(ip); + ContainerStore.init(function (err) { + if (err) { console.log(err); } + router.run(Handler => React.render(, document.body)); + router.transitionTo('containers'); }); -} else { - console.log('Skipping installer.'); - router.transitionTo('containers'); - boot2docker.ip().then(ip => { - docker.setHost(ip); - ContainerStore.init(function (err) { - if (err) { console.log(err); } - }); - }).catch(err => { - bugsnag.notify(err); - }); -} +}).catch(err => { + bugsnag.notify(err); +}); diff --git a/src/NewContainer.react.js b/src/NewContainer.react.js index 48a1b29c0f..44b3b8eaf0 100644 --- a/src/NewContainer.react.js +++ b/src/NewContainer.react.js @@ -14,7 +14,7 @@ var NewContainer = React.createClass({ getInitialState: function () { return { query: '', - results: [], + results: _recommended, loading: false, tags: {}, active: null, @@ -26,7 +26,9 @@ var NewContainer = React.createClass({ creating: [] }); this.refs.searchInput.getDOMNode().focus(); - this.recommended(); + if (!_recommended.length) { + this.recommended(); + } }, search: function (query) { if (this._searchRequest) { @@ -67,11 +69,7 @@ var NewContainer = React.createClass({ url: 'https://kitematic.com/recommended.json', cache: false, dataType: 'json', - })).then(res => { - console.log(res); - return res.repos; - }).map(repo => { - console.log(repo); + })).then(res => res.repos).map(repo => { return $.get('https://registry.hub.docker.com/v1/search?q=' + repo.repo).then(data => { var results = data.results; var result = _.find(results, function (r) { @@ -82,9 +80,11 @@ var NewContainer = React.createClass({ }).then(results => { _recommended = results.filter(r => !!r); if (!this.state.query.length) { - this.setState({ - results: _recommended - }); + if (this.isMounted()) { + this.setState({ + results: _recommended + }); + } } }).catch(err => { console.log(err); diff --git a/src/Util.js b/src/Util.js index 8bc3b88458..0b036ae320 100644 --- a/src/Util.js +++ b/src/Util.js @@ -7,7 +7,6 @@ module.exports = { exec: function (args, options) { options = options || {}; return new Promise((resolve, reject) => { - console.log(options); exec(args, options, (stderr, stdout, code) => { if (code) { reject(stderr); From 403d805b12a8a284999004b9646f21fa0df04dfc Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 15 Feb 2015 22:27:46 -0800 Subject: [PATCH 10/13] Fix array reduce bug --- src/ContainerListItem.react.js | 16 +---- src/ContainerStore.js | 108 ++++++++++----------------------- src/ContainerUtil.js | 3 + 3 files changed, 36 insertions(+), 91 deletions(-) diff --git a/src/ContainerListItem.react.js b/src/ContainerListItem.react.js index bf69e31ccd..bd371ca423 100644 --- a/src/ContainerListItem.react.js +++ b/src/ContainerListItem.react.js @@ -30,19 +30,7 @@ var ContainerListItem = React.createClass({ render: function () { var self = this; var container = this.props.container; - var downloadingImage = null, downloading = false; - var env = container.Config.Env; - if (env.length) { - var obj = _.object(env.map(function (e) { - return e.split('='); - })); - if (obj.KITEMATIC_DOWNLOADING) { - downloading = true; - } - downloadingImage = obj.KITEMATIC_DOWNLOADING_IMAGE || null; - } - - var imageName = downloadingImage || container.Config.Image; + var imageName = container.Config.Image; // Synchronize all animations var style = { @@ -50,7 +38,7 @@ var ContainerListItem = React.createClass({ }; var state; - if (downloading) { + if (container.State.Downloading) { state =
; } else if (container.State.Running && !container.State.Paused) { state =
; diff --git a/src/ContainerStore.js b/src/ContainerStore.js index 6c84e0f9fb..b7bdc00a4d 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -7,6 +7,7 @@ var docker = require('./Docker'); var registry = require('./Registry'); var ContainerUtil = require('./ContainerUtil'); +var _placeholders = {}; var _containers = {}; var _progress = {}; var _muted = {}; @@ -15,26 +16,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { CLIENT_CONTAINER_EVENT: 'client_container_event', SERVER_CONTAINER_EVENT: 'server_container_event', SERVER_PROGRESS_EVENT: 'server_progress_event', - _pullScratchImage: function (callback) { - var image = docker.client().getImage('scratch:latest'); - image.inspect(function (err, data) { - if (!data) { - docker.client().pull('scratch:latest', function (err, stream) { - if (err) { - callback(err); - return; - } - stream.setEncoding('utf8'); - stream.on('data', function () {}); - stream.on('end', function () { - callback(); - }); - }); - } else { - callback(); - } - }); - }, _pullImage: function (repository, tag, callback, progressCallback) { registry.layers(repository, tag, function (err, layerSizes) { @@ -64,7 +45,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { stream.on('data', function (str) { var data = JSON.parse(str); - console.log(data); if (data.status === 'Already exists') { layerProgress[data.id] = 1; @@ -81,7 +61,7 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { var totalReceived = chunks.reduce(function (pv, sv) { return pv + sv; - }); + }, 0); var totalProgress = totalReceived / totalBytes; progressCallback(totalProgress); @@ -104,14 +84,8 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { if (containerData.Config && containerData.Config.Image) { containerData.Image = containerData.Config.Image; } - existing.kill(function (err) { - if (err) { - console.log(err); - } - existing.remove(function (err) { - if (err) { - console.log(err); - } + existing.kill(function () { + existing.remove(function () { docker.client().getImage(containerData.Image).inspect(function (err, data) { if (err) { callback(err); @@ -147,31 +121,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }); }, - _createPlaceholderContainer: function (imageName, name, callback) { - var self = this; - this._pullScratchImage(function (err) { - if (err) { - callback(err); - return; - } - docker.client().createContainer({ - Image: 'scratch:latest', - Tty: false, - Env: [ - 'KITEMATIC_DOWNLOADING=true', - 'KITEMATIC_DOWNLOADING_IMAGE=' + imageName - ], - Cmd: 'placeholder', - name: name - }, function (err) { - if (err) { - callback(err); - return; - } - self.fetchContainer(name, callback); - }); - }); - }, _generateName: function (repository) { var base = _.last(repository.split('/')); var count = 1; @@ -296,28 +245,33 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { var self = this; var imageName = repository + ':' + tag; var containerName = this._generateName(repository); - // Pull image - self._createPlaceholderContainer(imageName, containerName, function (err, container) { - if (err) { - callback(err); - return; + + _placeholders[containerName] = { + Name: containerName, + Image: imageName, + Config: { + Image: imageName, + }, + State: { + Downloading: true } - _containers[containerName] = container; - self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); - _muted[containerName] = true; - _progress[containerName] = 0; - self._pullImage(repository, tag, function () { - self._createContainer(containerName, {Image: imageName}, function () { - delete _progress[containerName]; - _muted[containerName] = false; - self.emit(self.CLIENT_CONTAINER_EVENT, containerName); - }); - }, function (progress) { - _progress[containerName] = progress; - self.emit(self.SERVER_PROGRESS_EVENT, containerName); + }; + + self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); + _muted[containerName] = true; + _progress[containerName] = 0; + self._pullImage(repository, tag, function () { + delete _placeholders[containerName]; + self._createContainer(containerName, {Image: imageName}, function () { + delete _progress[containerName]; + _muted[containerName] = false; + self.emit(self.CLIENT_CONTAINER_EVENT, containerName); }); - callback(null, containerName); + }, function (progress) { + _progress[containerName] = progress; + self.emit(self.SERVER_PROGRESS_EVENT, containerName); }); + callback(null, containerName); }, updateContainer: function (name, data, callback) { _muted[name] = true; @@ -377,13 +331,13 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { } }, containers: function() { - return _containers; + return _.extend(_placeholders, _containers); }, container: function (name) { - return _containers[name]; + return this.containers()[name]; }, sorted: function () { - return _.values(_containers).sort(function (a, b) { + return _.values(this.containers()).sort(function (a, b) { return a.Name.localeCompare(b.Name); }); }, diff --git a/src/ContainerUtil.js b/src/ContainerUtil.js index 044ba1652a..9fef385b68 100644 --- a/src/ContainerUtil.js +++ b/src/ContainerUtil.js @@ -13,6 +13,9 @@ var ContainerUtil = { })); }, ports: function (container) { + if (!container.NetworkSettings) { + return {}; + } var res = {}; var ip = docker.host; _.each(container.NetworkSettings.Ports, function (value, key) { From 0dc78b7babb6aa26a8772eccbd9a14200e487f1d Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 16 Feb 2015 00:49:04 -0800 Subject: [PATCH 11/13] adding optimizely --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 5d205af613..40cf1f07f0 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ + Kitematic From 462c0e475a131c3de15f3d2873b164c020164c34 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 16 Feb 2015 00:49:58 -0800 Subject: [PATCH 12/13] removing optimizely --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 40cf1f07f0..c06e352ed7 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + Kitematic From 3415ad7bb9fca06a6bc5159fd736078443ba999c Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 16 Feb 2015 11:57:13 -0800 Subject: [PATCH 13/13] Using localstorage --- package.json | 4 ++-- src/ContainerDetails.react.js | 2 +- src/ContainerListItem.react.js | 2 +- src/ContainerStore.js | 38 +++++++++++++++++++++++----------- src/LogStore.js | 8 ++++--- src/Main.js | 3 ++- src/Routes.js | 2 +- src/SetupStore.js | 3 +++ 8 files changed, 41 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 07ed9db51e..fc3adc32c1 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "node_modules/6to5" ] }, - "docker-version": "1.4.1", - "boot2docker-version": "1.4.1", + "docker-version": "1.5.0", + "boot2docker-version": "1.5.0", "atom-shell-version": "0.21.1", "virtualbox-version": "4.3.20", "virtualbox-filename": "VirtualBox-4.3.20.pkg", diff --git a/src/ContainerDetails.react.js b/src/ContainerDetails.react.js index 745d77ab86..1063adf9c3 100644 --- a/src/ContainerDetails.react.js +++ b/src/ContainerDetails.react.js @@ -19,7 +19,7 @@ var ContainerDetail = React.createClass({ }, init: function () { var currentRoute = _.last(this.getRoutes()).name; - if (currentRoute === 'containerDetail') { + if (currentRoute === 'containerDetails') { this.transitionTo('containerHome', {name: this.getParams().name}); } }, diff --git a/src/ContainerListItem.react.js b/src/ContainerListItem.react.js index bd371ca423..30b7becf04 100644 --- a/src/ContainerListItem.react.js +++ b/src/ContainerListItem.react.js @@ -54,7 +54,7 @@ var ContainerListItem = React.createClass({ } return ( - +
  • {state}
    diff --git a/src/ContainerStore.js b/src/ContainerStore.js index b7bdc00a4d..5d4889e130 100644 --- a/src/ContainerStore.js +++ b/src/ContainerStore.js @@ -5,7 +5,6 @@ var path = require('path'); var assign = require('object-assign'); var docker = require('./Docker'); var registry = require('./Registry'); -var ContainerUtil = require('./ContainerUtil'); var _placeholders = {}; var _containers = {}; @@ -45,6 +44,7 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { stream.on('data', function (str) { var data = JSON.parse(str); + console.log(data); if (data.status === 'Already exists') { layerProgress[data.id] = 1; @@ -136,18 +136,22 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { } }, _resumePulling: function () { - var downloading = _.filter(_.values(_containers), function (container) { + var downloading = _.filter(_.values(this.containers()), function (container) { return container.State.Downloading; }); // Recover any pulls that were happening var self = this; downloading.forEach(function (container) { - docker.client().pull(container.KitematicDownloadingImage, function (err, stream) { + docker.client().pull(container.Config.Image, function (err, stream) { + delete _placeholders[container.Name]; + localStorage.setItem('store.placeholders', JSON.stringify(_placeholders)); stream.setEncoding('utf8'); stream.on('data', function () {}); stream.on('end', function () { - self._createContainer(container.Name, {Image: container.KitematicDownloadingImage}, function () {}); + self._createContainer(container.Name, {Image: container.Config.Image}, function () { + self.emit(self.CLIENT_CONTAINER_EVENT, container.Name); + }); }); }); }); @@ -197,6 +201,14 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { } else { callback(); } + var placeholderData = JSON.parse(localStorage.getItem('store.placeholders')); + console.log(placeholderData); + console.log(_.keys(_containers)); + if (placeholderData) { + _placeholders = _.omit(placeholderData, _.keys(_containers)); + localStorage.setItem('store.placeholders', JSON.stringify(_placeholders)); + } + console.log(_placeholders); this.emit(this.CLIENT_CONTAINER_EVENT); this._resumePulling(); this._startListeningToEvents(); @@ -213,12 +225,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { } // Fix leading slash in container names container.Name = container.Name.replace('/', ''); - - // Add Downloading State (stored in environment variables) to containers for Kitematic - var env = ContainerUtil.env(container); - container.State.Downloading = !!env.KITEMATIC_DOWNLOADING; - container.KitematicDownloadingImage = env.KITEMATIC_DOWNLOADING_IMAGE; - _containers[container.Name] = container; callback(null, container); } @@ -256,12 +262,16 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { Downloading: true } }; - + console.log(_placeholders); + console.log(JSON.stringify(_placeholders)); + localStorage.setItem('store.placeholders', JSON.stringify(_placeholders)); self.emit(self.CLIENT_CONTAINER_EVENT, containerName, 'create'); + _muted[containerName] = true; _progress[containerName] = 0; self._pullImage(repository, tag, function () { delete _placeholders[containerName]; + localStorage.setItem('store.placeholders', JSON.stringify(_placeholders)); self._createContainer(containerName, {Image: imageName}, function () { delete _progress[containerName]; _muted[containerName] = false; @@ -292,6 +302,10 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }); }, remove: function (name, callback) { + if (_placeholders[name]) { + delete _placeholders[name]; + return; + } var container = docker.client().getContainer(name); if (_containers[name].State.Paused) { container.unpause(function (err) { @@ -331,7 +345,7 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { } }, containers: function() { - return _.extend(_placeholders, _containers); + return _.extend(_containers, _placeholders); }, container: function (name) { return this.containers()[name]; diff --git a/src/LogStore.js b/src/LogStore.js index c70cbf4630..27d9f2bbe2 100644 --- a/src/LogStore.js +++ b/src/LogStore.js @@ -15,7 +15,10 @@ var LogStore = assign(Object.create(EventEmitter.prototype), { div.appendChild(text); return div.innerHTML; }, - fetchLogs: function (name, callback) { + fetchLogs: function (name) { + if (!name || !docker.client()) { + return; + } var index = 0; var self = this; docker.client().getContainer(name).logs({ @@ -24,7 +27,6 @@ var LogStore = assign(Object.create(EventEmitter.prototype), { stderr: true, timestamps: true }, function (err, stream) { - callback(err); if (_streams[name]) { return; } @@ -59,7 +61,7 @@ var LogStore = assign(Object.create(EventEmitter.prototype), { }, logs: function (name) { if (!_streams[name]) { - this.fetchLogs(name, () => {}); + this.fetchLogs(name); } return _logs[name] || []; } diff --git a/src/Main.js b/src/Main.js index d7a271a0e7..1e490973b7 100644 --- a/src/Main.js +++ b/src/Main.js @@ -33,14 +33,15 @@ bugsnag.releaseStage = process.env.NODE_ENV === 'development' ? 'development' : bugsnag.notifyReleaseStages = ['production']; bugsnag.appVersion = app.getVersion(); +router.run(Handler => React.render(, document.body)); SetupStore.run().then(boot2docker.ip).then(ip => { console.log(ip); docker.setHost(ip); ContainerStore.init(function (err) { if (err) { console.log(err); } - router.run(Handler => React.render(, document.body)); router.transitionTo('containers'); }); }).catch(err => { + console.log(err); bugsnag.notify(err); }); diff --git a/src/Routes.js b/src/Routes.js index 16d82a5ca2..1571a49f6b 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -27,7 +27,7 @@ var App = React.createClass({ var routes = ( - + diff --git a/src/SetupStore.js b/src/SetupStore.js index e94b39243c..b9d1314f6a 100644 --- a/src/SetupStore.js +++ b/src/SetupStore.js @@ -165,7 +165,9 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { run: Promise.coroutine(function* () { yield this.updateBinaries(); var steps = yield this.requiredSteps(); + console.log(steps); for (let step of steps) { + console.log(step.name); _currentStep = step; step.percent = 0; while (true) { @@ -181,6 +183,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { break; } catch (err) { if (err) { + console.log(err); _error = err; this.emit(this.ERROR_EVENT); } else {