From 8a8df8d6cb201f750cf7d19c79b06e49d2cbb1a8 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 11 Dec 2013 12:28:20 -0800 Subject: [PATCH 1/4] Add Atom::isReleasedVersion, which determines if the version is a SHA --- spec/atom-spec.coffee | 8 ++++++++ src/atom.coffee | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee index b42fb7911..1615ce689 100644 --- a/spec/atom-spec.coffee +++ b/spec/atom-spec.coffee @@ -438,3 +438,11 @@ describe "the `atom` global", -> expect(atom.config.get('core.themes')).not.toContain packageName expect(atom.config.get('core.themes')).not.toContain packageName expect(atom.config.get('core.disabledPackages')).not.toContain packageName + + describe ".isReleasedVersion()", -> + it "returns false if the version is a SHA and true otherwise", -> + version = '0.1.0' + spyOn(atom, 'getVersion').andCallFake -> version + expect(atom.isReleasedVersion()).toBe true + version = '36b5518' + expect(atom.isReleasedVersion()).toBe false diff --git a/src/atom.coffee b/src/atom.coffee index 16b073194..4deb87126 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -361,6 +361,10 @@ class Atom getVersion: -> app.getVersion() + # Public: Determine whether the current version is an official release. + isReleasedVersion: -> + not /\w{7}/.test(@getVersion()) # Check if the release is a 7-character SHA prefix + getGitHubAuthTokenName: -> 'Atom GitHub API Token' From 4f18baaed541e95f187b5fe38e02a3a9b704324f Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 11 Dec 2013 14:46:40 -0800 Subject: [PATCH 2/4] Upgrade telepath to 0.67.0 for devMode flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37abf3a07..b2f516e02 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "season": "0.14.0", "semver": "1.1.4", "space-pen": "2.0.1", - "telepath": "0.66.0", + "telepath": "0.67.0", "temp": "0.5.0", "underscore-plus": "0.5.0" }, From 0b5155f496607fbf949cf6f46deaf6aa09b6d5cb Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 11 Dec 2013 14:47:52 -0800 Subject: [PATCH 3/4] Set telepath.devMode to true when not on an official release This will enable assertions inside of telepath to help us diagnose atom/telepath#7. Otherwise, the issue *should* be covered over for end users. --- src/atom.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/atom.coffee b/src/atom.coffee index 4deb87126..9a586434c 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -9,7 +9,8 @@ dialog = remote.require 'dialog' app = remote.require 'app' _ = require 'underscore-plus' -{Document} = require 'telepath' +telepath = require 'telepath' +{Document} = telepath fs = require 'fs-plus' {Subscriber} = require 'emissary' @@ -53,6 +54,8 @@ class Atom {devMode, resourcePath} = atom.getLoadSettings() configDirPath = @getConfigDirPath() + telepath.devMode = not @isReleasedVersion() + Config = require './config' Keymap = require './keymap' PackageManager = require './package-manager' From 780441bdb8fcf08ad5ee29de51995dcdad16667b Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 11 Dec 2013 15:19:46 -0800 Subject: [PATCH 4/4] Upgrade to telepath 0.68.0 for solo marker multiple undo fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2f516e02..8c48bcfd3 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "season": "0.14.0", "semver": "1.1.4", "space-pen": "2.0.1", - "telepath": "0.67.0", + "telepath": "0.68.0", "temp": "0.5.0", "underscore-plus": "0.5.0" },