Merge remote-tracking branch 'origin/master' into ns-workspace-model

build/Gruntfile.coffee

@@ -223,7 +223,6 @@ module.exports = (grunt) ->
   grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson', 'peg'])
   grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
   grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
-  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'codesign', 'build', 'set-development-version', 'lint', 'test', 'publish-build'])
-  grunt.registerTask('deploy', ['partial-clean', 'download-atom-shell', 'build', 'codesign'])
+  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'set-version', 'lint', 'test', 'codesign', 'publish-build'])
   grunt.registerTask('docs', ['markdown:guides', 'build-docs'])
-  grunt.registerTask('default', ['download-atom-shell', 'build', 'set-development-version', 'install'])
+  grunt.registerTask('default', ['download-atom-shell', 'build', 'set-version', 'install'])

build/tasks/set-version-task.coffee

@@ -4,15 +4,24 @@ path = require 'path'
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
-  grunt.registerTask 'set-development-version', 'Sets version to current SHA-1', ->
+  getVersion = (callback) ->
+    if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+      {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
+      callback(null, version)
+    else
+      cmd = 'git'
+      args = ['rev-parse', '--short', 'HEAD']
+      spawn {cmd, args}, (error, {stdout}={}, code) ->
+        callback(error, stdout?.trim?())
+
+  grunt.registerTask 'set-version', 'Set the version in the plist and package.json', ->
     done = @async()
 
-    cmd = 'git'
-    args = ['rev-parse', '--short', 'HEAD']
-    spawn {cmd, args}, (error, result, code) ->
-      return done(error) if error?
+    getVersion (error, version) ->
+      if error?
+        done(error)
+        return
 
-      version = result.stdout.trim()
       appDir = grunt.config.get('atom.appDir')
 
       # Replace version field of package.json.
@@ -32,7 +41,7 @@ module.exports = (grunt) ->
 
         strings =
           CompanyName: 'GitHub, Inc.'
-          FileDescription: 'The hackable, collaborative editor of tomorrow!'
+          FileDescription: 'The hackable, collaborative editor'
           LegalCopyright: 'Copyright (C) 2013 GitHub, Inc. All rights reserved'
           ProductName: 'Atom'
           ProductVersion: version

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "semver": "1.1.4",
     "space-pen": "3.1.0",
     "temp": "0.5.0",
-    "text-buffer": "0.12.0",
+    "text-buffer": "0.13.0",
     "underscore-plus": "0.6.1",
     "theorist": "~0.13.0",
     "delegato": "~0.4.0",
@@ -69,7 +69,7 @@
     "autosave": "0.10.0",
     "background-tips": "0.4.0",
     "bookmarks": "0.15.0",
-    "bracket-matcher": "0.16.0",
+    "bracket-matcher": "0.18.0",
     "command-logger": "0.8.0",
     "command-palette": "0.14.0",
     "dev-live-reload": "0.22.0",