From f0ec4e380f28ed9c3683bac8b8cff9e662e5bc7a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 5 Nov 2015 09:56:01 -0800 Subject: [PATCH 1/7] :arrow_up: legal-eagle@0.12 --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index 308849a93..2ce92de17 100644 --- a/build/package.json +++ b/build/package.json @@ -27,7 +27,7 @@ "grunt-peg": "~1.1.0", "grunt-shell": "~0.3.1", "grunt-standard": "^1.0.2", - "legal-eagle": "~0.11.0", + "legal-eagle": "~0.12.0", "minidump": "~0.9", "npm": "2.13.3", "rcedit": "~0.3.0", From 4dba6f10fed7696099b2fc5a100163ecd2e72cfe Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Fri, 6 Nov 2015 14:29:04 -0500 Subject: [PATCH 2/7] :arrow_up: git-utils --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e01f5b3a..79c1ba691 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "fs-plus": "^2.8.0", "fstream": "0.1.24", "fuzzaldrin": "^2.1", - "git-utils": "^4", + "git-utils": "^4.0.7", "grim": "1.5.0", "jasmine-json": "~0.0", "jasmine-tagged": "^1.1.4", From 3a42a3409203ee471e4591c62198621358816bf5 Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Fri, 6 Nov 2015 14:29:52 -0500 Subject: [PATCH 3/7] :arrow_down: pathwatcher 6.3.0 is broken on Windows (https://github.com/atom/node-pathwatcher/issues/96). --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 79c1ba691..b10b803cb 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "normalize-package-data": "^2.0.0", "nslog": "^3", "oniguruma": "^5", - "pathwatcher": "^6.2", + "pathwatcher": "~6.2", "property-accessors": "^1.1.3", "random-words": "0.0.1", "resolve": "^1.1.6", From 86eef8cbbfd7d0829c6d47c08d8bac48be264ca3 Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 9 Nov 2015 16:32:40 -0500 Subject: [PATCH 4/7] 1.2.0-beta2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b10b803cb..575cf2d00 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.2.0-beta1", + "version": "1.2.0-beta2", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 780979e122c3b686c08b0b5cdad658cbfbbaa89a Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 11 Nov 2015 18:18:55 +0100 Subject: [PATCH 5/7] Make sure showing errors works correctly --- spec/command-installer-spec.coffee | 26 ++++++++++++++++++++++++-- src/command-installer.coffee | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/spec/command-installer-spec.coffee b/spec/command-installer-spec.coffee index 584dc193e..221da3a8b 100644 --- a/spec/command-installer-spec.coffee +++ b/spec/command-installer-spec.coffee @@ -20,10 +20,32 @@ describe "CommandInstaller on #darwin", -> spyOn(CommandInstaller::, 'getResourcesDirectory').andReturn(resourcesPath) spyOn(CommandInstaller::, 'getInstallDirectory').andReturn(installationPath) + it "shows an error dialog when installing commands interactively fails", -> + appDelegate = jasmine.createSpyObj("appDelegate", ["confirm"]) + installer = new CommandInstaller("2.0.2", appDelegate) + spyOn(installer, "installAtomCommand").andCallFake (__, callback) -> callback(new Error("an error")) + + installer.installShellCommandsInteractively() + + expect(appDelegate.confirm).toHaveBeenCalledWith({ + message: "Failed to install shell commands" + detailedMessage: "an error" + }) + + appDelegate.confirm.reset() + installer.installAtomCommand.andCallFake (__, callback) -> callback() + spyOn(installer, "installApmCommand").andCallFake (__, callback) -> callback(new Error("another error")) + + installer.installShellCommandsInteractively() + + expect(appDelegate.confirm).toHaveBeenCalledWith({ + message: "Failed to install shell commands" + detailedMessage: "another error" + }) + describe "when using a stable version of atom", -> beforeEach -> - confirm = -> - installer = new CommandInstaller("2.0.2", confirm) + installer = new CommandInstaller("2.0.2") it "symlinks the atom command as 'atom'", -> installedAtomPath = path.join(installationPath, 'atom') diff --git a/src/command-installer.coffee b/src/command-installer.coffee index 5a6a7f94e..e37e6a0e6 100644 --- a/src/command-installer.coffee +++ b/src/command-installer.coffee @@ -35,7 +35,7 @@ class CommandInstaller process.resourcesPath installShellCommandsInteractively: -> - showErrorDialog = (error) -> + showErrorDialog = (error) => @applicationDelegate.confirm message: "Failed to install shell commands" detailedMessage: error.message From cc30daa617bbbbb745ccf689b37c73209664200e Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 11 Nov 2015 18:19:32 +0100 Subject: [PATCH 6/7] Make sure showing success dialogs works correctly --- spec/command-installer-spec.coffee | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spec/command-installer-spec.coffee b/spec/command-installer-spec.coffee index 221da3a8b..84fd77a34 100644 --- a/spec/command-installer-spec.coffee +++ b/spec/command-installer-spec.coffee @@ -43,6 +43,19 @@ describe "CommandInstaller on #darwin", -> detailedMessage: "another error" }) + it "shows a success dialog when installing commands interactively succeeds", -> + appDelegate = jasmine.createSpyObj("appDelegate", ["confirm"]) + installer = new CommandInstaller("2.0.2", appDelegate) + spyOn(installer, "installAtomCommand").andCallFake (__, callback) -> callback() + spyOn(installer, "installApmCommand").andCallFake (__, callback) -> callback() + + installer.installShellCommandsInteractively() + + expect(appDelegate.confirm).toHaveBeenCalledWith({ + message: "Commands installed." + detailedMessage: "The shell commands `atom` and `apm` are installed." + }) + describe "when using a stable version of atom", -> beforeEach -> installer = new CommandInstaller("2.0.2") From 37b3c45cc2ed1546607391ed784cdbb7906fe2d1 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 11 Nov 2015 12:05:34 -0700 Subject: [PATCH 7/7] 1.2.0-beta3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 575cf2d00..f446ac6f6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.2.0-beta2", + "version": "1.2.0-beta3", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": {