Upgrade to language-ruby-on-rails@0.8.0

This reverts commit ce5eef2605.

build/Gruntfile.coffee

@@ -41,6 +41,7 @@ module.exports = (grunt) ->
     tmpDir = os.tmpdir()
     installRoot = process.env.ProgramFiles
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+    symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
@@ -50,6 +51,7 @@ module.exports = (grunt) ->
     tmpDir = '/tmp'
     installRoot = '/Applications'
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+    symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = path.join(shellAppDir, 'Contents')
     appDir = path.join(contentsDir, 'Resources', 'app')
@@ -123,7 +125,7 @@ module.exports = (grunt) ->
   grunt.initConfig
     pkg: grunt.file.readJSON('package.json')
 
-    atom: {appDir, appName, buildDir, contentsDir, installDir, shellAppDir}
+    atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}
 
     coffee: coffeeConfig
 
@@ -223,6 +225,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', 'build', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
+  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'dump-symbols', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
   grunt.registerTask('docs', ['markdown:guides', 'build-docs'])
   grunt.registerTask('default', ['download-atom-shell', 'build', 'set-version', 'install'])

build/package.json

@@ -26,6 +26,7 @@
     "harmony-collections": "~0.3.8",
     "json-front-matter": "~0.1.3",
     "legal-eagle": "~0.3.0",
+    "minidump": "0.4.x",
     "rcedit": "~0.1.2",
     "request": "~2.27.0",
     "rimraf": "~2.2.2",

build/tasks/check-licenses-task.coffee

@@ -15,6 +15,9 @@ module.exports = (grunt) ->
         console.error(err)
         exit 1
 
+      for key of summary
+        delete summary[key] if key.match /^atom@/
+
       if size(summary)
         console.error "Found dependencies without permissive licenses:"
         for name in keys(summary).sort()

build/tasks/dump-symbols-task.coffee

@@ -0,0 +1,39 @@
+async = require 'async'
+fs = require 'fs-plus'
+path = require 'path'
+minidump = require 'minidump'
+
+module.exports = (grunt) ->
+  {mkdir, rm} = require('./task-helpers')(grunt)
+
+  dumpSymbolTo = (binaryPath, targetDirectory, callback) ->
+    minidump.dumpSymbol binaryPath, (error, content) ->
+      return callback(error) if error?
+
+      moduleLine = /MODULE [^ ]+ [^ ]+ ([0-9A-F]+) (.*)\n/.exec(content)
+      if moduleLine.length isnt 3
+        return callback("Invalid output when dumping symbol for #{binaryPath}")
+
+      filename = moduleLine[2]
+      targetPathDirname = path.join(targetDirectory, filename, moduleLine[1])
+      mkdir targetPathDirname
+
+      targetPath = path.join(targetPathDirname, "#{filename}.sym")
+      fs.writeFile(targetPath, content, callback)
+
+  grunt.registerTask 'dump-symbols', 'Dump symbols for native modules', ->
+    done = @async()
+
+    symbolsDir = grunt.config.get('atom.symbolsDir')
+    rm symbolsDir
+    mkdir symbolsDir
+
+    tasks = []
+    onFile = (binaryPath) ->
+      if /.*\.node$/.test(binaryPath)
+        tasks.push(dumpSymbolTo.bind(this, binaryPath, symbolsDir))
+    onDirectory = ->
+      true
+    fs.traverseTreeSync 'node_modules', onFile, onDirectory
+
+    async.parallel tasks, done

build/tasks/publish-build-task.coffee

@@ -2,14 +2,17 @@ child_process = require 'child_process'
 path = require 'path'
 
 _ = require 'underscore-plus'
+async = require 'async'
 fs = require 'fs-plus'
 GitHub = require 'github-releases'
 request = require 'request'
 
 grunt = null
 maxReleases = 10
-assetName = 'atom-mac.zip'
-assetPath = "/tmp/atom-build/#{assetName}"
+assets = [
+  {assetName: 'atom-mac.zip', sourceName: 'Atom.app'}
+  {assetName: 'atom-mac-symbols.zip', sourceName: 'Atom.breakpad.syms'}
+]
 commitSha = process.env.JANKY_SHA1
 token = process.env.ATOM_ACCESS_TOKEN
 defaultHeaders =
@@ -18,39 +21,48 @@ defaultHeaders =
 
 module.exports = (gruntObject) ->
   grunt = gruntObject
+
   grunt.registerTask 'publish-build', 'Publish the built app', ->
     return unless process.platform is 'darwin'
     return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
 
     done = @async()
+    buildDir = grunt.config.get('atom.buildDir')
 
     createBuildRelease (error, release) ->
       return done(error) if error?
-      zipApp (error) ->
+
+      zipApps buildDir, assets, (error) ->
         return done(error) if error?
-        uploadAsset release, (error) ->
+        uploadAssets release, buildDir, assets, (error) ->
           return done(error) if error?
           publishRelease release, (error) ->
             return done(error) if error?
             getAtomDraftRelease (error, release) ->
               return done(error) if error?
-              deleteExistingAsset release, (error) ->
+              assetNames = (asset.assetName for asset in assets)
+              deleteExistingAssets release, assetNames, (error) ->
                 return done(error) if error?
-                uploadAsset(release, done)
+                uploadAssets(release, buildDir, assets, done)
 
 logError = (message, error, details) ->
   grunt.log.error(message)
   grunt.log.error(error.message ? error) if error?
   grunt.log.error(details) if details
 
-zipApp = (callback) ->
-  fs.removeSync(assetPath)
+zipApps = (buildDir, assets, callback) ->
+  zip = (directory, sourceName, assetName, callback) ->
+    options = {cwd: directory, maxBuffer: Infinity}
+    child_process.exec "zip -r --symlinks #{assetName} #{sourceName}", options, (error, stdout, stderr) ->
+      if error?
+        logError("Zipping #{sourceName} failed", error, stderr)
+      callback(error)
 
-  options = {cwd: path.dirname(assetPath), maxBuffer: Infinity}
-  child_process.exec "zip -r --symlinks #{assetName} Atom.app", options, (error, stdout, stderr) ->
-    if error?
-      logError('Zipping Atom.app failed', error, stderr)
-    callback(error)
+  tasks = []
+  for {assetName, sourceName} in assets
+    fs.removeSync(path.join(buildDir, assetName))
+    tasks.push(zip.bind(this, buildDir, sourceName, assetName))
+  async.parallel(tasks, callback)
 
 getRelease = (callback) ->
   options =
@@ -93,10 +105,12 @@ deleteRelease = (release) ->
     if error? or response.statusCode isnt 204
       logError('Deleting release failed', error, body)
 
-deleteExistingAsset = (release, callback) ->
-  for asset in release.assets when asset.name is assetName
+deleteExistingAssets = (release, assetNames, callback) ->
+  [callback, assetNames] = [assetNames, callback] if not callback?
+
+  deleteAsset = (url, callback) ->
     options =
-      uri: asset.url
+      uri: url
       method: 'DELETE'
       headers: defaultHeaders
     request options, (error, response, body='') ->
@@ -106,9 +120,10 @@ deleteExistingAsset = (release, callback) ->
       else
         callback()
 
-    return
-
-  callback()
+  tasks = []
+  for asset in release.assets when not assetNames? or asset.name in assetNames
+    tasks.push(deleteAsset.bind(this, asset.url))
+  async.parallel(tasks, callback)
 
 createBuildRelease = (callback) ->
   getRelease (error, release) ->
@@ -117,7 +132,7 @@ createBuildRelease = (callback) ->
       return
 
     if release?
-      deleteExistingAsset release, (error) ->
+      deleteExistingAssets release, (error) ->
         callback(error, release)
       return
 
@@ -139,23 +154,30 @@ createBuildRelease = (callback) ->
       else
         callback(null, release)
 
-uploadAsset = (release, callback) ->
-  options =
-    uri: release.upload_url.replace(/\{.*$/, "?name=#{assetName}")
-    method: 'POST'
-    headers: _.extend({
-      'Content-Type': 'application/zip'
-      'Content-Length': fs.getSizeSync(assetPath)
-      }, defaultHeaders)
+uploadAssets = (release, buildDir, assets, callback) ->
+  upload = (release, assetName, assetPath, callback) ->
+    options =
+      uri: release.upload_url.replace(/\{.*$/, "?name=#{assetName}")
+      method: 'POST'
+      headers: _.extend({
+        'Content-Type': 'application/zip'
+        'Content-Length': fs.getSizeSync(assetPath)
+        }, defaultHeaders)
 
-  assetRequest = request options, (error, response, body='') ->
-    if error? or response.statusCode >= 400
-      logError('Upload release asset failed', error, body)
-      callback(error ? new Error(response.statusCode))
-    else
-      callback(null, release)
+    assetRequest = request options, (error, response, body='') ->
+      if error? or response.statusCode >= 400
+        logError("Upload release asset #{assetName} failed", error, body)
+        callback(error ? new Error(response.statusCode))
+      else
+        callback(null, release)
 
-  fs.createReadStream(assetPath).pipe(assetRequest)
+    fs.createReadStream(assetPath).pipe(assetRequest)
+
+  tasks = []
+  for {assetName, sourceName} in assets
+    assetPath = path.join(buildDir, assetName)
+    tasks.push(upload.bind(this, release, assetName, assetPath))
+  async.parallel(tasks, callback)
 
 publishRelease = (release, callback) ->
   options =

docs/creating-a-package.md

@@ -355,3 +355,26 @@ registry.
 
 Run `apm help publish` to see all the available options and `apm help` to see
 all the other available commands.
+
+[file-tree]: https://github.com/atom/tree-view
+[status-bar]: https://github.com/atom/status-bar
+[cs-syntax]: https://github.com/atom/language-coffee-script
+[npm]: http://en.wikipedia.org/wiki/Npm_(software)
+[npm-keys]: https://npmjs.org/doc/json.html
+[apm]: https://github.com/atom/apm
+[git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
+[wrap-guide]: https://github.com/atom/wrap-guide/
+[keymaps]: advanced/keymaps.md
+[theme-variables]: theme-variables.md
+[tm-tokens]: http://manual.macromates.com/en/language_grammars.html
+[spacepen]: https://github.com/nathansobo/space-pen
+[path]: http://nodejs.org/docs/latest/api/path.html
+[jquery]: http://jquery.com/
+[underscore]: http://underscorejs.org/
+[jasmine]: http://jasmine.github.io
+[cson]: https://github.com/atom/season
+[less]: http://lesscss.org
+[ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/stylesheets/ui-variables.less
+[first-package]: your-first-package.html
+[convert-bundle]: converting-a-text-mate-bundle.html
+[convert-theme]: converting-a-text-mate-theme.html

docs/customizing-atom.md

@@ -63,9 +63,8 @@ built-in keymaps:
 '.editor':
   'enter': 'editor:newline'
 
-'body':
-  'ctrl-b': 'core:move-left'
-  'ctrl-f': 'core:move-right'
+'.mini.editor input':
+  'enter': 'core:confirm'
 ```
 
 This keymap defines the meaning of `enter` in two different contexts. In a

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.62.0",
+  "version": "0.64.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -10,12 +10,7 @@
   "bugs": {
     "url": "https://github.com/atom/atom/issues"
   },
-  "licenses": [
-    {
-      "type": "Apache",
-      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
-    }
-  ],
+  "license": "All Rights Reserved",
   "atomShellVersion": "0.10.3",
   "dependencies": {
     "async": "0.2.6",
@@ -51,7 +46,7 @@
     "serializable": "1.x",
     "space-pen": "3.1.1",
     "temp": "0.5.0",
-    "text-buffer": ">=1.1.2 <2.0",
+    "text-buffer": "^1.2.0",
     "theorist": "1.x",
     "underscore-plus": ">=1.0.2 <2.0",
     "vm-compatibility-layer": "0.1.0"
@@ -64,28 +59,28 @@
     "base16-tomorrow-dark-theme": "0.12.0",
     "solarized-dark-syntax": "0.10.0",
     "solarized-light-syntax": "0.6.0",
-    "archive-view": "0.24.0",
+    "archive-view": "0.26.0",
     "autocomplete": "0.24.0",
     "autoflow": "0.15.0",
     "autosave": "0.12.0",
     "background-tips": "0.8.0",
     "bookmarks": "0.21.0",
-    "bracket-matcher": "0.22.0",
+    "bracket-matcher": "0.23.0",
     "command-palette": "0.18.0",
     "dev-live-reload": "0.28.0",
     "exception-reporting": "0.16.0",
     "feedback": "0.27.0",
-    "find-and-replace": "0.86.0",
-    "fuzzy-finder": "0.37.0",
+    "find-and-replace": "0.87.0",
+    "fuzzy-finder": "0.38.0",
     "git-diff": "0.25.0",
     "go-to-line": "0.18.0",
     "grammar-selector": "0.22.0",
-    "image-view": "0.25.0",
+    "image-view": "0.27.0",
     "keybinding-resolver": "0.11.0",
     "link": "0.19.0",
-    "markdown-preview": "0.40.0",
+    "markdown-preview": "0.43.0",
     "metrics": "0.30.0",
-    "open-on-github": "0.21.0",
+    "open-on-github": "0.23.0",
     "package-generator": "0.29.0",
     "release-notes": "0.25.0",
     "settings-view": "0.85.0",
@@ -94,7 +89,7 @@
     "status-bar": "0.33.0",
     "styleguide": "0.26.0",
     "symbols-view": "0.40.0",
-    "tabs": "0.24.0",
+    "tabs": "0.26.0",
     "timecop": "0.15.0",
     "tree-view": "0.72.0",
     "update-package-dependencies": "0.4.0",
@@ -104,23 +99,23 @@
     "language-c": "0.12.0",
     "language-coffee-script": "0.14.0",
     "language-css": "0.10.0",
-    "language-gfm": "0.18.0",
+    "language-gfm": "0.19.0",
     "language-git": "0.9.0",
     "language-go": "0.6.0",
-    "language-html": "0.8.0",
+    "language-html": "0.9.0",
     "language-hyperlink": "0.8.0",
     "language-java": "0.8.0",
-    "language-javascript": "0.12.0",
+    "language-javascript": "0.13.0",
     "language-json": "0.8.0",
     "language-less": "0.6.0",
     "language-make": "0.9.0",
     "language-objective-c": "0.9.0",
     "language-perl": "0.8.0",
-    "language-php": "0.8.0",
+    "language-php": "0.9.0",
     "language-property-list": "0.7.0",
-    "language-python": "0.8.0",
-    "language-ruby": "0.13.0",
-    "language-ruby-on-rails": "0.7.0",
+    "language-python": "0.9.0",
+    "language-ruby": "0.14.0",
+    "language-ruby-on-rails": "0.8.0",
     "language-sass": "0.8.0",
     "language-shellscript": "0.7.0",
     "language-source": "0.7.0",
@@ -128,7 +123,7 @@
     "language-text": "0.6.0",
     "language-todo": "0.6.0",
     "language-toml": "0.11.0",
-    "language-xml": "0.7.0",
+    "language-xml": "0.8.0",
     "language-yaml": "0.6.0"
   },
   "private": true,

spec/display-buffer-spec.coffee

@@ -200,6 +200,12 @@ describe "DisplayBuffer", ->
         expect(tokensText displayBuffer.lineForRow(12).tokens).toBe 'sort(left).concat(pivot).concat(sort(rig'
         expect(changeHandler).toHaveBeenCalledWith(start: 0, end: 15, screenDelta: 3, bufferDelta: 0)
 
+      it "only allows positive widths to be assigned", ->
+        displayBuffer.setEditorWidthInChars(0)
+        expect(displayBuffer.editorWidthInChars).not.toBe 0
+        displayBuffer.setEditorWidthInChars(-1)
+        expect(displayBuffer.editorWidthInChars).not.toBe -1
+
   describe "primitive folding", ->
     beforeEach ->
       displayBuffer.destroy()
@@ -460,6 +466,12 @@ describe "DisplayBuffer", ->
 
           expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 3, screenDelta: 1, bufferDelta: 1)
 
+      describe "when the change starts at the beginning of a fold but does not extend to the end (regression)", ->
+        it "preserves a proper mapping between buffer and screen coordinates", ->
+          expect(displayBuffer.screenPositionForBufferPosition([8, 0])).toEqual [4, 0]
+          buffer.setTextInRange([[2, 0], [3, 0]], "\n")
+          expect(displayBuffer.screenPositionForBufferPosition([8, 0])).toEqual [4, 0]
+
     describe "position translation", ->
       it "translates positions to account for folded lines and characters and the placeholder", ->
         fold = displayBuffer.createFold(4, 7)

spec/workspace-spec.coffee

@@ -14,14 +14,24 @@ describe "Workspace", ->
     describe "when the 'searchAllPanes' option is false (default)", ->
       describe "when called without a uri", ->
         it "adds and activates an empty editor on the active pane", ->
-          editor = null
+          [editor1, editor2] = []
+
           waitsForPromise ->
-            workspace.open().then (o) -> editor = o
+            workspace.open().then (editor) -> editor1 = editor
 
           runs ->
-            expect(editor.getPath()).toBeUndefined()
-            expect(workspace.activePane.items).toEqual [editor]
-            expect(workspace.activePaneItem).toBe editor
+            expect(editor1.getPath()).toBeUndefined()
+            expect(workspace.activePane.items).toEqual [editor1]
+            expect(workspace.activePaneItem).toBe editor1
+            expect(workspace.activePane.activate).toHaveBeenCalled()
+
+          waitsForPromise ->
+            workspace.open().then (editor) -> editor2 = editor
+
+          runs ->
+            expect(editor2.getPath()).toBeUndefined()
+            expect(workspace.activePane.items).toEqual [editor1, editor2]
+            expect(workspace.activePaneItem).toBe editor2
             expect(workspace.activePane.activate).toHaveBeenCalled()
 
       describe "when called with a uri", ->

src/browser/atom-window.coffee

@@ -104,7 +104,7 @@ class AtomWindow
         type: 'warning'
         buttons: ['Close Window', 'Reload', 'Keep It Open']
         message: 'The editor has crashed'
-        detail: 'Please report this issue to https://github.com/atom/atom/issues'
+        detail: 'Please report this issue to atom@github.com'
       switch chosen
         when 0 then @browserWindow.destroy()
         when 1 then @browserWindow.restart()

src/display-buffer.coffee

@@ -99,10 +99,11 @@ class DisplayBuffer extends Model
   #
   # editorWidthInChars - A {Number} of characters.
   setEditorWidthInChars: (editorWidthInChars) ->
-    previousWidthInChars = @editorWidthInChars
-    @editorWidthInChars = editorWidthInChars
-    if editorWidthInChars isnt previousWidthInChars and @softWrap
-      @updateWrappedScreenLines()
+    if editorWidthInChars > 0
+      previousWidthInChars = @editorWidthInChars
+      @editorWidthInChars = editorWidthInChars
+      if editorWidthInChars isnt previousWidthInChars and @softWrap
+        @updateWrappedScreenLines()
 
   getSoftWrapColumn: ->
     if atom.config.get('editor.softWrapAtPreferredLineLength')
@@ -584,6 +585,7 @@ class DisplayBuffer extends Model
 
   updateScreenLines: (startBufferRow, endBufferRow, bufferDelta=0, options={}) ->
     startBufferRow = @rowMap.bufferRowRangeForBufferRow(startBufferRow)[0]
+    endBufferRow = @rowMap.bufferRowRangeForBufferRow(endBufferRow - 1)[1]
     startScreenRow = @rowMap.screenRowRangeForBufferRow(startBufferRow)[0]
     endScreenRow = @rowMap.screenRowRangeForBufferRow(endBufferRow - 1)[1]
 

src/editor.coffee

@@ -267,22 +267,6 @@ class Editor extends Model
     else
       'untitled'
 
-  # Compares two `Editor`s to determine equality.
-  #
-  # Equality is based on whether:
-  # * the two {TextBuffer}s are the same
-  # * the two `scrollTop` and `scrollLeft` property are the same
-  # * the most recent {Cursor}s are in the same position.
-  #
-  # Returns a {Boolean}.
-  isEqual: (other) ->
-    return false unless other instanceof Editor
-    @isAlive() == other.isAlive() and
-      @buffer.getPath() == other.buffer.getPath() and
-      @getScrollTop() == other.getScrollTop() and
-      @getScrollLeft() == other.getScrollLeft() and
-      @getCursorScreenPosition().isEqual(other.getCursorScreenPosition())
-
   # Controls visiblity based on the given {Boolean}.
   setVisible: (visible) -> @displayBuffer.setVisible(visible)
 

src/workspace.coffee

@@ -73,7 +73,7 @@ class Workspace extends Model
   #                     if the uri is already open (default: false)
   #
   # Returns a promise that resolves to the {Editor} for the file URI.
-  open: (uri='', options={}) ->
+  open: (uri, options={}) ->
     searchAllPanes = options.searchAllPanes
     split = options.split
     uri = atom.project.resolve(uri)
@@ -112,8 +112,8 @@ class Workspace extends Model
   openUriInPane: (uri, pane, options={}) ->
     changeFocus = options.changeFocus ? true
 
-    item = pane.itemForUri(uri)
-    if uri
+    if uri?
+      item = pane.itemForUri(uri)
       item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
     item ?= atom.project.open(uri, options)