From 82fbba454782367953fba9ff4bd8b60c59a66f01 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 17 Dec 2013 17:56:04 -0800 Subject: [PATCH 1/5] Upgrade apm for keytar usage --- vendor/apm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/apm b/vendor/apm index 06105abe7..9343bd248 160000 --- a/vendor/apm +++ b/vendor/apm @@ -1 +1 @@ -Subproject commit 06105abe71d5ea45a806e037233d2b5fa18568be +Subproject commit 9343bd248c08ed25a1018236a162b4aeeac5cf1d From cef7577826021045ccd62b67e74948cada4f68b0 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 17 Dec 2013 19:25:44 -0800 Subject: [PATCH 2/5] Install apm into node_modules settings-views launches apm via a NodeBufferedProcess so it still needs to be available built against Atom's headers. The version in apm/ is just for running via the CLI directly and is compiled against node's headers. --- script/bootstrap | 2 ++ src/package-manager.coffee | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 1f407a8d1..b666fd8d8 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -37,6 +37,8 @@ var commands = [ 'git submodule --quiet update --recursive --init', {command: 'npm install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}}, {command: 'npm install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}}, + {command: 'npm install --quiet ' + apmVendorPath, options: {ignoreStdout: true}}, + {command: 'node ../../apm/node_modules/atom-package-manager/bin/apm rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}}, echoNewLine, 'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags, 'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags, diff --git a/src/package-manager.coffee b/src/package-manager.coffee index 67aed661e..a85e51e43 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -39,7 +39,7 @@ class PackageManager # Public: Get the path to the apm command getApmPath: -> - @apmPath ?= require.resolve('../apm/node_modules/atom-package-manager/bin/apm') + @apmPath ?= require.resolve('atom-package-manager/bin/apm') # Public: Get the paths being used to look for packages. # From e853bbfcb63e50eed3fb6a5d41fa5f4cc20499ce Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 17 Dec 2013 19:51:34 -0800 Subject: [PATCH 3/5] Use standalone apm for running test --- tasks/spec-task.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/spec-task.coffee b/tasks/spec-task.coffee index f19b61478..5385bb592 100644 --- a/tasks/spec-task.coffee +++ b/tasks/spec-task.coffee @@ -15,7 +15,7 @@ module.exports = (grunt) -> rootDir = grunt.config.get('atom.shellAppDir') appDir = grunt.config.get('atom.appDir') atomPath = path.join(appDir, 'atom.sh') - apmPath = path.join(appDir, 'node_modules/.bin/apm') + apmPath = path.join(appDir, 'apm/node_modules/.bin/apm') packageSpecQueue = async.queue (packagePath, callback) -> options = @@ -26,7 +26,7 @@ module.exports = (grunt) -> env: _.extend({}, process.env, ATOM_PATH: rootDir) grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs." spawn options, (error, results, code) -> - + failedPackages.push path.basename(packagePath) if error callback() From 0dc031140cbe1751c5e3a1ad2d40e3f4a45596e5 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 17 Dec 2013 21:35:44 -0700 Subject: [PATCH 4/5] Omit destroyed pane items This is an interim solution which enables atom/image-view#4 to correctly deserialize when the path has been deleted both on atom master and in atom/atom#1326. --- src/pane.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pane.coffee b/src/pane.coffee index 72c69f8c4..55af9daad 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -37,6 +37,7 @@ class Pane extends View @items = _.compact @state.get('items').map (item) -> item = atom.deserializers.deserialize(item) item?.created?() + return if item?.state?.isDestroyed?() item else @items = args From b7c227dbfc0d0a3430c96432a3ab194a63e1daad Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Dec 2013 08:14:29 -0800 Subject: [PATCH 5/5] Upgrade to autocomplete@0.19.0 for tab completion --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d87336be6..39f049e68 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "solarized-dark-syntax": "0.6.0", "solarized-light-syntax": "0.2.0", "archive-view": "0.16.0", - "autocomplete": "0.18.0", + "autocomplete": "0.19.0", "autoflow": "0.11.0", "autosave": "0.10.0", "bookmarks": "0.15.0",