Be more defensive in ReactEditorView::activate

It is conceivable that a package could have a reference to a view
that is not within a pane. 

Fixes #2853

.gitattributes

@@ -6,3 +6,9 @@ spec/fixtures/**/*.less text eol=lf
 spec/fixtures/**/*.css text eol=lf
 spec/fixtures/**/*.txt text eol=lf
 spec/fixtures/dir/**/* text eol=lf
+
+# Git 1.7 does not support **/* patterns
+spec/fixtures/css.css text eol=lf
+spec/fixtures/sample.js text eol=lf
+spec/fixtures/sample.less text eol=lf
+spec/fixtures/sample.txt text eol=lf

.gitignore

@@ -1,5 +1,7 @@
 *.swp
+*~
 .DS_Store
+Thumbs.db
 .project
 .svn
 .nvm-version
@@ -11,4 +13,3 @@ debug.log
 docs/output
 docs/includes
 spec/fixtures/evil-files/
-/apm

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/apm"]
-	path = vendor/apm
-	url = https://github.com/atom/apm.git

.npmrc

@@ -0,0 +1 @@
+cache = ~/.atom/.npm

.pairs

@@ -11,6 +11,7 @@ pairs:
   bo: Ben Ogle; benogle
   jr: Jason Rudolph; jasonrudolph
   jl: Jessica Lord; jlord
+  dh: Daniel Hengeveld; danielh
 email:
   domain: github.com
 #global: true

CONTRIBUTING.md

@@ -1,63 +1,126 @@
-# :tada: Contributing to Atom :tada:
+# Contributing to Atom
 
-These are just guidelines, not rules, use your best judgement and feel free
-to propose changes to this document in a pull request.
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+The following is a set of guidelines for contributing to Atom and its packages,
+which are hosted in the [Atom Organization](https://github.com/atom) on GitHub.
+If you're unsure which package is causing your problem or if you're having an
+issue with Atom core, please open an issue on the [main atom repository](https://github.com/atom/atom/issues).
+These are just guidelines, not rules, use your best judgement and feel free to
+propose changes to this document in a pull request.
+
+## Submitting Issues
+
+* Check the [debugging guide](https://atom.io/docs/latest/debugging) for tips
+  on debugging. You might be able to find the cause of the problem and fix 
+  things yourself.
+* Include the version of Atom you are using and the OS.
+* Include screenshots and animated GIFs whenever possible; they are immensely
+  helpful.
+* Include the behavior you expected and other places you've seen that behavior
+  such as Emacs, vi, Xcode, etc.
+* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools 
+  are open _before_ the error is triggered, a full stack trace for the error
+  will be logged. If you can reproduce the error, use this approach to get the
+  full stack trace and include it in the issue.
+* On Mac, check Console.app for stack traces to include if reporting a crash.
+* Perform a cursory search to see if a similar issue has already been submitted.
 
-## Issues
-  * Include screenshots and animated GIFs whenever possible, they are immensely
-    helpful.
-  * Include the behavior you expected to happen and other places you've seen
-    that behavior such as Emacs, vi, Xcode, etc.
-  * Check the Console app for stack traces to include if reporting a crash.
-  * Check the Dev tools (`alt-cmd-i`) for errors and stack traces to include.
-  
 ### Package Repositories
 
 This is the repository for the core Atom editor only. Atom comes bundled with
 many packages and themes that are stored in other repos under the
-[atom org](https://github.com/atom) such as [tabs](https://github.com/atom/tabs),
+[Atom organization](https://github.com/atom) such as
+[tabs](https://github.com/atom/tabs),
 [find-and-replace](https://github.com/atom/find-and-replace),
-[language-javascript](https://github.com/atom/language-javascript),
-and [atom-light-ui](http://github.com/atom/atom-light-ui).
+[language-javascript](https://github.com/atom/language-javascript), and
+[atom-light-ui](http://github.com/atom/atom-light-ui).
 
-If you think you know which package is causing the issue you are reporting, feel
-free to open up the issue in that specific repository instead. When in doubt
-just open the issue here but be aware that it may get closed here and reopened
-in the proper package's repository.
+For more information on how to work with Atom's official packages, see
+[Contributing to Atom Packages](https://atom.io/docs/latest/contributing-to-packages.html)
 
 ## Pull Requests
-  * Include screenshots and animated GIFs whenever possible.
-  * Follow the [CoffeeScript](#coffeescript-styleguide),
-    [JavaScript](https://github.com/styleguide/javascript),
-    and [CSS](https://github.com/styleguide/css) styleguides
-  * Include thoughtfully worded [Jasmine](http://pivotal.github.com/jasmine/)
-    specs
-  * Avoid placing files in `vendor`. 3rd-party packages should be added as a
-    `package.json` dependency.
-  * Files end with a newline.
-  * Requires should be in the following order:
+
+* Include screenshots and animated GIFs in your pull request whenever possible.
+* Follow the [CoffeeScript](#coffeescript-styleguide),
+  [JavaScript](https://github.com/styleguide/javascript),
+  and [CSS](https://github.com/styleguide/css) styleguides.
+* Include thoughtfully-worded, well-structured
+  [Jasmine](http://jasmine.github.io/) specs.
+* Document new code based on the
+  [Documentation Styleguide](#documentation-styleguide)
+* End files with a newline.
+* Place requires in the following order:
     * Built in Node Modules (such as `path`)
     * Built in Atom and Atom Shell Modules (such as `atom`, `shell`)
     * Local Modules (using relative paths)
-  * Class variables and methods should be in the following order:
-    * Class methods (methods starting with a `@`)
-    * Instance methods
-  * Beware of platform differences
+* Place class properties in the following order:
+    * Class methods and properties (methods starting with a `@`)
+    * Instance methods and properties
+* Avoid platform-dependent code:
     * Use `require('atom').fs.getHomeDirectory()` to get the home directory.
     * Use `path.join()` to concatenate filenames.
-    * Temporary directory is not `/tmp` on Windows, use `os.tmpdir()` when
-      possible
+    * Use `os.tmpdir()` rather than `/tmp` when you need to reference the
+      temporary directory.
 
 ## Git Commit Messages
-  * Use the present tense
-  * Reference issues and pull requests liberally
-  * Consider starting the commit message with an applicable emoji:
-    * :lipstick: when improving the format/structure of the code
-    * :racehorse: when improving performance
-    * :non-potable_water: when plugging memory leaks
-    * :memo: when writing docs
+
+* Use the present tense ("Add feature" not "Added feature")
+* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
+* Limit the first line to 72 characters or less
+* Reference issues and pull requests liberally
+* Consider starting the commit message with an applicable emoji:
+    * :lipstick: `:lipstick:` when improving the format/structure of the code
+    * :racehorse: `:racehorse:` when improving performance
+    * :non-potable_water: `:non-potable_water:` when plugging memory leaks
+    * :memo: `:memo:` when writing docs
+    * :penguin: `:penguin:` when fixing something on Linux
+    * :apple: `:apple:` when fixing something on Mac OS
+    * :checkered_flag: `:checkered_flag:` when fixing something on Windows
+    * :bug: `:bug:` when fixing a bug
+    * :fire: `:fire:` when removing code or files
+    * :green_heart: `:green_heart:` when fixing the CI build
+    * :white_check_mark: `:white_check_mark:` when adding tests
+    * :lock: `:lock:` when dealing with security
 
 ## CoffeeScript Styleguide
 
 * Set parameter defaults without spaces around the equal sign
-  * `clear = (count=1) ->` instead of `clear = (count = 1) ->`
+    * `clear = (count=1) ->` instead of `clear = (count = 1) ->`
+* Use parentheses if it improves code clarity.
+* Prefer alphabetic keywords to symbolic keywords:
+    * `a is b` instead of `a == b`
+* Avoid spaces inside the curly-braces of hash literals:
+    * `{a: 1, b: 2}` instead of `{ a: 1, b: 2 }`
+* Include a single line of whitespace between methods.
+
+## Documentation Styleguide
+
+* Use [TomDoc](http://tomdoc.org).
+* Use [Markdown](https://daringfireball.net/projects/markdown).
+* Reference methods and classes in markdown with the custom `{}` notation:
+    * Reference classes with `{ClassName}`
+    * Reference instance methods with `{ClassName::methodName}`
+    * Reference class methods with `{ClassName.methodName}`
+    * Delegate to comments elsewhere with `{Delegates to: ClassName.methodName}`
+      style notation.
+
+### Example
+
+```coffee
+# Public: Disable the package with the given name.
+#
+# This method emits multiple events:
+#
+# * `package-will-be-disabled` - before the package is disabled.
+# * `package-disabled`         - after the package is disabled.
+#
+# name     - The {String} name of the package to disable.
+# options  - The {Object} with disable options (default: {}):
+#   :trackTime - `true` to track the amount of time disabling took.
+#   :ignoreErrors - `true` to catch and ignore errors thrown.
+# callback - The {Function} to call after the package has been disabled.
+#
+# Returns `undefined`.
+disablePackage: (name, options, callback) ->
+```

LICENSE.md

@@ -1,13 +1,20 @@
-Copyright 2013 GitHub Inc.
+Copyright (c) 2014 GitHub Inc.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-    http://www.apache.org/licenses/LICENSE-2.0
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,17 +1,37 @@
-# Atom — The hackable editor
+![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
 
-![Atom](http://i.imgur.com/OrTvUAD.png)
+Atom is a hackable text editor for the 21st century, built on [atom-shell](http://github.com/atom/atom-shell), and based on everything we love about our favorite editors. We designed it to be deeply customizable, but still approachable using the default configuration.
 
-Check out our [guides and API documentation](https://www.atom.io/docs/latest/).
+Visit [atom.io](https://atom.io) to learn more.
 
 ## Installing
 
+### Mac OS X
+
 Download the latest [Atom release](https://github.com/atom/atom/releases/latest).
 
 Atom will automatically update when a new release is available.
 
+### Windows
+
+Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).
+
+1. Install [chocolatey](https://chocolatey.org).
+2. Close and reopen your command prompt or PowerShell window.
+3. Run `cinst Atom`
+4. In the future run `cup Atom` to upgrade to the latest release.
+
+You can also download a `.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
+The Windows version does not currently automatically update so you will need to
+manually upgrade to future releases by re-downloading the `.zip` file.
+
 ## Building
 
-Follow the instructions in the [build docs][building].
+* [Linux](docs/build-instructions/linux.md)
+* [OS X](docs/build-instructions/os-x.md)
+* [FreeBSD](docs/build-instructions/freebsd.md)
+* [Windows](docs/build-instructions/windows.md)
 
-[building]: https://github.com/atom/atom/blob/master/docs/building-atom.md
+## Developing
+
+Check out the [guides](https://atom.io/docs/latest) and the [API reference](https://atom.io/docs/api).

apm/README.md

@@ -0,0 +1,2 @@
+This folder is where [apm](https://github.com/atom/apm) is installed to so that
+it is bundled with Atom.

apm/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "atom-bundled-apm",
+  "description": "Atom's bundled APM",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/atom/atom.git"
+  },
+  "dependencies": {
+    "atom-package-manager": "0.81.0"
+  }
+}

atom.sh

@@ -1,22 +1,28 @@
-#!/bin/sh
-ATOM_PATH=${ATOM_PATH-/Applications/Atom.app}
-ATOM_BINARY=$ATOM_PATH/Contents/MacOS/Atom
+#!/bin/bash
 
-if [ ! -d $ATOM_PATH ]; then sleep 5; fi # Wait for Atom to reappear, Sparkle may be replacing it.
-
-if [ ! -d $ATOM_PATH ]; then
-  echo "Atom application not found at '$ATOM_PATH'" >&2
+if [ "$(uname)" == 'Darwin' ]; then
+  OS='Mac'
+elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
+  OS='Linux'
+elif [ "$(expr substr $(uname -s) 1 10)" == 'MINGW32_NT' ]; then
+  OS='Cygwin'
+else
+  echo "Your platform ($(uname -a)) is not supported."
   exit 1
 fi
 
-while getopts ":wtfvhs-:" opt; do
+while getopts ":wtfvh-:" opt; do
   case "$opt" in
     -)
       case "${OPTARG}" in
         wait)
           WAIT=1
           ;;
-        help|version|foreground|test)
+        help|version)
+          REDIRECT_STDERR=1
+          EXPECT_OUTPUT=1
+          ;;
+        foreground|test)
           EXPECT_OUTPUT=1
           ;;
       esac
@@ -24,25 +30,71 @@ while getopts ":wtfvhs-:" opt; do
     w)
       WAIT=1
       ;;
-    h|v|f|t)
+    h|v)
+      REDIRECT_STDERR=1
+      EXPECT_OUTPUT=1
+      ;;
+    f|t)
       EXPECT_OUTPUT=1
       ;;
   esac
 done
 
-if [ $EXPECT_OUTPUT ]; then
-  $ATOM_BINARY --executed-from="$(pwd)" --pid=$$ $@
-  exit $?
-else
-  open -a $ATOM_PATH -n --args --executed-from="$(pwd)" --pid=$$ $@
+if [ $REDIRECT_STDERR ]; then
+  exec 2> /dev/null
 fi
 
-# Used to exit process when atom is used as $EDITOR
+if [ $OS == 'Mac' ]; then
+  ATOM_PATH=${ATOM_PATH:-/Applications} # Set ATOM_PATH unless it is already set
+  ATOM_APP_NAME=Atom.app
+
+  # If ATOM_PATH isn't a executable file, use spotlight to search for Atom
+  if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
+    ATOM_PATH=$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | head -1 | xargs dirname)
+  fi
+
+  # Exit if Atom can't be found
+  if [ -z "$ATOM_PATH" ]; then
+    echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app."
+    exit 1
+  fi
+
+  if [ $EXPECT_OUTPUT ]; then
+    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@"
+    exit $?
+  else
+    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ "$@"
+  fi
+elif [ $OS == 'Linux' ]; then
+  SCRIPT=$(readlink -f "$0")
+  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
+  ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
+
+  : ${TMPDIR:=/tmp}
+
+  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
+
+  if [ $EXPECT_OUTPUT ]; then
+    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
+    exit $?
+  else
+    (
+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$TMPDIR/atom-nohup.out" 2>&1
+    if [ $? -ne 0 ]; then
+      cat "$TMPDIR/atom-nohup.out"
+      exit $?
+    fi
+    ) &
+  fi
+fi
+
+# Exits this process when Atom is used as $EDITOR
 on_die() {
   exit 0
 }
 trap 'on_die' SIGQUIT SIGTERM
 
+# If the wait flag is set, don't exit this process until Atom tells it to.
 if [ $WAIT ]; then
   while true; do
     sleep 1

build/Gruntfile.coffee

@@ -11,10 +11,6 @@ _ = require 'underscore-plus'
 
 packageJson = require '../package.json'
 
-# OAuth token for atom-bot
-# TODO Remove once all repositories are public
-process.env.ATOM_ACCESS_TOKEN ?= '362295be4c5258d3f7b967bbabae662a455ca2a7'
-
 # Shim harmony collections in case grunt was invoked without harmony
 # collections enabled
 _.extend(global, require('harmony-collections')) unless global.WeakMap?
@@ -40,30 +36,30 @@ module.exports = (grunt) ->
     grunt.log.write = (args...) -> grunt.log
 
   [major, minor, patch] = packageJson.version.split('.')
+  tmpDir = os.tmpdir()
+  appName = if process.platform is 'darwin' then 'Atom.app' else 'Atom'
+  buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
+  installDir = grunt.option('install-dir')
+  atomShellDownloadDir = path.join(tmpDir, 'atom-cached-atom-shells')
+  symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
+  shellAppDir = path.join(buildDir, appName)
   if process.platform is 'win32'
-    appName = 'Atom'
-    tmpDir = os.tmpdir()
-    installRoot = process.env.ProgramFiles
-    buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
-    shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
-    atomShellDownloadDir = path.join(os.tmpdir(), 'atom-cached-atom-shells')
-  else
-    appName = 'Atom.app'
-    tmpDir = '/tmp'
-    installRoot = '/Applications'
-    buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
-    shellAppDir = path.join(buildDir, appName)
+    installDir ?= path.join(process.env.ProgramFiles, appName)
+    killCommand = 'taskkill /F /IM atom.exe'
+  else if process.platform is 'darwin'
     contentsDir = path.join(shellAppDir, 'Contents')
     appDir = path.join(contentsDir, 'Resources', 'app')
-    atomShellDownloadDir = '/tmp/atom-cached-atom-shells'
-
-  installDir = path.join(installRoot, appName)
+    installDir ?= path.join('/Applications', appName)
+    killCommand = 'pkill -9 Atom'
+  else
+    contentsDir = shellAppDir
+    appDir = path.join(shellAppDir, 'resources', 'app')
+    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
+    killCommand ='pkill -9 Atom'
 
   coffeeConfig =
-    options:
-      sourceMap: true
     glob_to_multiple:
       expand: true
       src: [
@@ -127,7 +123,9 @@ 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}
+
+    docsOutputDir: 'docs/output/api'
 
     coffee: coffeeConfig
 
@@ -218,7 +216,7 @@ module.exports = (grunt) ->
 
     shell:
       'kill-atom':
-        command: 'pkill -9 Atom'
+        command: killCommand
         options:
           stdout: false
           stderr: false
@@ -227,6 +225,9 @@ 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', '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'])
+
+  defaultTasks = ['download-atom-shell', 'build', 'set-version']
+  defaultTasks.push 'install' unless process.platform is 'linux'
+  grunt.registerTask('default', defaultTasks)

build/package.json

@@ -7,33 +7,35 @@
   },
   "dependencies": {
     "async": "~0.2.9",
-    "biscotto": "git://github.com/atom/biscotto.git#12188bfbe5f7303fa9f1aa3c4f8662d40ce3c3be",
-    "first-mate": "1.x",
+    "biscotto": ">=2.1.1 <3.0",
     "formidable": "~1.0.14",
-    "fs-plus": "1.x",
+    "fs-plus": "2.x",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git://github.com/atom/grunt-coffeelint.git",
-    "grunt-contrib-csslint": "~0.1.2",
+    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git",
     "grunt-contrib-coffee": "~0.9.0",
+    "grunt-contrib-csslint": "~0.1.2",
     "grunt-contrib-less": "~0.8.0",
-    "grunt-cson": "0.6.0",
-    "grunt-download-atom-shell": "git+https://atom-bot:362295be4c5258d3f7b967bbabae662a455ca2a7@github.com/atom/grunt-download-atom-shell#v0.6.0",
+    "grunt-cson": "0.8.0",
+    "grunt-download-atom-shell": "~0.8.0",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-peg": "~1.1.0",
     "grunt-shell": "~0.3.1",
     "harmony-collections": "~0.3.8",
-    "js-yaml": "~2.1.0",
     "json-front-matter": "~0.1.3",
+    "legal-eagle": "~0.4.0",
+    "minidump": "~0.7",
+    "normalize-package-data": "0.2.12",
+    "npm": "~1.4.5",
     "rcedit": "~0.1.2",
+    "read-package-json": "1.1.8",
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
-    "runas": "~0.3.0",
+    "runas": "0.5.x",
     "underscore-plus": "1.x",
     "unzip": "~0.1.9",
-    "vm-compatibility-layer": "~0.1.0",
-    "walkdir": "0.0.7"
+    "vm-compatibility-layer": "~0.1.0"
   }
 }

build/tasks/build-task.coffee

@@ -1,5 +1,6 @@
 fs = require 'fs'
 path = require 'path'
+_ = require 'underscore-plus'
 
 module.exports = (grunt) ->
   {cp, isAtomPackage, mkdir, rm} = require('./task-helpers')(grunt)
@@ -14,14 +15,13 @@ module.exports = (grunt) ->
 
     if process.platform is 'darwin'
       cp 'atom-shell/Atom.app', shellAppDir
-    else if process.platform is 'win32'
+    else
       cp 'atom-shell', shellAppDir
 
     mkdir appDir
 
     cp 'atom.sh', path.join(appDir, 'atom.sh')
     cp 'package.json', path.join(appDir, 'package.json')
-    cp 'apm', path.join(appDir, 'apm')
 
     packageDirectories = []
     nonPackageDirectories = [
@@ -47,12 +47,37 @@ module.exports = (grunt) ->
       path.join('less', 'dist')
       path.join('less', 'test')
       path.join('bootstrap', 'docs')
-      path.join('spellchecker', 'vendor')
+      path.join('bootstrap', 'examples')
+      path.join('pegjs', 'examples')
+      path.join('plist', 'tests')
       path.join('xmldom', 'test')
+      path.join('combined-stream', 'test')
+      path.join('delayed-stream', 'test')
+      path.join('domhandler', 'test')
+      path.join('fstream-ignore', 'test')
+      path.join('harmony-collections', 'test')
+      path.join('lru-cache', 'test')
+      path.join('minimatch', 'test')
+      path.join('normalize-package-data', 'test')
+      path.join('npm', 'test')
+      path.join('jasmine-reporters', 'ext')
+      path.join('jasmine-node', 'node_modules', 'gaze')
+      path.join('build', 'Release', 'obj.target')
+      path.join('build', 'Release', 'obj')
+      path.join('build', 'Release', '.deps')
       path.join('vendor', 'apm')
       path.join('resources', 'mac')
       path.join('resources', 'win')
     ]
+    ignoredPaths = ignoredPaths.map (ignoredPath) -> _.escapeRegExp(ignoredPath)
+
+    # Add .* to avoid matching hunspell_dictionaries.
+    ignoredPaths.push "#{_.escapeRegExp(path.join('spellchecker', 'vendor', 'hunspell') + path.sep)}.*"
+    ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.*\\.pdb"
+
+    # Hunspell dictionaries are only not needed on OS X.
+    if process.platform is 'darwin'
+      ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"
     nodeModulesFilter = new RegExp(ignoredPaths.join('|'))
     packageFilter = new RegExp("(#{ignoredPaths.join('|')})|(.+\\.(cson|coffee)$)")
@@ -64,13 +89,23 @@ module.exports = (grunt) ->
     cp 'spec', path.join(appDir, 'spec')
     cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/
     cp 'static', path.join(appDir, 'static')
+    cp 'apm', path.join(appDir, 'apm'), filter: nodeModulesFilter
 
     if process.platform is 'darwin'
       grunt.file.recurse path.join('resources', 'mac'), (sourcePath, rootDirectory, subDirectory='', filename) ->
         unless /.+\.plist/.test(sourcePath)
           grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))
 
-    dependencies = ['compile']
+    if process.platform is 'win32'
+      cp path.join('resources', 'win', 'msvcp100.dll'), path.join(shellAppDir, 'msvcp100.dll')
+      cp path.join('resources', 'win', 'msvcr100.dll'), path.join(shellAppDir, 'msvcr100.dll')
+
+      # Set up chocolatey ignore and gui files
+      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
+      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
+      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''
+
+    dependencies = ['compile', "generate-license:save"]
     dependencies.push('copy-info-plist') if process.platform is 'darwin'
     dependencies.push('set-exe-icon') if process.platform is 'win32'
     grunt.task.run(dependencies...)

build/tasks/check-licenses-task.coffee

@@ -0,0 +1,28 @@
+
+module.exports = (grunt) ->
+  grunt.registerTask 'check-licenses', 'Report the licenses of all dependencies', ->
+    legalEagle = require 'legal-eagle'
+    {size, keys} = require 'underscore-plus'
+    done = @async()
+
+    options =
+      path: process.cwd()
+      omitPermissive: true
+      overrides: require './license-overrides'
+
+    legalEagle options, (err, summary) ->
+      if err?
+        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()
+          console.error "#{name}"
+          console.error "  License: #{summary[name].license}"
+          console.error "  Repository: #{summary[name].repository}"
+        process.exit 1
+      done()

build/tasks/clean-task.coffee

@@ -5,7 +5,7 @@ module.exports = (grunt) ->
   {rm} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'partial-clean', 'Delete some of the build files', ->
-    tmpdir = if process.platform is 'win32' then os.tmpdir() else '/tmp'
+    tmpdir = os.tmpdir()
 
     rm grunt.config.get('atom.buildDir')
     rm require('../src/coffee-cache').cacheDir

build/tasks/codesign-task.coffee

@@ -1,10 +1,12 @@
+path = require 'path'
+
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'codesign', 'Codesign the app', ->
     done = @async()
 
-    if process.env.XCODE_KEYCHAIN
+    if process.platform is 'darwin' and process.env.XCODE_KEYCHAIN
       unlockKeychain (error) ->
         if error?
           done(error)
@@ -20,6 +22,15 @@ module.exports = (grunt) ->
     spawn {cmd, args}, (error) -> callback(error)
 
   signApp = (callback) ->
-    cmd = 'codesign'
-    args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
-    spawn {cmd, args}, (error) -> callback(error)
+    switch process.platform
+      when 'darwin'
+        cmd = 'codesign'
+        args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+        spawn {cmd, args}, (error) -> callback(error)
+      when 'win32'
+        spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
+          cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
+          args = [path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')]
+          spawn {cmd, args}, (error) -> callback(error)
+      else
+        callback()

build/tasks/convert-theme.coffee

@@ -1,102 +0,0 @@
-path = require 'path'
-
-_ = require 'underscore-plus'
-fs = require 'fs-plus'
-{ScopeSelector} = require 'first-mate'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'convert-theme', 'Convert a TextMate theme to an Atom theme', ->
-    if textMateThemePath = grunt.option('path')
-      textMateThemePath = path.resolve(textMateThemePath)
-      if grunt.file.isFile(textMateThemePath)
-        textMateTheme = new TextMateTheme(textMateThemePath)
-        themeName = path.basename(textMateThemePath, path.extname(textMateThemePath))
-        atomThemePath = path.join(path.dirname(textMateThemePath), "#{themeName.toLowerCase()}-syntax.css")
-        grunt.file.write(atomThemePath, textMateTheme.getStylesheet())
-        grunt.log.ok("Atom theme written to: #{atomThemePath}")
-      else
-        grunt.log.error("No theme file found at: #{textMateThemePath}")
-        false
-    else
-      grunt.log.error('Must specify --path=<path to TextMate theme>')
-      false
-
-class TextMateTheme
-  constructor: (@path) ->
-    @rulesets = []
-    @buildRulesets()
-
-  buildRulesets: ->
-    {settings} = fs.readPlistSync(@path)
-    @buildGlobalSettingsRulesets(settings[0])
-    @buildScopeSelectorRulesets(settings[1..])
-
-  getStylesheet: ->
-    lines = []
-    for {selector, properties} in @getRulesets()
-      lines.push("#{selector} {")
-      lines.push "  #{name}: #{value};" for name, value of properties
-      lines.push("}\n")
-    lines.join('\n')
-
-  getRulesets: -> @rulesets
-
-  buildGlobalSettingsRulesets: ({settings}) ->
-    { background, foreground, caret, selection, lineHighlight } = settings
-
-    @rulesets.push
-      selector: '.editor, .editor .gutter'
-      properties:
-        'background-color': @translateColor(background)
-        'color': @translateColor(foreground)
-
-    @rulesets.push
-      selector: '.editor.is-focused .cursor'
-      properties:
-        'border-color': @translateColor(caret)
-
-    @rulesets.push
-      selector: '.editor.is-focused .selection .region'
-      properties:
-        'background-color': @translateColor(selection)
-
-    @rulesets.push
-      selector: '.editor.is-focused .line-number.cursor-line-no-selection, .editor.is-focused .line.cursor-line'
-      properties:
-        'background-color': @translateColor(lineHighlight)
-
-  buildScopeSelectorRulesets: (scopeSelectorSettings) ->
-    for { name, scope, settings } in scopeSelectorSettings
-      continue unless scope
-      @rulesets.push
-        comment: name
-        selector: @translateScopeSelector(scope)
-        properties: @translateScopeSelectorSettings(settings)
-
-  translateScopeSelector: (textmateScopeSelector) ->
-    new ScopeSelector(textmateScopeSelector).toCssSelector()
-
-  translateScopeSelectorSettings: ({ foreground, background, fontStyle }) ->
-    properties = {}
-
-    if fontStyle
-      fontStyles = fontStyle.split(/\s+/)
-      properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold')
-      properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic')
-      properties['text-decoration'] = 'underline' if _.contains(fontStyles, 'underline')
-
-    properties['color'] = @translateColor(foreground) if foreground
-    properties['background-color'] = @translateColor(background) if background
-    properties
-
-  translateColor: (textmateColor) ->
-    if textmateColor.length <= 7
-      textmateColor
-    else
-      r = parseInt(textmateColor[1..2], 16)
-      g = parseInt(textmateColor[3..4], 16)
-      b = parseInt(textmateColor[5..6], 16)
-      a = parseInt(textmateColor[7..8], 16)
-      a = Math.round((a / 255.0) * 100) / 100
-
-      "rgba(#{r}, #{g}, #{b}, #{a})"

build/tasks/docs-task.coffee

@@ -15,33 +15,19 @@ module.exports = (grunt) ->
   grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
     done = @async()
 
-    downloadFileFromRepo = ({repo, file}, callback) ->
-      uri = "https://raw2.github.com/atom/#{repo}/master/#{file}"
-      request uri, (error, response, contents) ->
-        return callback(error) if error?
-        downloadPath = path.join('docs', 'includes', repo, file)
-        fs.writeFile downloadPath, contents, (error) ->
-          callback(error, downloadPath)
+    docsOutputDir = grunt.config.get('docsOutputDir')
 
-    includes = [
-      {repo: 'first-mate',  file: 'src/grammar-registry.coffee'}
-      {repo: 'space-pen',   file: 'src/space-pen.coffee'}
-      {repo: 'text-buffer', file: 'src/marker.coffee'}
-      {repo: 'text-buffer', file: 'src/point.coffee'}
-      {repo: 'text-buffer', file: 'src/range.coffee'}
-      {repo: 'theorist',    file: 'src/model.coffee'}
-    ]
-
-    async.map includes, downloadFileFromRepo, (error, includePaths) ->
+    downloadIncludes (error, includePaths) ->
       if error?
         done(error)
       else
-        rm('docs/output/api')
+        rm(docsOutputDir)
         args = [
           commonArgs...
           '--title', 'Atom API Documentation'
-          '-o', 'docs/output/api'
+          '-o', docsOutputDir
           '-r', 'docs/README.md'
+          '--stability', '1'
           'src/'
           includePaths...
         ]
@@ -49,13 +35,32 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'lint-docs', 'Generate stats about the doc coverage', ->
     done = @async()
-    args = [commonArgs..., '--noOutput', 'src/']
-    grunt.util.spawn({cmd, args, opts}, done)
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
 
   grunt.registerTask 'missing-docs', 'Generate stats about the doc coverage', ->
     done = @async()
-    args = [commonArgs..., '--noOutput', '--missing', 'src/']
-    grunt.util.spawn({cmd, args, opts}, done)
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          '--missing'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
 
   grunt.registerTask 'copy-docs', 'Copies over latest API docs to atom-docs', ->
     done = @async()
@@ -129,3 +134,29 @@ module.exports = (grunt) ->
       grunt.util.spawn({cmd, args, opts}, callback)
 
     grunt.util.async.waterfall [fetchTag, stageDocs, fetchSha, commitChanges, pushOrigin, pushHeroku], done
+
+downloadFileFromRepo = ({repo, file}, callback) ->
+  uri = "https://raw.github.com/atom/#{repo}/master/#{file}"
+  request uri, (error, response, contents) ->
+    return callback(error) if error?
+    downloadPath = path.join('docs', 'includes', repo, file)
+    fs.writeFile downloadPath, contents, (error) ->
+      callback(error, downloadPath)
+
+downloadIncludes = (callback) ->
+  includes = [
+    {repo: 'atom-keymap', file: 'src/keymap-manager.coffee'}
+    {repo: 'atom-keymap', file: 'src/key-binding.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar-registry.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/directory.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/file.coffee'}
+    {repo: 'space-pen',   file: 'src/space-pen.coffee'}
+    {repo: 'text-buffer', file: 'src/marker.coffee'}
+    {repo: 'text-buffer', file: 'src/point.coffee'}
+    {repo: 'text-buffer', file: 'src/range.coffee'}
+    {repo: 'text-buffer', file: 'src/text-buffer.coffee'}
+    {repo: 'theorist',    file: 'src/model.coffee'}
+  ]
+
+  async.map(includes, downloadFileFromRepo, callback)

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/generate-license-task.coffee

@@ -0,0 +1,46 @@
+fs = require 'fs'
+path = require 'path'
+
+module.exports = (grunt) ->
+  grunt.registerTask 'generate-license', 'Generate the license, including the licenses of all dependencies', (mode) ->
+    legalEagle = require 'legal-eagle'
+    done = @async()
+
+    options =
+      path: process.cwd()
+      overrides: require './license-overrides'
+
+    legalEagle options, (err, dependencyLicenses) ->
+      if err?
+        console.error(err)
+        exit 1
+
+      licenseText = getLicenseText(dependencyLicenses)
+      if mode is 'save'
+        targetPath = path.join(grunt.config.get('atom.appDir'), 'LICENSE.md')
+        fs.writeFileSync(targetPath, licenseText)
+      else
+        console.log licenseText
+      done()
+
+getLicenseText = (dependencyLicenses) ->
+  {keys} = require 'underscore-plus'
+  text = """
+    #{fs.readFileSync('LICENSE.md', 'utf8')}
+
+    This application bundles the following third-party packages in accordance
+    with the following licenses:\n\n
+  """
+  names = keys(dependencyLicenses).sort()
+  for name in names
+    {license, source, sourceText} = dependencyLicenses[name]
+
+    text += "-------------------------------------------------------------------------\n\n"
+    text += "Package: #{name}\n"
+    text += "License: #{license}\n"
+    text += "License Source: #{source}\n" if source?
+    if sourceText?
+      text += "Source Text:\n\n"
+      text += sourceText
+    text += '\n'
+  text

build/tasks/install-task.coffee

@@ -1,25 +1,57 @@
+fs = require 'fs'
 path = require 'path'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
+runas = null
 
 module.exports = (grunt) ->
-  {cp, mkdir, rm, spawn} = require('./task-helpers')(grunt)
+  {cp, mkdir, rm} = require('./task-helpers')(grunt)
 
   grunt.registerTask 'install', 'Install the built application', ->
     installDir = grunt.config.get('atom.installDir')
     shellAppDir = grunt.config.get('atom.shellAppDir')
-    if process.platform is 'win32'
-      done = @async()
 
-      runas = require 'runas'
+    if process.platform is 'win32'
+      runas ?= require 'runas'
       copyFolder = path.resolve 'script', 'copy-folder.cmd'
-      # cmd /c ""script" "source" "destination""
-      arg = "/c \"\"#{copyFolder}\" \"#{shellAppDir}\" \"#{installDir}\"\""
-      if runas('cmd', [arg], hide: true) isnt 0
-        done("Failed to copy #{shellAppDir} to #{installDir}")
+      if runas('cmd', ['/c', copyFolder, shellAppDir, installDir], admin: true) isnt 0
+        grunt.log.error("Failed to copy #{shellAppDir} to #{installDir}")
 
       createShortcut = path.resolve 'script', 'create-shortcut.cmd'
-      args = ['/c', createShortcut, path.join(installDir, 'atom.exe'), 'Atom']
-      spawn {cmd: 'cmd', args}, done
-    else
+      runas('cmd', ['/c', createShortcut, path.join(installDir, 'atom.exe'), 'Atom'])
+    else if process.platform is 'darwin'
       rm installDir
       mkdir path.dirname(installDir)
       cp shellAppDir, installDir
+    else
+      binDir = path.join(installDir, 'bin')
+      shareDir = path.join(installDir, 'share', 'atom')
+
+      iconName = path.join(shareDir,'resources','app','resources','atom.png')
+
+      mkdir binDir
+      cp 'atom.sh', path.join(binDir, 'atom')
+      rm shareDir
+      mkdir path.dirname(shareDir)
+      cp shellAppDir, shareDir
+
+      # Create Atom.desktop if installation not in temporary folder
+      tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp'
+      if installDir.indexOf(tmpDir) isnt 0
+        desktopFile = path.join('resources', 'linux', 'Atom.desktop.in')
+        desktopInstallFile = path.join(installDir, 'share', 'applications', 'Atom.desktop')
+
+        {description} = grunt.file.readJSON('package.json')
+        iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
+        installDir = path.join(installDir, '.') # To prevent "Exec=/usr/local//share/atom/atom"
+        template = _.template(String(fs.readFileSync(desktopFile)))
+        filled = template({description, installDir, iconName})
+
+        grunt.file.write(desktopInstallFile, filled)
+
+      # Create relative symbol link for apm.
+      process.chdir(binDir)
+      rm('apm')
+      fs.symlinkSync(path.join('..', 'share', 'atom', 'resources', 'app', 'apm', 'node_modules', '.bin', 'apm'), 'apm')
+
+      fs.chmodSync(path.join(shareDir, 'atom'), "755")

build/tasks/license-overrides.coffee

@@ -0,0 +1,62 @@
+module.exports =
+  'aws-sign@0.3.0':
+    repository: 'https://github.com/mikeal/aws-sign'
+    license: 'MIT'
+    source: 'index.js'
+    sourceText: """
+      /*!
+       * knox - auth
+       * Copyright(c) 2010 LearnBoost <dev@learnboost.com>
+       * MIT Licensed
+       */
+      <content omitted>
+    """
+  'bufferjs@2.0.0':
+    repository: 'https://github.com/coolaj86/node-bufferjs'
+    license: 'MIT'
+    source: 'LICENSE.MIT'
+    sourceText: """
+      Copyright (c) 2010 AJ ONeal (and Contributors)
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    """
+  'buffers@0.1.1':
+    repository: "http://github.com/substack/node-buffers"
+    license: 'MIT'
+    source: 'README.markdown'
+    sourceText: """
+      <content omitted>
+      license
+      =======
+
+      MIT/X11
+    """
+  'specificity@0.1.3':
+    repository: 'https://github.com/keeganstreet/specificity'
+    license: 'MIT'
+    source: 'package.json in repository'
+
+  'promzard@0.2.0':
+    license: 'ISC'
+    source: 'LICENSE in the repository'
+    sourceText: """
+        The ISC License
+
+        Copyright (c) Isaac Z. Schlueter
+
+        Permission to use, copy, modify, and/or distribute this software for any
+        purpose with or without fee is hereby granted, provided that the above
+        copyright notice and this permission notice appear in all copies.
+
+        THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+        WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+        ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+        WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+        ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+        IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+      """

build/tasks/mkdeb-task.coffee

@@ -0,0 +1,40 @@
+fs = require 'fs'
+path = require 'path'
+_ = require 'underscore-plus'
+
+module.exports = (grunt) ->
+  {spawn} = require('./task-helpers')(grunt)
+
+  fillTemplate = (filePath, data) ->
+    template = _.template(String(fs.readFileSync("#{filePath}.in")))
+    filled = template(data)
+
+    outputPath = path.join(grunt.config.get('atom.buildDir'), path.basename(filePath))
+    grunt.file.write(outputPath, filled)
+    outputPath
+
+  grunt.registerTask 'mkdeb', 'Create debian package', ->
+    done = @async()
+
+    if process.arch is 'ia32'
+      arch = 'i386'
+    else if process.arch is 'x64'
+      arch = 'amd64'
+    else
+      return done("Unsupported arch #{process.arch}")
+
+    {name, version, description} = grunt.file.readJSON('package.json')
+    section = 'devel'
+    maintainer = 'GitHub <atom@github.com>'
+    installDir = '/usr'
+    iconName = 'atom'
+    data = {name, version, description, section, arch, maintainer, installDir, iconName}
+
+    controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
+    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
+    icon = path.join('resources', 'atom.png')
+    buildDir = grunt.config.get('atom.buildDir')
+
+    cmd = path.join('script', 'mkdeb')
+    args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
+    spawn({cmd, args}, done)

build/tasks/output-long-paths-task.coffee

@@ -0,0 +1,18 @@
+path = require 'path'
+
+module.exports = (grunt) ->
+  grunt.registerTask 'output-long-paths', 'Log long paths in the built application', ->
+    shellAppDir = grunt.config.get('atom.shellAppDir')
+
+    longPaths = []
+    grunt.file.recurse shellAppDir, (absolutePath, rootPath, relativePath, fileName) ->
+      if relativePath
+        fullPath = path.join(relativePath, fileName)
+      else
+        fullPath = fileName
+      longPaths.push(fullPath) if fullPath.length >= 200
+
+    longPaths.sort (longPath1, longPath2) -> longPath2.length - longPath1.length
+
+    longPaths.forEach (longPath) ->
+      grunt.log.error "#{longPath.length} character path: #{longPath}"

build/tasks/publish-build-task.coffee

@@ -2,14 +2,13 @@ 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}"
+
 commitSha = process.env.JANKY_SHA1
 token = process.env.ATOM_ACCESS_TOKEN
 defaultHeaders =
@@ -18,58 +17,63 @@ 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'
+    tasks = ['upload-assets']
+    tasks.unshift('build-docs', 'prepare-docs') if process.platform is 'darwin'
+    grunt.task.run(tasks)
 
+  grunt.registerTask 'prepare-docs', 'Move the build docs to the build dir', ->
+    fs.copySync(grunt.config.get('docsOutputDir'), path.join(grunt.config.get('atom.buildDir'), 'atom-docs'))
+
+  grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
     done = @async()
+    buildDir = grunt.config.get('atom.buildDir')
+    assets = getAssets()
 
-    createBuildRelease (error, release) ->
+    zipAssets buildDir, assets, (error) ->
       return done(error) if error?
-      zipApp (error) ->
+      getAtomDraftRelease (error, release) ->
         return done(error) if error?
-        uploadAsset release, (error) ->
+        assetNames = (asset.assetName for asset in assets)
+        deleteExistingAssets release, assetNames, (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) ->
-                return done(error) if error?
-                uploadAsset(release, done)
+          uploadAssets(release, buildDir, assets, done)
+
+getAssets = ->
+  if process.platform is 'darwin'
+    [
+      {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
+      {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
+      {assetName: 'atom-docs.zip', sourcePath: 'atom-docs'}
+    ]
+  else
+    [
+      {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
+    ]
 
 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)
-
-  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)
-
-getRelease = (callback) ->
-  options =
-    uri: 'https://api.github.com/repos/atom/atom-master-builds/releases'
-    method: 'GET'
-    headers: defaultHeaders
-    json: true
-  request options, (error, response, releases=[]) ->
-    if error? or response.statusCode isnt 200
-      logError('Fetching releases failed', error, releases)
-      callback(error ? new Error(response.statusCode))
+zipAssets = (buildDir, assets, callback) ->
+  zip = (directory, sourcePath, assetName, callback) ->
+    if process.platform is 'win32'
+      zipCommand = "C:/psmodules/7z.exe a -r #{assetName} #{sourcePath}"
     else
-      if releases.length > maxReleases
-        deleteRelease(release) for release in releases[maxReleases..]
+      zipCommand = "zip -r --symlinks #{assetName} #{sourcePath}"
+    options = {cwd: directory, maxBuffer: Infinity}
+    child_process.exec zipCommand, options, (error, stdout, stderr) ->
+      logError("Zipping #{sourcePath} failed", error, stderr) if error?
+      callback(error)
 
-      for release in releases when release.name is commitSha
-        callback(null, release)
-        return
-      callback()
+  tasks = []
+  for {assetName, sourcePath} in assets
+    fs.removeSync(path.join(buildDir, assetName))
+    tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
+  async.parallel(tasks, callback)
 
 getAtomDraftRelease = (callback) ->
   atomRepo = new GitHub({repo: 'atom/atom', token})
@@ -93,10 +97,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,67 +112,32 @@ deleteExistingAsset = (release, callback) ->
       else
         callback()
 
-    return
-
-  callback()
-
-createBuildRelease = (callback) ->
-  getRelease (error, release) ->
-    if error?
-      callback(error)
-      return
-
-    if release?
-      deleteExistingAsset release, (error) ->
-        callback(error, release)
-      return
+  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)
 
+uploadAssets = (release, buildDir, assets, callback) ->
+  upload = (release, assetName, assetPath, callback) ->
     options =
-      uri: 'https://api.github.com/repos/atom/atom-master-builds/releases'
+      uri: release.upload_url.replace(/\{.*$/, "?name=#{assetName}")
       method: 'POST'
-      headers: defaultHeaders
-      json:
-        tag_name: "v#{commitSha}"
-        target_commitish: 'master'
-        name: commitSha
-        body: "Build of [atom@#{commitSha.substring(0, 7)}](https://github.com/atom/atom/commits/#{commitSha})"
-        draft: true
-        prerelease: true
-    request options, (error, response, release={}) ->
-      if error? or response.statusCode isnt 201
-        logError('Creating release failed', error, release)
+      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 #{assetName} failed", error, body)
         callback(error ? new Error(response.statusCode))
       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)
+    fs.createReadStream(assetPath).pipe(assetRequest)
 
-  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)
-
-  fs.createReadStream(assetPath).pipe(assetRequest)
-
-publishRelease = (release, callback) ->
-  options =
-    uri: release.url
-    method: 'POST'
-    headers: defaultHeaders
-    json:
-      draft: false
-  request options, (error, response, body={}) ->
-    if error? or response.statusCode isnt 200
-      logError('Creating release failed', error, body)
-      callback(error ? new Error(response.statusCode))
-    else
-      callback()
+  tasks = []
+  for {assetName} in assets
+    assetPath = path.join(buildDir, assetName)
+    tasks.push(upload.bind(this, release, assetName, assetPath))
+  async.parallel(tasks, callback)

build/tasks/publish-packages.coffee

@@ -1,108 +0,0 @@
-async = require 'async'
-request = require 'request'
-
-# Configure and publish all packages in package.json to atom.io
-#
-# This task should be run whenever you want to be sure that atom.io contains
-# all the packages and versions referenced in Atom's package.json file.
-module.exports = (grunt) ->
-  {spawn} = require('./task-helpers')(grunt)
-
-  baseUrl = "https://www.atom.io/api/packages"
-
-  packageExists = (packageName, token, callback) ->
-    requestSettings =
-      url: "#{baseUrl}/#{packageName}"
-      json: true
-      headers:
-        authorization: token
-    request.get requestSettings, (error, response, body={}) ->
-      if error?
-        callback(error)
-      else
-        callback(null, response.statusCode is 404)
-
-  createPackage = (packageName, token, callback) ->
-    requestSettings =
-      url: baseUrl
-      json: true
-      headers:
-        authorization: token
-      method: 'POST'
-      body:
-        repository: "atom/#{packageName}"
-
-    request.get requestSettings, (error, response, body={}) ->
-      if error?
-        callback(error)
-      else if response.statusCode isnt 201
-        message = body.message ? body.error ? body
-        callback(new Error("Creating package failed: #{message}"))
-      else
-        callback()
-
-  createPackageVersion = (packageName, tag, token, callback) ->
-    requestSettings =
-      url: "#{baseUrl}/#{packageName}/versions"
-      json: true
-      method: 'POST'
-      headers:
-        authorization: token
-      body:
-        tag: tag
-
-    request.get requestSettings, (error, response, body={}) ->
-      if error?
-        callback(error)
-      else if response.statusCode isnt 201
-        message = body.message ? body.error ? body
-        if message is 'Version exists'
-          callback()
-        else
-          callback(new Error("Creating new version failed: #{message}"))
-      else
-        callback()
-
-  getToken = (callback) ->
-    if token = process.env.ATOM_ACCESS_TOKEN
-      callback(null, token)
-    else
-      spawn {cmd: 'security', args: ['-q', 'find-generic-password', '-ws', 'GitHub API Token']}, (error, result, code) ->
-        token = result.toString() unless error?
-        callback(error, token)
-
-  grunt.registerTask 'publish-packages', 'Publish all bundled packages', ->
-    done = @async()
-
-    getToken (error, token) ->
-      unless token
-        grunt.log.error('Token not found in keychain or ATOM_ACCESS_TOKEN environment variable')
-        done(false)
-
-      {packageDependencies} = grunt.file.readJSON('package.json') ? {}
-      tasks = []
-      for name, version of packageDependencies
-        do (name, version) ->
-          tasks.push (callback) ->
-            grunt.verbose.writeln("Publishing #{name}@#{version}")
-            tag = "v#{version}"
-            packageExists name, token, (error, exists) ->
-              if error?
-                callback(error)
-                return
-
-              if exists
-                createPackage name, token, (error) ->
-                  if error?
-                    callback(error)
-                  else
-                    createPackageVersion(name, tag, token, callback)
-              else
-                createPackageVersion(name, tag, token, callback)
-
-      async.waterfall tasks, (error) ->
-        if error?
-          grunt.log.error(error.message)
-          done(false)
-        else
-          done()

build/tasks/set-version-task.coffee

@@ -5,14 +5,18 @@ module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
   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'))
+    onBuildMachine = process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+    inRepository = fs.existsSync(path.resolve(__dirname, '..', '..', '.git'))
+    {version} = require(path.join(grunt.config.get('atom.appDir'), 'package.json'))
+    if onBuildMachine or not inRepository
       callback(null, version)
     else
       cmd = 'git'
       args = ['rev-parse', '--short', 'HEAD']
       spawn {cmd, args}, (error, {stdout}={}, code) ->
-        callback(error, stdout?.trim?())
+        commitHash = stdout?.trim?()
+        combinedVersion = "#{version}-#{commitHash}"
+        callback(error, combinedVersion)
 
   grunt.registerTask 'set-version', 'Set the version in the plist and package.json', ->
     done = @async()
@@ -48,3 +52,5 @@ module.exports = (grunt) ->
 
         rcedit = require('rcedit')
         rcedit(shellExePath, {'version-string': strings}, done)
+      else
+        done()

build/tasks/spec-task.coffee

@@ -39,7 +39,8 @@ module.exports = (grunt) ->
       grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs."
       spawn options, (error, results, code) ->
         if process.platform is 'win32'
-          process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
+          if error
+            process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
           fs.unlinkSync(path.join(packagePath, 'ci.log'))
 
         failedPackages.push path.basename(packagePath) if error
@@ -52,9 +53,7 @@ module.exports = (grunt) ->
       continue unless isAtomPackage(packagePath)
       packageSpecQueue.push(packagePath)
 
-    # TODO: Restore concurrency on Windows
-    packageSpecQueue.concurrency = 1 unless process.platform is 'win32'
-
+    packageSpecQueue.concurrency = 1
     packageSpecQueue.drain = -> callback(null, failedPackages)
 
   runCoreSpecs = (callback) ->
@@ -77,7 +76,7 @@ module.exports = (grunt) ->
 
     spawn options, (error, results, code) ->
       if process.platform is 'win32'
-        process.stderr.write(fs.readFileSync('ci.log'))
+        process.stderr.write(fs.readFileSync('ci.log')) if error
         fs.unlinkSync('ci.log')
       else
         # TODO: Restore concurrency on Windows
@@ -105,8 +104,8 @@ module.exports = (grunt) ->
 
       grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0
 
-      # TODO: Mark the build as green on Windows until specs pass.
-      if process.platform is 'darwin'
+      if process.platform is 'win32' and process.env.JANKY_SHA1
+        # Package specs are still flaky on Windows CI
+        done(!coreSpecFailed)
+      else
         done(!coreSpecFailed and failedPackages.length == 0)
-      else if process.platform is 'win32'
-        done(true)

build/tasks/task-helpers.coffee

@@ -1,27 +1,41 @@
-fs = require 'fs'
+fs = require 'fs-plus'
 path = require 'path'
-walkdir = require 'walkdir'
 
 module.exports = (grunt) ->
   cp: (source, destination, {filter}={}) ->
     unless grunt.file.exists(source)
       grunt.fatal("Cannot copy non-existent #{source.cyan} to #{destination.cyan}")
 
-    try
-      walkdir.sync source, (sourcePath, stats) ->
-        return if filter?.test(sourcePath)
+    copyFile = (sourcePath, destinationPath) ->
+      return if filter?.test(sourcePath)
 
-        destinationPath = path.join(destination, path.relative(source, sourcePath))
-        if stats.isSymbolicLink()
-          grunt.file.mkdir(path.dirname(destinationPath))
-          fs.symlinkSync(fs.readlinkSync(sourcePath), destinationPath)
-        else if stats.isFile()
-          grunt.file.copy(sourcePath, destinationPath)
+      stats = fs.lstatSync(sourcePath)
+      if stats.isSymbolicLink()
+        grunt.file.mkdir(path.dirname(destinationPath))
+        fs.symlinkSync(fs.readlinkSync(sourcePath), destinationPath)
+      else if stats.isFile()
+        grunt.file.copy(sourcePath, destinationPath)
 
-        if grunt.file.exists(destinationPath)
-          fs.chmodSync(destinationPath, fs.statSync(sourcePath).mode)
-    catch error
-      grunt.fatal(error)
+      if grunt.file.exists(destinationPath)
+        fs.chmodSync(destinationPath, fs.statSync(sourcePath).mode)
+
+    if grunt.file.isFile(source)
+      copyFile(source, destination)
+    else
+      try
+        onFile = (sourcePath) ->
+          destinationPath = path.join(destination, path.relative(source, sourcePath))
+          copyFile(sourcePath, destinationPath)
+        onDirectory = (sourcePath) ->
+          if fs.isSymbolicLinkSync(sourcePath)
+            destinationPath = path.join(destination, path.relative(source, sourcePath))
+            copyFile(sourcePath, destinationPath)
+            false
+          else
+            true
+        fs.traverseTreeSync source, onFile, onDirectory
+      catch error
+        grunt.fatal(error)
 
     grunt.verbose.writeln("Copied #{source.cyan} to #{destination.cyan}.")
 

build/tasks/update-octicons-task.coffee

@@ -0,0 +1,22 @@
+path = require 'path'
+
+module.exports = (grunt) ->
+  grunt.registerTask 'update-octicons', 'Update octicon font and LESS variables', ->
+    pathToOcticons = path.resolve('..', 'octicons')
+    if grunt.file.isDir(pathToOcticons)
+      # Copy font-file
+      fontSrc = path.join(pathToOcticons, 'octicons', 'octicons.woff')
+      fontDest = path.resolve('static', 'octicons.woff')
+      grunt.file.copy(fontSrc, fontDest)
+
+      # Update Octicon UTF codes
+      glyphsSrc = path.join(pathToOcticons, 'data', 'glyphs.yml')
+      output = []
+      for {css, code} in grunt.file.readYAML(glyphsSrc)
+        output.push "@#{css}: \"\\#{code}\";"
+
+      octiconUtfDest = path.resolve('static', 'variables', 'octicon-utf-codes.less')
+      grunt.file.write(octiconUtfDest, "#{output.join('\n')}\n")
+    else
+      grunt.log.error("octicons repo must be cloned to #{pathToOcticons}")
+      false

docs/README.md

@@ -1,6 +1,6 @@
 # Welcome to the Atom API Documentation
 
-![Atom](http://i.imgur.com/OrTvUAD.png)
+![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
 
 ## FAQ
 
@@ -23,9 +23,7 @@ You can also require many of these classes in your package via:
 The classes available from `require 'atom'` are:
   * [BufferedProcess][BufferedProcess]
   * [BufferedNodeProcess][BufferedNodeProcess]
-  * [Directory][Directory]
   * [EditorView][EditorView]
-  * [File][File]
   * [Git][Git]
   * [Point][Point]
   * [Range][Range]
@@ -33,6 +31,7 @@ The classes available from `require 'atom'` are:
   * [SelectListView][SelectListView]
   * [View][View]
   * [WorkspaceView][WorkspaceView]
+  * [Workspace][Workspace]
 
 ### How do I create a package?
 
@@ -47,10 +46,8 @@ Atom ships with node 0.11.10 and the comprehensive node API docs are available
 [Atom]: ../classes/Atom.html
 [BufferedProcess]: ../classes/BufferedProcess.html
 [BufferedNodeProcess]: ../classes/BufferedNodeProcess.html
-[Directory]: ../classes/Directory.html
 [Editor]: ../classes/Editor.html
 [EditorView]: ../classes/EditorView.html
-[File]: ../classes/File.html
 [Git]: ../classes/Git.html
 [Point]: ../classes/Point.html
 [Range]: ../classes/Range.html
@@ -58,5 +55,6 @@ Atom ships with node 0.11.10 and the comprehensive node API docs are available
 [SelectListView]: ../classes/SelectListView.html
 [View]: ../classes/View.html
 [WorkspaceView]: ../classes/WorkspaceView.html
-[creating-a-package]: https://www.atom.io/docs/latest/creating-a-package
+[Workspace]: ../classes/Workspace.html
+[creating-a-package]: https://atom.io/docs/latest/creating-a-package
 [node-docs]: http://nodejs.org/docs/v0.11.10/api

docs/advanced/configuration.md

@@ -11,41 +11,31 @@ value of a namespaced config key with `atom.config.get`:
 @showInvisibles() if atom.config.get "editor.showInvisibles"
 ```
 
-Or you can use the `::observeConfig` to track changes from any view object.
+Or you can use the `::subscribe` with `atom.config.observe` to track changes
+from any view object.
 
 ```coffeescript
 class MyView extends View
   initialize: ->
-    @observeConfig 'editor.fontSize', () =>
+    @subscribe atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
       @adjustFontSize()
 ```
 
-The `::observeConfig` method will call the given callback immediately with the
-current value for the specified key path, and it will also call it in the future
-whenever the value of that key path changes.
+The `atom.config.observe` method will call the given callback immediately with
+the current value for the specified key path, and it will also call it in the
+future whenever the value of that key path changes.
 
-Subscriptions made with `observeConfig` are automatically canceled when the
+Subscriptions made with `::subscribe` are automatically canceled when the
 view is removed. You can cancel config subscriptions manually via the
-`unobserveConfig` method.
+`off` method on the subscription object that `atom.config.observe` returns.
 
 ```coffeescript
-view1.unobserveConfig() # unobserve all properties
-```
+fontSizeSubscription = atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+  @adjustFontSize()
 
-You can add the ability to observe config values to non-view classes by
-extending their prototype with the `ConfigObserver` mixin:
+# ... later on
 
-```coffeescript
-{ConfigObserver} = require 'atom'
-
-class MyClass
-  ConfigObserver.includeInto(this)
-  
-  constructor: ->
-    @observeConfig 'editor.showInvisibles', -> # ...
-
-  destroy: ->
-    @unobserveConfig()
+fontSizeSubscription.off() # Stop observing
 ```
 
 ### Writing Config Settings

docs/advanced/keymaps.md

@@ -10,8 +10,8 @@ keystrokes pass through elements with the class `.editor`:
 
 ```coffee
 '.editor':
-  'cmd-delete': 'editor:backspace-to-beginning-of-line'
-  'alt-backspace': 'editor:backspace-to-beginning-of-word'
+  'cmd-delete': 'editor:delete-to-beginning-of-line'
+  'alt-backspace': 'editor:delete-to-beginning-of-word'
   'ctrl-A': 'editor:select-to-first-character-of-line'
   'ctrl-shift-e': 'editor:select-to-end-of-line'
   'cmd-left': 'editor:move-to-first-character-of-line'
@@ -24,7 +24,7 @@ keystrokes pass through elements with the class `.editor`:
 Beneath the first selector are several bindings, mapping specific *keystroke
 patterns* to *commands*. When an element with the `.editor` class is focused and
 `cmd-delete` is pressed, an custom DOM event called
-`editor:backspace-to-beginning-of-line` is emitted on the `.editor` element.
+`editor:delete-to-beginning-of-line` is emitted on the `.editor` element.
 
 The second selector group also targets editors, but only if they don't have the
 `.mini` class. In this example, the commands for code folding don't really make
@@ -83,6 +83,32 @@ file. For now, we've opted to handle cases where selector ordering is critical
 by breaking the keymap into two separate files, such as `snippets-1.cson` and
 `snippets-2.cson`.
 
+## Removing Bindings
+
+When the keymap system encounters a binding with the `unset!` directive as its
+command, it will treat the current element as if it had no key bindings matching
+the current keystroke sequence and continue searching from its parent. If you
+want to remove a binding from a keymap you don't control, such as keymaps in
+Atom core or in packages, use the `unset!` directive.
+
+For example, the following code removes the keybinding for `a` in the Tree View, 
+which is normally used to trigger the `tree-view:add-file` command:
+
+```coffee
+'.tree-view':
+    'a': 'unset!'
+```
+
+![](https://cloud.githubusercontent.com/assets/38924/3174771/e7f6ce64-ebf4-11e3-922d-f280bffb3fc5.png)
+
+## Forcing Chromium's Native Keystroke Handling
+
+If you want to force the native browser behavior for a given keystroke, use the
+`native!` directive as the command of a binding. This can be useful to enable
+the correct behavior in native input elements, for example. If you apply the
+`.native-key-bindings` class to an element, all the keystrokes typically handled
+by the browser will be assigned the `native!` directive.
+
 ## Overloading Key Bindings
 
 Occasionally, it makes sense to layer multiple actions on top of the same key

docs/advanced/node-modules.md

@@ -0,0 +1,24 @@
+## Developing Node Modules
+
+Atom contains a number of packages that are Node modules instead of Atom packages. If you want to
+make changes to the Node modules, for instance `atom-keymap`, you have to link them into the
+development environment differently than you would a normal Atom package.
+
+### Linking a Node Module Into Your Atom Dev Environment
+
+Here are the steps to run a local version of a node module *not an apm* within Atom. We're using
+`atom-keymap` as an example:
+
+```bash
+$ git clone https://github.com/atom/atom-keymap.git
+$ cd atom-keymap
+$ npm install
+$ npm link
+$ apm rebuild # This is the special step, it makes the npm work with Atom's version of Node
+$ cd WHERE-YOU-CLONED-ATOM
+$ npm link atom-keymap
+$ atom # Should work!
+```
+
+After this, you'll have to `npm install` and `apm rebuild` when you make a change to the node
+module's code.

docs/advanced/serialization.md

@@ -19,7 +19,7 @@ module.exports =
   activate: (state) ->
     @myObject =
       if state
-        deserialize(state)
+        atom.deserializers.deserialize(state)
       else
         new MyObject("Hello")
 
@@ -31,7 +31,8 @@ module.exports =
 
 ```coffee-script
 class MyObject
-  registerDeserializer(this)
+  atom.deserializers.add(this)
+
   @deserialize: ({data}) -> new MyObject(data)
   constructor: (@data) ->
   serialize: -> { deserializer: 'MyObject', data: @data }
@@ -50,8 +51,8 @@ class-level method on the same class that implements `serialize`. This method's
 job is to convert a state object returned from a previous call `serialize` back
 into a genuine object.
 
-#### registerDeserializer(klass)
-You need to call the global `registerDeserializer` method with your class in
+#### atom.deserializers.add(klass)
+You need to call the `atom.deserializers.add` method with your class in
 order to make it available to the deserialization system. Now you can call the
 global `deserialize` method with state returned from `serialize`, and your
 class's `deserialize` method will be selected automatically.
@@ -60,38 +61,15 @@ class's `deserialize` method will be selected automatically.
 
 ```coffee-script
 class MyObject
+  atom.deserializers.add(this)
+
   @version: 2
   @deserialize: (state) -> ...
-  serialize: -> { version: MyObject.version, ... }
+  serialize: -> { version: @constructor.version, ... }
 ```
 
 Your serializable class can optionally have a class-level `@version` property
 and include a `version` key in its serialized state. When deserializing, Atom
 will only attempt to call deserialize if the two versions match, and otherwise
 return undefined. We plan on implementing a migration system in the future, but
-this at least protects you from improperly deserializing old state. If you find
-yourself in dire need of the migration system, let us know.
-
-### Deferred Package Deserializers
-
-If your package defers loading on startup with an `activationEvents` property in
-its `package.cson`, your deserializers won't be loaded until your package is
-activated. If you want to deserialize an object from your package on startup,
-this could be a problem.
-
-The solution is to also supply a `deferredDeserializers` array in your
-`package.cson` with the names of all your deserializers. When Atom attempts to
-deserialize some state whose `deserializer` matches one of these names, it will
-load your package first so it can register any necessary deserializers before
-proceeding.
-
-For example, the markdown preview package doesn't fully load until a preview is
-triggered. But if you refresh a window with a preview pane, it loads the
-markdown package early so Atom can deserialize the view correctly.
-
-```coffee-script
-# markdown-preview/package.cson
-'activationEvents': 'markdown-preview:toggle': '.editor'
-'deferredDeserializers': ['MarkdownPreviewView']
-...
-```
+this at least protects you from improperly deserializing old state.

docs/apm-rest-api.md

@@ -0,0 +1,271 @@
+# Atom.io package and update API
+
+This guide describes the web API used by [apm](https://github.com/atom/apm) and
+Atom. The vast majority of use cases are met by the `apm` command-line tool,
+which does other useful things like incrementing your version in `package.json`
+and making sure you have pushed your git tag. In fact, Atom itself shells out to
+`apm` rather than hitting the API directly. If you're curious about how Atom
+uses `apm`, see the [PackageManager class](https://github.com/atom/settings-view/blob/master/lib/package-manager.coffee)
+in the `settings-view` package.
+
+*This API should be considered pre-release and is subject to change (though significant breaking changes are unlikely).*
+
+### Authorization
+
+For calls to the API that require authentication, provide a valid token from your
+[Atom.io account page](https://atom.io/account) in the `Authorization` header.
+
+### Media type
+
+All requests that take parameters require `application/json`.
+
+# API Resources
+
+## Packages
+
+### Listing packages
+
+#### GET /api/packages
+
+Parameters:
+
+- **page** (optional)
+
+Returns a list of all packages in the following format:
+```json
+  [
+    {
+      "releases": {
+        "latest": "0.6.0"
+      },
+      "name": "thedaniel-test-package",
+      "repository": {
+        "type": "git",
+        "url": "https://github.com/thedaniel/test-package"
+      }
+    },
+    ...
+  ]
+```
+
+Results are paginated 30 at a time, and links to the next and last pages are
+provided in the `Link` header:
+
+```
+Link: <https://www.atom.io/api/packages?page=1>; rel="self",
+      <https://www.atom.io/api/packages?page=41>; rel="last",
+      <https://www.atom.io/api/packages?page=2>; rel="next"
+```
+
+### Showing package details
+
+#### GET /api/packages/:package_name
+
+Returns package details and versions for a single package
+
+Parameters:
+
+- **engine** (optional) - Only show packages with versions compatible with this
+  Atom version. Must be valid [SemVer](http://semver.org).
+
+Returns:
+
+```json
+  {
+    "releases": {
+      "latest": "0.6.0"
+    },
+    "name": "thedaniel-test-package",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/thedaniel/test-package"
+    },
+    "versions": [
+      (see single version output below)
+      ...,
+    ]
+  }
+```
+
+### Creating a package
+
+#### POST /api/packages
+
+Create a new package; requires authentication.
+
+The name and version will be fetched from the `package.json`
+file in the specified repository. The authenticating user *must* have access
+to the indicated repository.
+
+When a package is created, a release hook is registered with GitHub for package
+version creation.
+
+Parameters:
+
+- **repository** - String. The repository containing the plugin, in the form "owner/repo"
+
+Returns:
+
+- **201** - Successfully created, returns created package.
+- **400** - Repository is inaccessible, nonexistent, not an atom package. Possible
+  error messages include:
+  - That repo does not exist, isn't an atom package, or atombot does not have access
+  - The package.json at owner/repo isn't valid
+- **409** - A package by that name already exists
+
+### Deleting a package
+
+#### DELETE /api/packages/:package_name
+
+Delete a package; requires authentication.
+
+Returns:
+
+- **204** - Success
+- **400** - Repository is inaccessible
+- **401** - Unauthorized
+
+### Renaming a package
+
+Packages are renamed by publishing a new version with the name changed in `package.json`
+See [Creating a new package version](#creating-a-new-package-version) for details.
+
+Requests made to the previous name will forward to the new name.
+
+### Package Versions
+
+#### GET /api/packages/:package_name/versions/:version_name
+
+Returns `package.json` with `dist` key added for e.g. tarball download:
+
+```json
+  {
+    "bugs": {
+      "url": "https://github.com/thedaniel/test-package/issues"
+    },
+    "dependencies": {
+      "async": "~0.2.6",
+      "pegjs": "~0.7.0",
+      "season": "~0.13.0"
+    },
+    "description": "Expand snippets matching the current prefix with `tab`.",
+    "dist": {
+      "tarball": "https://codeload.github.com/..."
+    },
+    "engines": {
+      "atom": "*"
+    },
+    "main": "./lib/snippets",
+    "name": "thedaniel-test-package",
+    "publishConfig": {
+      "registry": "https://...",
+    },
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/thedaniel/test-package.git"
+    },
+    "version": "0.6.0"
+  }
+```
+
+
+### Creating a new package version
+
+#### POST /api/packages/:package_name/versions
+
+Creates a new package version from a git tag; requires authentication. If `rename`
+is not `true`, the `name` field in `package.json` *must* match the current package
+name.
+
+#### Parameters
+
+- **tag** - A git tag for the version you'd like to create. It's important to note
+  that the version name will not be taken from the tag, but from the `version`
+  key in the `package.json` file at that ref. The authenticating user *must* have
+  access to the package repository.
+- **rename** - Boolean indicating whether this version contains a new name for the package.
+
+#### Returns
+
+- **201** - Successfully created. Returns created version.
+- **400** - Git tag not found / Repository inaccessible / package.json invalid
+- **409** - Version exists
+
+### Deleting a version
+
+#### DELETE /api/packages/:package_name/versions/:version_name
+
+Deletes a package version; requires authentication.
+
+Note that a version cannot be republished with a different tag if it is deleted.
+If you need to delete the latest version of a package for e.g. security reasons,
+you'll need to increment the version when republishing.
+
+Returns 204 No Content
+
+
+## Stars
+
+### Listing user stars
+
+#### GET /api/users/:login/stars
+
+List a user's starred packages.
+
+Return value is similar to **GET /api/packages**
+
+#### GET /api/stars
+
+List the authenticated user's starred packages; requires authentication.
+
+Return value is similar to **GET /api/packages**
+
+### Starring a package
+
+#### POST /api/packages/:name/star
+
+Star a package; requires authentication.
+
+Returns a package.
+
+### Unstarring a package
+
+#### DELETE /api/packages/:name/star
+
+Unstar a package; requires authentication.
+
+Returns 204 No Content.
+
+### Listing a package's stargazers
+
+#### GET /api/packages/:name/stargazers
+
+List the users that have starred a package.
+
+Returns a list of user objects:
+
+```json
+[
+  {"login":"aperson"},
+  {"login":"anotherperson"},
+]
+```
+
+## Atom updates
+
+### Listing Atom updates
+
+#### GET /api/updates
+
+Atom update feed, following the format expected by [Squirrel](https://github.com/Squirrel/).
+
+Returns:
+
+```json
+{
+    "name": "0.96.0",
+    "notes": "[HTML release notes]",
+    "pub_date": "2014-05-19T15:52:06.000Z",
+    "url": "https://www.atom.io/api/updates/download"
+}
+```

docs/build-instructions/freebsd.md

@@ -0,0 +1,22 @@
+# FreeBSD
+
+FreeBSD -RELEASE 64-bit is the recommended platform.
+
+## Requirements
+
+  * FreeBSD
+  * `pkg install node`
+  * `pkg install npm`
+  * `pkg install libgnome-keyring`
+  * `npm config set python /usr/local/bin/python2 -g` to ensure that gyp uses Python 2
+
+## Instructions
+
+  ```sh
+  git clone https://github.com/atom/atom
+  cd atom
+  script/build # Creates application at $TMPDIR/atom-build/Atom
+  sudo script/grunt install # Installs command to /usr/local/bin/atom
+  ```
+
+## Troubleshooting

docs/build-instructions/linux.md

@@ -0,0 +1,78 @@
+# Linux
+
+Ubuntu LTS 12.04 64-bit is the recommended platform.
+
+## Requirements
+
+  * OS with 64-bit or 32-bit architecture
+  * C++ toolchain
+  * git
+  * [node.js](http://nodejs.org/download/) v0.10.x
+  * [npm](http://www.npmjs.org/) v1.4.x (bundled with node.js)
+    * `npm -v` to check the version.
+    * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2.
+      * You might need to run this command as `sudo`, depending on how you have set up [npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
+  * libgnome-keyring-dev
+
+### Ubuntu / Debian
+* `sudo apt-get install build-essential git libgnome-keyring-dev`
+* Instructions for  [node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
+
+### Fedora
+* `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel`
+* Instructions for [node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).
+
+### Arch
+* `sudo pacman -S base-devel git nodejs libgnome-keyring`
+* `export PYTHON=/usr/bin/python2` before building Atom.
+
+## Instructions
+
+If you have problems with permissions don't forget to prefix with `sudo`
+
+  ```sh
+  git clone https://github.com/atom/atom
+  cd atom
+  script/build # Creates application at $TMPDIR/atom-build/Atom
+  sudo script/grunt install # Installs command to /usr/local/bin/atom
+  script/grunt mkdeb # Generates a .deb package at $TMPDIR/atom-build, e.g. /tmp/atom-build
+  ```
+  
+To run `atom` and `apm` from a terminal open atom's command palette `ctrl+shift+p` and run `Window: Install Shell Commands`
+
+## Troubleshooting
+
+
+### Exception: "TypeError: Unable to watch path"
+
+If you get following error with a big traceback right after Atom starts:
+
+  ```
+  TypeError: Unable to watch path
+  ```
+
+you have to increase number of watched files by inotify.  For testing if
+this is the reason for this error you can issue
+
+  ```sh
+  sudo sysctl fs.inotify.max_user_watches=32768
+  ```
+
+and restart Atom.  If Atom now works fine, you can make this setting permanent:
+
+  ```sh
+  echo 32768 > /proc/sys/fs/inotify/max_user_watches
+  ```
+
+See also https://github.com/atom/atom/issues/2082.
+
+### /usr/bin/env: node: No such file or directory
+
+If you get this notice when attempting to `script/build`, you either do not
+have nodejs installed, or node isn't identified as nodejs on your machine.
+If it's the latter, entering `sudo ln -s /usr/bin/nodejs /usr/bin/node` into
+your terminal may fix the issue.
+
+### Linux build error reports in atom/atom
+* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Alinux&type=Issues)
+  to get a list of reports about build errors on Linux.

docs/build-instructions/os-x.md

@@ -0,0 +1,20 @@
+# OS X
+
+## Requirements
+
+  * OS X 10.8 or later
+  * [node.js](http://nodejs.org/download/) v0.10.x
+  * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (run `xcode-select --install` to install)
+
+## Instructions
+
+  ```sh
+  git clone https://github.com/atom/atom.git
+  cd atom
+  script/build # Creates application at /Applications/Atom.app
+  ```
+
+## Troubleshooting
+
+### OSX build error reports in atom/atom
+* Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Aos-x&type=Issues) to get a list of reports about build errors on OSX.

docs/build-instructions/windows.md

@@ -0,0 +1,76 @@
+# Windows
+
+## Requirements
+
+### On Windows 7
+  * [Visual C++ 2010 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4)
+  * [Visual Studio 2010 Service Pack 1](http://www.microsoft.com/en-us/download/details.aspx?id=23691)
+  * [node.js](http://nodejs.org/download/) v0.10.x
+    * For 64-bit builds of node and native modules you **must** have the
+    [Windows 7 64-bit SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279).
+    You may also need the [compiler update for the Windows SDK 7.1](http://www.microsoft.com/en-us/download/details.aspx?id=4422)
+  * [Python](http://www.python.org/download/) v2.7.
+    * The python.exe must be available at `%SystemDrive%\Python27\python.exe`.
+      If it is installed elsewhere, you can create a symbolic link to the
+      directory containing the python.exe using:
+      `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
+  * [GitHub for Windows](http://windows.github.com/)
+
+### On Windows 8
+  * [Visual Studio Express 2013 for Windows Desktop](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_2)
+  * [node.js](http://nodejs.org/download/) v0.10.x
+  * [Python](http://www.python.org/download/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp))
+  * [GitHub for Windows](http://windows.github.com/)
+
+## Instructions
+
+  ```bat
+  # Use the `Git Shell` app which was installed by GitHub for Windows. Also Make
+  # sure you have logged into the GitHub for Windows GUI App.
+  cd C:\
+  git clone https://github.com/atom/atom/
+  cd atom
+  script/build # Creates application in the `Program Files` directory
+  ```
+
+## Why do I have to use GitHub for Windows?
+
+You don't. You can use your existing Git! GitHub for Windows's Git Shell is just
+easier to set up. 
+
+If you _prefer_ using your existing Git installation, make sure git's cmd directory is in your PATH env variable (e.g. `C:\Program Files (x86)\Git\cmd`) before you open your powershell or command window.
+Note that you may have to open your command window as administrator. For powershell that doesn't seem to always be the case, though.
+
+If none of this works, do install Github for Windows and use its Git shell. Makes life easier.
+
+
+## Troubleshooting
+
+### Common Errors
+* `node is not recognized`
+
+  * If you just installed node you need to restart your computer before node is
+  available on your Path.
+
+
+* `script/build` outputs only the Node and Python versions before returning
+
+  * Try moving the repository to `C:\atom`. Most likely, the path is too long.
+    See [issue #2200](https://github.com/atom/atom/issues/2200).
+
+* `error MSB4025: The project file could not be loaded. Invalid character in the given encoding.`
+
+  * These can occur because your home directory (`%USERPROFILE%`) has non-ASCII
+    characters in it. This is a bug in [gyp](https://code.google.com/p/gyp/)
+    which is used to build native node modules and there is no known workaround.
+    * https://github.com/TooTallNate/node-gyp/issues/297
+    * https://code.google.com/p/gyp/issues/detail?id=393
+
+* Other `node-gyp` errors on first build attempt, even though the right node and python versions are installed.
+  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.
+
+
+### Windows build error reports in atom/atom
+* If all fails, use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows, and see if yours has already been reported.
+
+* If it hasn't, please open a new issue with your Windows version 32/64bit and a print/screenshot of your build output, incl. the node and python versions.

docs/building-atom.md

@@ -1,34 +0,0 @@
-## Building Atom
-
-These guide is meant only for users who wish to help develop atom core,
-if you're just interested in using atom you should just [download
-atom][download].
-
-## OSX
-
-* Use OS X 10.8 or later
-* Install the latest node 0.10.x release (32bit preferable)
-* Clone [atom][atom-git] to `~/github/atom`
-* Run `~/github/atom/script/build`
-
-## Windows
-
-* Install [Visual C++ 2010 Express][win-vs2010]
-* Install the [latest 32bit Node 0.10.x][win-node]
-* Install the [latest Python 2.7.x][win-python]
-* Install [GitHub for Windows][win-github]
-* Clone [atom/atom][atom-git] to `C:\Users\<user>\github\atom\`
-* Add `C:\Python27;C:\Program Files\nodejs;C:\Users\<user>\github\atom\node_modules\`
-  to your PATH
-* Set ATOM_ACCESS_TOKEN to your oauth2 credentials (run `security -q
-  find-generic-password -ws 'GitHub API Token'` on OSX to get your
-  credentials).
-* Use the Windows GitHub shell and cd into `C:\Users\<user>\github\atom`
-* Run `script\bootstrap`
-
-[download]: https://github.com/atom/atom/releases/latest
-[win-node]: http://nodejs.org/download/
-[win-python]: http://www.python.org/download/
-[win-github]: http://windows.github.com/
-[win-vs2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
-[atom-git]: https://github.com/atom/atom/

docs/contributing-to-packages.md

@@ -0,0 +1,52 @@
+# Contributing to Official Atom Packages
+
+If you think you know which package is causing the issue you are reporting, feel
+free to open up the issue in that specific repository instead. When in doubt
+just open the issue here but be aware that it may get closed here and reopened
+in the proper package's repository.
+
+## Hacking on Packages
+
+### Cloning
+
+The first step is creating your own clone. You can of course do this manually
+with git, or you can use the `apm develop` command to create a clone based on
+the package's `repository` field in the `package.json`.
+
+For example, if you want to make changes to the `tree-view` package, run the
+following command:
+
+```
+> apm develop tree-view
+Cloning https://github.com/atom/tree-view ✓
+Installing modules ✓
+~/.atom/dev/packages/tree-view -> ~/github/tree-view
+```
+
+This clones the `tree-view` repository to `~/github`. If you prefer a different
+path, specify it via the `ATOM_REPOS_HOME` environment variable.
+
+### Running in Development Mode
+
+Editing a package in Atom is a bit of a circular experience: you're using Atom
+to modify itself. What happens if you temporarily break something? You don't
+want the version of Atom you're using to edit to become useless in the process.
+For this reason, you'll only want to load packages in **development mode** while
+you are working on them. You'll perform your editing in **stable mode**, only
+switching to development mode to test your changes.
+
+To open a development mode window, use the "Application: Open Dev" command,
+which is normally bound to `cmd-shift-o`. You can also run dev mode from the
+command line with `atom --dev`.
+
+To load your package in development mode, create a symlink to it in
+`~/.atom/dev/packages`. This occurs automatically when you clone the package
+with `apm develop`. You can also run `apm link --dev` and `apm unlink --dev`
+from the package directory to create and remove dev-mode symlinks.
+
+### Installing Dependencies
+
+Finally, you need to install the cloned package's dependencies by running
+`apm install` within the package directory. This step is also performed
+automatically the first time you run `apm develop`, but you'll want to keep
+dependencies up to date by running `apm update` after pulling upstream changes.

docs/contributing.md

@@ -0,0 +1 @@
+../CONTRIBUTING.md

docs/converting-a-text-mate-bundle.md

@@ -0,0 +1,52 @@
+## Converting a TextMate Bundle
+
+This guide will show you how to convert a [TextMate][TextMate] bundle to an
+Atom package.
+
+Converting a TextMate bundle will allow you to use its editor preferences,
+snippets, and colorization inside Atom.
+
+### Install apm
+
+The `apm` command line utility that ships with Atom supports converting
+a TextMate bundle to an Atom package.
+
+Check that you have `apm` installed by running the following command in your
+terminal:
+
+```sh
+apm help init
+```
+
+You should see a message print out with details about the `apm init` command.
+
+If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+to install the `apm` and `atom` commands.
+
+### Convert the Package
+
+Let's convert the TextMate bundle for the [R][R] programming language. You can find other existing TextMate bundles [here][TextMateOrg].
+
+You can convert the R bundle with the following command:
+
+```sh
+apm init --package ~/.atom/packages/language-r --convert https://github.com/textmate/r.tmbundle
+```
+
+You can now browse to `~/.atom/packages/language-r` to see the converted bundle.
+
+:tada: Your new package is now ready to use, launch Atom and open a `.r` file in
+the editor to see it in action!
+
+### Further Reading
+
+* Check out [Publishing a Package](publishing-a-package.html) for more information
+  on publishing the package you just created to [atom.io][atomio].
+
+[atomio]: https://atom.io
+[CSS]: http://en.wikipedia.org/wiki/Cascading_Style_Sheets
+[LESS]: http://lesscss.org
+[plist]: http://en.wikipedia.org/wiki/Property_list
+[R]: http://en.wikipedia.org/wiki/R_(programming_language)
+[TextMate]: http://macromates.com
+[TextMateOrg]: https://github.com/textmate

docs/converting-a-text-mate-theme.md

@@ -0,0 +1,68 @@
+## Converting a TextMate Theme
+
+This guide will show you how to convert a [TextMate][TextMate] theme to an Atom
+theme.
+
+### Differences
+
+TextMate themes use [plist][plist] files while Atom themes use [CSS][CSS] or
+[LESS][LESS] to style the UI and syntax in the editor.
+
+The utility that converts the theme first parses the theme's plist file and
+then creates comparable CSS rules and properties that will style Atom similarly.
+
+### Install apm
+
+The `apm` command line utility that ships with Atom supports converting
+a TextMate theme to an Atom theme.
+
+Check that you have `apm` installed by running the following command in your
+terminal:
+
+```sh
+apm help init
+```
+
+You should see a message print out with details about the `apm init` command.
+
+If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+to install the `apm` and `atom` commands.
+
+You can now run `apm help init` to see all the options for initializing new
+packages and themes.
+
+### Convert the Theme
+
+Download the theme you wish to convert, you can browse existing TextMate themes
+[here][TextMateThemes].
+
+Now, let's say you've downloaded the theme to `~/Downloads/MyTheme.tmTheme`,
+you can convert the theme with the following command:
+
+```sh
+apm init --theme ~/.atom/packages/my-theme --convert ~/Downloads/MyTheme.tmTheme
+```
+
+You can browse to `~/.atom/packages/my-theme` to see the converted theme.
+
+### Activate the Theme
+
+Now that your theme is installed to `~/.atom/packages` you can enable it
+by launching Atom and selecting the _Atom > Preferences..._ menu.
+
+Select the _Themes_ link on the left side and choose _My Theme_ from the
+__Syntax Theme__ dropdown menu to enable your new theme.
+
+:tada: Your theme is now enabled, open an editor to see it in action!
+
+### Further Reading
+
+* Check out [Publishing a Package](publishing-a-package.html) for more information
+  on publishing the theme you just created to [atom.io][atomio].
+
+[atomio]: https://atom.io
+[CSS]: http://en.wikipedia.org/wiki/Cascading_Style_Sheets
+[LESS]: http://lesscss.org
+[plist]: http://en.wikipedia.org/wiki/Property_list
+[TextMate]: http://macromates.com
+[TextMateThemes]: http://wiki.macromates.com/Themes/UserSubmittedThemes

docs/creating-a-package.md

@@ -24,6 +24,9 @@ Not every package will have (or need) all of these directories.
 
 We have [a tutorial on creating your first package][first-package].
 
+There are also guides for converting [TextMate bundles][convert-bundle] and
+[TextMate themes][convert-theme] so they work in Atom.
+
 ## package.json
 
 Similar to [npm packages][npm], Atom packages contain a _package.json_ file
@@ -127,7 +130,7 @@ Ideally, you won't need much in the way of styling. We've provided a standard
 set of components which define both the colors and UI elements for any package
 that fits into Atom seamlessly. You can view all of Atom's UI components by opening
 the styleguide: open the command palette (`cmd-shift-P`) and search for _styleguide_,
-or just type `cmd-ctrl-G`.
+or just type `cmd-ctrl-shift-G`.
 
 If you _do_ need special styling, try to keep only structural styles in the package
 stylesheets. If you _must_ specify colors and sizing, these should be taken from
@@ -222,6 +225,21 @@ elements until reaching the top of the DOM tree.
 In the example above, the `Add file` item will only appear when the focused item
 or one of its parents has the `tree-view` class applied to it.
 
+You can also add separators and submenus to your context menus. To add a
+submenu, pass in another object instead of a command. To add a separator, use
+`-` for the command of the item.
+
+```coffeescript
+'context-menu':
+  '.workspace':
+    'Inspect Element': 'core:inspect'
+    'Separator': '-'
+    'Text':
+      'Select All': 'core:select-all'
+      'Another Separator': '-'
+      'Deleted Selected Text': 'core:delete'
+```
+
 ## Snippets
 
 An extension can supply language snippets in the _snippets_ directory which
@@ -322,27 +340,20 @@ Your package **should** have tests, and if they're placed in the _spec_
 directory, they can be run by Atom.
 
 Under the hood, [Jasmine] executes your tests, so you can assume that any DSL
-available there is available to your package as well.
-
-**FIXME: Explain the following**
-
-* jasmine
-* jasmine-focused
-* `spec/fixtures` and global.project
-* setTimeout
-* whatever else is different in spec-helper
+available there is also available to your package.
 
 ## Running Tests
 
-TODO: Probably use the menu option now.
+Once you've got your test suite written, you can run it by pressing
+`cmd-alt-ctrl-p` or via the _Developer > Run Package Specs_ menu.
 
-Once you've got your test suite written, the recommended way to run it is `apm
-test`. `apm test` prints its output to the console and returns the proper status
-code depending on whether tests passed or failed.
+You can also use the `apm test` command to run them from the command line. It
+prints the test output and results to the console and returns the proper status
+code depending on whether the tests passed or failed.
 
 ## Publishing
 
-Atom bundles a command line utility called [apm] which can be used to publish
+Atom bundles a command line utility called apm which can be used to publish
 Atom packages to the public registry.
 
 Once your package is written and ready for distribution you can run the
@@ -360,25 +371,11 @@ registry.
 Run `apm help publish` to see all the available options and `apm help` to see
 all the other available commands.
 
-## Included Libraries
-
-FIXME: Describe `require 'atom'
-
-In addition to core node.js modules, all packages can `require` the following
-popular libraries into their packages:
-
-* [SpacePen] (as `require 'space-pen'`)
-* [jQuery] (as `require 'jquery'`)
-* [Underscore] (as `require 'underscore'`)
-
-Additional libraries can be found by browsing Atom's *node_modules* folder.
-
 [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
@@ -388,8 +385,10 @@ Additional libraries can be found by browsing Atom's *node_modules* folder.
 [path]: http://nodejs.org/docs/latest/api/path.html
 [jquery]: http://jquery.com/
 [underscore]: http://underscorejs.org/
-[jasmine]: https://github.com/pivotal/jasmine
+[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/creating-a-theme.md

@@ -1,124 +1,134 @@
 # Creating a Theme
 
 Atom's interface is rendered using HTML, and it's styled via [LESS] (a superset
-of CSS). Don't worry if you haven't heard of LESS before; it's just like CSS, but
-with a few handy extensions.
+of CSS). Don't worry if you haven't heard of LESS before; it's just like CSS,
+but with a few handy extensions.
 
-Since CSS is the basis of the theming system, we can load multiple themes within
-Atom, and the themes behave just as they would on a website. Themes loaded first
-are overridden by themes which are loaded later. The order of theme loading is
-controlled within the Settings/Themes pane.
+Atom supports two types of themes: _UI_ and _syntax_.  UI themes style
+elements such as the tree view, the tabs, drop-down lists, and the status bar.
+Syntax themes style the code inside the editor.
 
-This flexibility is helpful for users that prefer a light interface with a dark
-syntax theme. Atom currently has only interface and syntax themes, but it is
-possible to create a theme to style something specific — say, changing
-the colors in the tree view or creating a language specific syntax theme.
+Themes can be installed and changed from the settings view which you can open
+by selecting the _Atom > Preferences..._ menu and navigating to the _Themes_
+section on the left hand side.
 
 ## Getting Started
 
-Themes are pretty straight forward but it's still helpful to be familiar with
+Themes are pretty straightforward but it's still helpful to be familiar with
 a few things before starting:
 
 * LESS is a superset of CSS, but it has some really handy features like
-  variables. If you aren't familiar with its syntax take a few minutes
+  variables. If you aren't familiar with its syntax, take a few minutes
   to [familiarize yourself][less-tutorial].
 * You may also want to review the concept of a _[package.json]_, too. This file
-is used to help distribute your theme to Atom users.
-
-There are two types of themes you can create: syntax themes and interface themes.
-The differences between them are simply a matter of what they target and what
-they provide. Syntax themes focus on the entire editor pane, while interface themes
-target elements which are outside of the editor.
+  is used to help distribute your theme to Atom users.
+* Your theme's _package.json_ must contain a `"theme"` key with a value
+  of `"ui"` or `"syntax"` for Atom to recognize and load it as a theme.
+* You can find existing themes to install or fork on [atom.io](atomio).
 
 ## Creating a Syntax Theme
 
 Let's create your first theme.
 
-To get started, hit `cmd-shift-P`, and start typing "Generate Theme" to generate
-a package. Select "Generate Theme," and you'll be asked for a theme name. Let's
-call ours _motif_.
+To get started, hit `cmd-shift-P`, and start typing "Generate Syntax Theme" to
+generate a new theme package. Select "Generate Syntax Theme," and you'll be
+asked for the path where your theme will be created. Let's call ours
+_motif-syntax_. __Tip:__ syntax themes should end with _-syntax_.
 
-Atom will pop open a new window, showing the _motif_ theme, with a default set of
-folders and files created for us. If you hit `cmd-,` and navigate to the Themes
-menu option, you'll see the `motif` theme already available. Drag it over from
-"Enabled Themes" to "Available Themes."
+Atom will pop open a new window, showing the _motif-syntax_ theme, with a
+default set of folders and files created for us. If you open the settings view
+(`cmd-,`) and navigate to the _Themes_ section on the left, you'll see the
+_Motif_ theme listed in the _Syntax Theme_ drop-down. Select it from the menu to
+activate it, now when you open an editor you should see that your new
+_motif-syntax_ theme in action.
 
 Open up _stylesheets/colors.less_ to change the various colors variables which
 have been already been defined. For example, turn `@red` into `#f4c2c1`.
 
-Then, open _stylesheets/base.less_, and modify the various syntax CSS selectors
-that have been already been defined. Each of these selectors represents a different
-part of the Atom window. Themes that don't need to modify a particular region
-can simply remove the selectors they don't need.
+Then open _stylesheets/base.less_ and modify the various selectors that have
+been already been defined. These selectors style different parts of code in the
+editor such as comments, strings and the line numbers in the gutter.
 
 As an example, let's make the `.gutter` `background-color` into `@red`.
 
-Reload Atom by hitting `cmd-r` to see the changes you made reflected in your Atom
-window. Pretty neat!
+Reload Atom by pressing `cmd-alt-ctrl-l` to see the changes you made reflected
+in your Atom window. Pretty neat!
+
+__Tip:__ You can avoid reloading to see changes you make by opening an atom
+window in dev mode. To open a Dev Mode Atom window run `atom --dev .` in the
+terminal, use `cmd-shift-o` or use the _View > Developer > Open in Dev Mode_
+menu. When you edit your theme, changes will instantly be reflected!
 
 ## Creating an Interface Theme
 
-Interface themes  **must** provide a `ui-variables.less` file which contains all
+Interface themes **must** provide a `ui-variables.less` file which contains all
 of the variables provided by the [core themes][ui-variables].
 
 To create an interface UI theme, do the following:
 
-1. Fork one of the following repos
-  1. [atom-dark-ui]
-  1. [atom-light-ui]
-1. Open a terminal in the forked theme's directory
-1. Open your new theme in a Dev Mode Atom window (run `atom -d .` in the terminal or use the __View > Developer > Open in Dev Mode__ menu)
-1. Change the name of the theme in the theme's `package.json` file
-1. Run `apm link` to tell Atom about your new theme
-1. Reload Atom (`cmd-r`)
-1. Enable the theme via the themes panel in settings
-1. Make changes! Since you opened the theme in a Dev Mode window, changes will
+1. Fork one of the following repositories:
+  * [atom-dark-ui]
+  * [atom-light-ui]
+2. Clone the forked repository to the local filesystem
+3. Open a terminal in the forked theme's directory
+4. Open your new theme in a Dev Mode Atom window run `atom --dev .` in the
+   terminal or use the _View > Developer > Open in Dev Mode_ menu
+5. Change the name of the theme in the theme's `package.json` file
+6. Name your theme end with a `-ui`. i.e. `super-white-ui`
+7. Run `apm link` to symlink your repository to `~/.atom/packages`
+8. Reload Atom using `cmd-alt-ctrl-L`
+9. Enable the theme via _UI Theme_ drop-down in the _Themes_ section of the
+   settings view
+10. Make changes! Since you opened the theme in a Dev Mode window, changes will
    be instantly reflected in the editor without having to reload.
 
 ## Development workflow
 
-There are a few of tools to help make theme development faster.
+There are a few of tools to help make theme development faster and easier.
 
 ### Live Reload
 
-Reloading by hitting `cmd-r` after you make changes to your theme is less than ideal.
-Atom supports [live updating][livereload] of styles on Dev Mode Atom windows.
+Reloading by hitting `cmd-alt-ctrl-L` after you make changes to your theme is
+less than ideal. Atom supports [live updating][livereload] of styles on Dev Mode
+Atom windows.
 
 To enable a Dev Mode window:
 
 1. Open your theme directory in a dev window by either going to the
-__View > Developer > Open in Dev Mode__ menu or by hitting the `cmd-shift-o`
-shortcut
-1. Make a change to your theme file and save it. Your change should be
-immediately applied!
+   __View > Developer > Open in Dev Mode__ menu or by hitting the `cmd-shift-o`
+  shortcut
+2. Make a change to your theme file and save it. Your change should be
+   immediately applied!
 
 If you'd like to reload all the styles at any time, you can use the shortcut
-`cmd-ctrl-R`.
+`cmd-ctrl-shift-r`.
 
 ### Developer Tools
 
 Atom is based on the Chrome browser, and supports Chrome's Developer Tools. You
-can open them by selecting the __View > Toggle Developer Tools__ menu, or by using
-the `cmd-option-i` shortcut.
+can open them by selecting the _View > Toggle Developer Tools_ menu, or by
+using the `cmd-alt-i` shortcut.
 
 The dev tools allow you to inspect elements and take a look at their CSS
 properties.
 
 ![devtools-img]
 
-Check out Google's [extensive tutorial][devtools-tutorial] for a short introduction.
+Check out Google's [extensive tutorial][devtools-tutorial] for a short
+introduction.
 
 ### Atom Styleguide
 
 If you are creating an interface theme, you'll want a way to see how your theme
-changes affect all the components in the system. The [styleguide] is a page with
-every component Atom supports rendered.
+changes affect all the components in the system. The [styleguide] is a page that
+renders every component Atom supports.
 
 To open the styleguide, open the command palette (`cmd-shift-P`) and search for
 _styleguide_, or use the shortcut `cmd-ctrl-shift-g`.
 
 ![styleguide-img]
 
+[atomio]: http://atom.io/packages
 [less]: http://lesscss.org/
 [git]: http://git-scm.com/
 [atom]: https://atom.io/

docs/customizing-atom.md

@@ -1,34 +1,57 @@
 # Customizing Atom
 
 To change a setting, configure a theme, or install a package just open the
-Settings pane in the current window by pressing `cmd+,`.
+Settings view in the current window by pressing `cmd-,`.
 
 ## Changing The Theme
 
-Because Atom themes are based on CSS, it's possible (and encouraged) to have
-multiple themes active at the same time. Atom comes with both light and dark
-interface themes as well as several syntax themes (you can also [create your
-own][create-theme]).
+Atom comes with both light and dark UI themes as well as several syntax themes.
+You are also encouraged to [create or fork][create-theme] your own theme.
 
-To change the active themes just open the Settings pane (`cmd-,`) and select the
-`Themes` tab. You can install non-bundled themes by going to the `Available
-Themes` section on the `Packages` tab within the Settings panel.
+To change the active theme just open the Settings view (`cmd-,`) and select the
+`Themes` section from the left hand side. You will see a drop-down menu to
+change the active _Syntax_ and _UI_ themes.
+
+You can also install more themes from here by browsing the featured themes or
+searching for a specific theme.
 
 ## Installing Packages
 
-You can install non-bundled packages by going to the `Available Packages`
-section on the `Packages` tab within the Settings panel (`cmd-,`).
+You can install non-bundled packages by going to the `Packages` section on left
+hand side of the Settings view (`cmd-,`). You will see several featured packages
+and you can also search for packages from here. The packages listed here have
+been published to [atom.io](http://atom.io/packages) which is the official
+registry for Atom packages.
 
-You can also install packages from the command line using the
-[apm](https://github.com/atom/apm) command:
+You can also install packages from the command line using `apm`.
 
-`apm install <package_name>` to install the latest version.
+Check that you have `apm` installed by running the following command in your
+terminal:
 
-`apm install <package_name>@<package_version>` to install a specific version.
+```sh
+apm help install
+```
+
+You should see a message print out with details about the `apm install` command.
+
+If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+to install the `apm` and `atom` commands.
+
+You can also install packages by using the `apm install` command:
+
+* `apm install <package_name>` to install the latest version.
+
+* `apm install <package_name>@<package_version>` to install a specific version.
 
 For example `apm install emmet@0.1.5` installs the `0.1.5` release of the
 [Emmet](https://github.com/atom/emmet) package into `~/.atom/packages`.
 
+You can also use `apm` to find new packages to install:
+
+* `apm search coffee` to search for CoffeeScript packages.
+
+* `apm view emmet` to see more information about a specific package.
+
 ## Customizing Key Bindings
 
 Atom keymaps work similarly to stylesheets. Just as stylesheets use selectors
@@ -36,13 +59,12 @@ to apply styles to elements, Atom keymaps use selectors to associate keystrokes
 with events in specific contexts. Here's a small example, excerpted from Atom's
 built-in keymaps:
 
-```coffee-script
+```coffee
 '.editor':
   'enter': 'editor:newline'
 
-'body':
-  'ctrl-P': 'core:move-up'
-  'ctrl-p': 'core:move-down'
+'.mini.editor input':
+  'enter': 'core:confirm'
 ```
 
 This keymap defines the meaning of `enter` in two different contexts. In a
@@ -55,6 +77,8 @@ By default, `~/.atom/keymap.cson` is loaded when Atom is started. It will always
 be loaded last, giving you the chance to override bindings that are defined by
 Atom's core keymaps or third-party packages.
 
+You can open this file in an editor from the _Atom > Open Your Keymap_ menu.
+
 You'll want to know all the commands available to you. Open the Settings panel
 (`cmd-,`) and select the _Keybindings_ tab. It will show you all the keybindings
 currently in use.
@@ -62,18 +86,20 @@ currently in use.
 ## Advanced Configuration
 
 Atom loads configuration settings from the `config.cson` file in your _~/.atom_
-directory, which contains CoffeeScript-style JSON:
+directory, which contains [CoffeeScript-style JSON][CSON] (CSON):
 
-```coffeescript
-core:
-  excludeVcsIgnoredPaths: true
-editor:
-  fontSize: 18
+```coffee
+'core':
+  'excludeVcsIgnoredPaths': true
+'editor':
+  'fontSize': 18
 ```
 
 The configuration itself is grouped by the package name or one of the two core
 namespaces: `core` and `editor`.
 
+You can open this file in an editor from the _Atom > Open Your Config_ menu.
+
 ### Configuration Key Reference
 
 - `core`
@@ -84,7 +110,6 @@ namespaces: `core` and `editor`.
   - `themes`: An array of theme names to load, in cascading order
 - `editor`
   - `autoIndent`: Enable/disable basic auto-indent (defaults to `true`)
-  - `autoIndentOnPaste`: Enable/disable auto-indented pasted text (defaults to `false`)
   - `nonWordCharacters`: A string of non-word characters to define word boundaries
   - `fontSize`: The editor font size
   - `fontFamily`: The editor font family
@@ -108,36 +133,53 @@ namespaces: `core` and `editor`.
   - `removeTrailingWhitespace`: Enable/disable striping of whitespace at the end of lines (defaults to `true`)
 - `wrap-guide`
   - `columns`: Array of hashes with a `pattern` and `column` key to match the
-             the path of the current editor to a column position.
+     the path of the current editor to a column position.
 
 ### Quick Personal Hacks
 
-### user.coffee
+### init.coffee
 
-When Atom finishes loading, it will evaluate _user.coffee_ in your _~/.atom_
-directory, giving you a chance to run arbitrary personal CoffeeScript code to
+When Atom finishes loading, it will evaluate _init.coffee_ in your _~/.atom_
+directory, giving you a chance to run arbitrary personal [CoffeeScript][] code to
 make customizations. You have full access to Atom's API from code in this file.
-If customizations become extensive, consider [creating a
-package][create-a-package].
+If customizations become extensive, consider [creating a package][creating-a-package].
 
-### styles.css
+You can open this file in an editor from the _Atom > Open Your Init Script_
+menu.
+
+For example, if you have the Audio Beep configuration setting enabled, you
+could add the following code to your _~/.atom/init.coffee_ file to have Atom
+greet you with an audio beep every time it loads:
+
+```coffee
+atom.beep()
+```
+
+This file can also be named _init.js_ and contain JavaScript code.
+
+### styles.less
 
 If you want to apply quick-and-dirty personal styling changes without creating
-an entire theme that you intend to distribute, you can add styles to
-_styles.css_ in your _~/.atom_ directory.
+an entire theme that you intend to publish, you can add styles to the
+_styles.less_ file in your _~/.atom_ directory.
 
-For example, to change the color of the highlighted line number for the line
-that contains the cursor, you could add the following style to _styles.css_:
+You can open this file in an editor from the _Atom > Open Your Stylesheet_ menu.
 
-```css
-.editor .cursor {
+For example, to change the color of the cursor, you could add the following
+rule to your _~/.atom/styles.less_ file:
+
+```less
+.editor.is-focused .cursor {
   border-color: pink;
 }
 ```
 
-You can also name the file _styles.less_ if you want to style Atom using
-[LESS][LESS].
+Unfamiliar with LESS? Read more about it [here][LESS].
 
-[create-a-package]: creating-packages.md
+This file can also be named _styles.css_ and contain CSS.
+
+[creating-a-package]: creating-a-package.md
 [create-theme]: creating-a-theme.md
 [LESS]: http://www.lesscss.org
+[CSON]: https://github.com/atom/season
+[CoffeeScript]: http://coffeescript.org/

docs/debugging.md

@@ -0,0 +1,107 @@
+# Debugging
+
+Atom provides several tools to help you understand unexpected behavior and debug problems. This guide describes some of those tools and a few approaches to help you debug and provide more helpful information when [submitting issues]:
+
+* [Update to the latest version](#update-to-the-latest-version)
+* [Check Atom and package settings](#check-atom-and-package-settings) 
+* [Check the keybindings](#check-the-keybindings)
+* [Check if the problem shows up in safe mode](#check-if-the-problem-shows-up-in-safe-mode)
+* [Check your config files](#check-your-config-files)
+* [Check for errors in the developer tools](#check-for-errors-in-the-developer-tools)
+
+## Update to the latest version
+
+You might be running into an issue which was already fixed in a more recent version of Atom than the one you're using.
+
+If you're building Atom from source, pull down the latest version of master and [re-build][building atom].
+
+If you're using released version, check which version of Atom you're using:
+
+```shell
+$ atom --version
+0.99.0
+```
+
+Head on over to the [list of releases][atom releases] and see if there's a more recent release. You can update to the most recent release by downloading Atom from the releases page, or with the in-app auto-updater. The in-app auto-updater checks for and downloads a new version after you restart Atom, or if you use the Atom > Check for Update menu option.
+
+## Check Atom and package settings
+
+In some cases, unexpected behavior might be caused by misconfigured or unconfigured settings in Atom or in one of the packages.
+
+Open Atom's Settings View with `cmd-,` or the Atom > Preferences menu option.
+
+![Settings View]
+
+Check Atom's settings in the Settings pane, there's a description of each configuration option [here][customizing guide]. For example, if you want Atom to use hard tabs (real tabs) and not soft tabs (spaces), disable the "Soft Tabs" option.
+
+Since Atom ships with a set of packages and you can install additional packages yourself, check the list of packages and their settings. For example, if you'd like to get rid of the vertical line in the middle of the editor, disable the [Wrap Guide package]. And if you don't like it when Atom strips trailing whitespace or ensures that there's a single trailing newline in the file, you can configure that in the [Whitespace packages'][whitespace package] settings.
+
+![Package Settings]
+
+## Check the keybindings
+
+If a command is not executing when you hit a keystroke or the wrong command is executing, there might be an issue with the keybindings for that keystroke. Atom ships with the [Keybinding resolver][keybinding resolver package], a neat package which helps you understand which keybindings are executed.
+
+Show the keybinding resolver with <code>cmd-.</code> or with "Key Binding Resolver: Show" from the Command palette. With the keybinding resolver shown, hit a keystroke:
+
+![Keybinding Resolver]
+
+The keybinding resolver shows you a list of keybindings that exist for the keystroke, where each item in the list has the following:
+* the command for the keybinding,
+* the CSS selector used to define the context in which the keybinding is valid, and
+* the file in which the keybinding is defined.
+
+Of all the keybinding that are listed (grey color), at most one keybinding is matched and executed (green color). If the command you wanted to trigger isn't listed, then a keybinding for that command hasn't been defined. More keybindings are provided by [packages] and you can [define your own keybindings][customizing keybindings].
+
+If multiple keybindings are matched, Atom determines which keybinding will be executed based on the [specificity of the selectors and the order in which they were loaded][specificity and order]. If the command you wanted to trigger is listed in the Keybinding resolver, but wasn't the one that was executed, this is normally explained by one of two causes:
+* the keystroke was not used in the context defined by the keybinding's selector. For example, you can't trigger the "Tree View: Add File" command if the Tree View is not focused, or
+* there is another keybinding that took precedence. This often happens when you install a package which defines keybinding that conflict with existing keybindings. If the package's keybindings have selectors with higher specificity or were loaded later, they'll have priority over existing ones.
+
+Atom loads core Atom keybindings and package keybindings first, and user-defined keybindings after last. Since user-defined keybindings are loaded last, you can use your `keymap.cson` file to tweak the keybindings and sort out problems like these. For example, you can remove keybindings with [the `unset!` directive][unset directive].
+
+If you notice that a package's keybindings are taking precedence over core Atom keybindings, it might be a good idea to report the issue on the package's GitHub repository.
+
+## Check if the problem shows up in safe mode
+
+A large part of Atom's functionality comes from packages you can install. In some cases, these packages might be causing unexpected behavior, problems, or performance issues.
+
+To determine if a package you installed is causing problems, start Atom from the terminal in safe mode:
+
+```
+$ atom --safe
+```
+
+This starts Atom, but does not load packages from `~/.atom/packages` or `~/.atom/dev/packages`. If you can no longer reproduce the problem in safe mode, it's likely it was caused by one of the packages.
+
+To figure out which package is causing trouble, start Atom normally again and open Settings (`cmd-,`). Since Settings allow you to disable each installed package, you can disable packages one by one until you can no longer reproduce the issue. Restart (`cmd-q`) or reload (`cmd-ctrl-alt-l`) Atom after you disable each package to make sure it's completely gone.
+
+When you find the problematic package, you can disable or uninstall the package, and consider creating an issue on the package's GitHub repository.
+
+## Check your config files
+
+You might have defined some custom functionality or styles in Atom's [Init script or Stylesheet]. In some situations, these personal hacks might be causing problems so try clearing those files and restarting Atom.
+
+## Check for errors in the developer tools
+
+When an error is thrown in Atom, the developer tools are automatically shown with the error logged in the Console tab. However, if the dev tools are open before the error is triggered, a full stack trace for the error will be logged:
+
+![devtools error]
+
+If you can reproduce the error, use this approach to get the full stack trace. The stack trace might point to a problem in your [Init script][init script or stylesheet] or a specific package you installed, which you can then disable and report an issue on its GitHub repository.
+
+[submitting issues]: https://github.com/atom/atom/blob/master/CONTRIBUTING.md#submitting-issues
+[building atom]: https://github.com/atom/atom#building
+[atom releases]: https://github.com/atom/atom/releases
+[customizing guide]: https://atom.io/docs/latest/customizing-atom#configuration-key-reference
+[settings view]: https://f.cloud.github.com/assets/671378/2241795/ba4827d8-9ce4-11e3-93a8-6666ee100917.png
+[package settings]: https://cloud.githubusercontent.com/assets/38924/3173588/7e5f6b0c-ebe8-11e3-9ec3-e8d140967e79.png
+[wrap guide package]: https://atom.io/packages/wrap-guide
+[whitespace package]: https://atom.io/packages/whitespace
+[keybinding resolver package]: https://atom.io/packages/keybinding-resolver
+[keybinding resolver]: https://f.cloud.github.com/assets/671378/2241702/5dd5a102-9cde-11e3-9e3f-1d999930492f.png
+[customizing keybindings]: https://atom.io/docs/latest/customizing-atom#customizing-key-bindings
+[packages]: https://atom.io/packages
+[specificity and order]: https://atom.io/docs/latest/advanced/keymaps#specificity-and-cascade-order
+[unset directive]:  https://atom.io/docs/latest/advanced/keymaps#removing-bindings
+[init script or stylesheet]: https://atom.io/docs/latest/customizing-atom#quick-personal-hacks
+[devtools error]: https://cloud.githubusercontent.com/assets/38924/3177710/11b4e510-ec13-11e3-96db-a2e8a7891773.png

docs/getting-started.md

@@ -22,7 +22,7 @@ bindings][key-bindings] section.
 Atom windows are scoped to a single directory on disk. If you launch Atom from
 the command line via the `atom` command and don't specify a path, Atom opens a
 window for the current working directory. The current window's directory will be
-visible as the root of the tree view at the left, and also serve as the context
+visible as the root of the tree view on the left, and also serve as the context
 for all file-related operations.
 
 #### Finding Files
@@ -30,7 +30,8 @@ for all file-related operations.
 The fastest way to find a file is to use the fuzzy finder. Press `cmd-t` and
 begin typing the name of the file you're looking for. If you are looking for a
 file that is already open press `cmd-b` to bring up a searchable list of open
-files.
+files. If you are using Git you can use `cmd-shift-b` to search the list of
+files modified and untracked in your project's repository.
 
 You can also use the tree view to navigate to a file. To open and focus the
 the tree view, press `ctrl-0`. The tree view can be toggled open and closed with
@@ -38,11 +39,10 @@ the tree view, press `ctrl-0`. The tree view can be toggled open and closed with
 
 #### Adding, Moving, Deleting Files
 
-Currently, all file modification is performed via the tree view. Add, move, or
-delete a file by right-clicking in the tree view and selecting the desired
-operation from the context menu. You can also perform these operations from the
-keyboard by selecting a file or directory and using `a` to add, `m` to move, and
-`delete` to delete.
+You can add, move, and delete files and folders by right-clicking them in the
+tree view and selecting the desired operation from the context menu. You can
+also perform these operations from the keyboard by selecting a file or folder
+and using `a` to add, `m` to move, and `delete` to delete.
 
 ### Searching
 
@@ -58,17 +58,23 @@ list of all symbols in the current file, which you can fuzzy filter similarly to
 `cmd-t`.
 
 To search for symbols across your project, use `cmd-shift-r`. First you'll need
-to make sure you have ctags installed and a tags file generated for your
-project. Also, if you're editing CoffeeScript, it's a good idea to update your
-`~/.ctags` file to understand the language. Here is [a good example][ctags].
+to make sure you have `tags` (or `TAGS`) file generated for your project.
+This can be done by installing [ctags](http://ctags.sourceforge.net/) and
+running a command such as `ctags -R src/` from the command line in your
+project's root directory. Using [Homebrew](http://brew.sh/)? Just run
+`brew install ctags`.
+
+You can customize how tags are generated by creating your own `.ctags` file
+in your home directory (`~/.ctags`). Here is [a good example][ctags] to start
+from.
 
 ### Split Panes
 
 You can split any editor pane horizontally or vertically by using `cmd-k right`
 or `cmd-k down`. Once you have a split pane, you can move focus between them
 with `cmd-k cmd-right` or `cmd-k cmd-down`. To close a pane, close all its
-editors with `meta-w`, then press `meta-w` one more time to close the pane. You
-can configure panes to auto-close with empty in the preferences.
+editors with `cmd-w`, then press `cmd-w` one more time to close the pane. You
+can configure panes to auto-close when empty in the Settings view.
 
 ### Folding
 
@@ -89,9 +95,8 @@ in preferences.
 
 ## Configuration
 
-Press `cmd-,` to display the preferences pane. This serves as the primary
-interface for adjusting config settings, installing packages and changing
-themes.
+Press `cmd-,` to open the Settings view. This is the place to change settings,
+install packages, and change the theme.
 
 For more advanced configuration see the [customization guide][customization].
 
@@ -101,4 +106,4 @@ For more advanced configuration see the [customization guide][customization].
 [customization]: customizing-atom.md
 [key-bindings]: customizing-atom.md#customizing-key-bindings
 [command palette]: https://f.cloud.github.com/assets/1424/1091618/ee7c3554-166a-11e3-9955-aaa61bb5509c.png
-[ctags]: https://github.com/kevinsawicki/dotfiles/blob/master/.ctags
+[ctags]: https://github.com/atom/symbols-view/blob/master/lib/.ctags

docs/index.md

@@ -4,10 +4,17 @@
 * [Customizing Atom](customizing-atom.md)
 * [Creating a Package](creating-a-package.md)
 * [Creating a Theme](creating-a-theme.md)
+* [Publishing a Package](publishing-a-package.md)
+* [Writing Specs](writing-specs.md)
+* [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
+* [Converting a TextMate Theme](converting-a-text-mate-theme.md)
+* [Contributing](contributing.md)
+* [Debugging](debugging.md)
 
 ### Advanced Topics
 
 * [Configuration](advanced/configuration.md)
+* [Developing Node Modules](advanced/node-modules.md)
 * [Keymaps](advanced/keymaps.md)
 * [Serialization](advanced/serialization.md)
 * [View System](advanced/view-system.md)

docs/proposals/atom-docs.md

@@ -1,63 +0,0 @@
-## Atom Documentation Format
-
-This document describes our documentation format, which is markdown with
-a few rules.
-
-### Philosophy
-
-1. Method and argument names **should** clearly communicate its use.
-1. Use documentation to enhance and not correct method/argument names.
-
-#### Basic
-
-In some cases all that's required is a single line. **Do not** feel
-obligated to write more because we have a format.
-
-```markdown
-# Private: Returns the number of pixels from the top of the screen.
-```
-
-* **Each method should declare whether it's public or private by using `Public:`
-or `Private:`** prefix.
-* Following the colon, there should be a short description (that isn't redundant with the
-method name).
-* Documentation should be hard wrapped to 80 columns.
-
-### Public vs Private
-
-If a method is public it can be used by other classes (and possibly by
-the public API). The appropriate steps should be taken to minimize the impact
-when changing public methods. In some cases that might mean adding an
-appropriate release note. In other cases it might mean doing the legwork to
-ensure all affected packages are updated.
-
-#### Complex
-
-For complex methods it's necessary to explain exactly what arguments
-are required and how different inputs effect the operation of the
-function.
-
-The idea is to communicate things that the API user might not know about,
-so repeating information that can be gleaned from the method or argument names
-is not useful.
-
-```markdown
-# Private: Determine the accelerator for a given command.
-#
-# * command:
-#   The name of the command.
-# * keystrokesByCommand:
-#   An {Object} whose keys are commands and the values are Arrays containing
-#   the keystrokes.
-# * options:
-#     + accelerators:
-#       Boolean to determine whether accelerators should be shown.
-#
-# Returns a String containing the keystroke in a format that can be interpreted
-# by atom shell to provide nice icons where available.
-#
-# Raises an Exception if no window is available.
-```
-
-* Use curly brackets `{}` to provide links to other classes.
-* Use `+` for the options list.

docs/publishing-a-package.md

@@ -0,0 +1,114 @@
+## Publishing a Package
+
+This guide will show you how to publish a package or theme to the
+[atom.io][atomio] package registry.
+
+Publishing a package allows other people to install it and use it in Atom. It
+is a great way to share what you've made and get feedback and contributions from
+others.
+
+This guide assumes your package's name is `my-package` but you should pick a
+better name.
+
+### Install apm
+
+The `apm` command line utility that ships with Atom supports publishing packages
+to the atom.io registry.
+
+Check that you have `apm` installed by running the following command in your
+terminal:
+
+```sh
+apm help publish
+```
+
+You should see a message print out with details about the `apm publish` command.
+
+If you do not, launch Atom and run the _Atom > Install Shell Commands_ menu
+to install the `apm` and `atom` commands.
+
+### Prepare Your Package
+
+If you've followed the steps in the [your first package][your-first-package]
+doc then you should be ready to publish and you can skip to the next step.
+
+If not, there are a few things you should check before publishing:
+
+  * Your *package.json* file has `name`, `description`, and `repository` fields.
+  * Your *package.json* file has a `version` field with a value of  `"0.0.0"`.
+  * Your *package.json* file has an `engines` field that contains an entry
+    for Atom such as: `"engines": {"atom": ">=0.50.0"}`.
+  * Your package has a `README.md` file at the root.
+  * Your package is in a Git repository that has been pushed to
+    [GitHub][github]. Follow [this guide][repo-guide] if your package isn't
+    already on GitHub.
+
+### Publish Your Package
+
+Before you publish a package it is a good idea to check ahead of time if
+a package with the same name has already been published to atom.io. You can do
+that by visiting `http://atom.io/packages/my-package` to see if the package
+already exists. If it does, update your package's name to something that is
+available before proceeding.
+
+Now let's review what the `apm publish` command does:
+
+  1. Registers the package name on atom.io if it is being published for the
+     first time.
+  2. Updates the `version` field in the *package.json* file and commits it.
+  3. Creates a new [Git tag][git-tag] for the version being published.
+  4. Pushes the tag and current branch up to GitHub.
+  5. Updates atom.io with the new version being published.
+
+Now run the following commands to publish your package:
+
+```sh
+cd ~/github/my-package
+apm publish minor
+```
+
+If this is the first package you are publishing, the `apm publish` command may
+prompt you for your GitHub username and password. This is required to publish
+and you only need to enter this information the first time you publish. The
+credentials are stored securely in your [keychain][keychain] once you login.
+
+:tada: Your package is now published and available on atom.io. Head on over to
+`http://atom.io/packages/my-package` to see your package's page.
+
+With `apm publish`, you can bump the version and publish by using
+```sh
+apm publish <version-type>
+```
+where `<version-type>` can be `major`, `minor` and `patch`.
+
+The `major` option to the publish command tells apm to increment the first
+digit of the version before publishing so the published version will be `1.0.0`
+and the Git tag created will be `v1.0.0`.
+
+The `minor` option to the publish command tells apm to increment the second
+digit of the version before publishing so the published version will be `0.1.0`
+and the Git tag created will be `v0.1.0`.
+
+The `patch` option to the publish command tells apm to increment the third
+digit of the version before publishing so the published version will be `0.0.1`
+and the Git tag created will be `v0.0.1`.
+
+Use `major` when you make a huge change, like a rewrite, or a large change to the functionality or interface.
+Use `minor` when adding or removing a feature.
+Use `patch` when you make a small change like a bug fix that does not add or remove features.
+
+### Further Reading
+
+* Check out [semantic versioning][semver] to learn more about versioning your
+  package releases.
+* Consult the [Atom.io package API docs][apm-rest-api] to learn more about how
+  `apm` works.
+
+[atomio]: https://atom.io
+[github]: https://github.com
+[git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
+[keychain]: http://en.wikipedia.org/wiki/Keychain_(Apple)
+[repo-guide]: http://guides.github.com/overviews/desktop
+[semver]: http://semver.org
+[your-first-package]: your-first-package.html
+[apm-rest-api]: apm-rest-api.md

docs/setting-up-travis.md

@@ -1,39 +0,0 @@
-# Setting up Travis CI
-
-Packages under the [atom org][atom-org] should use [Travis CI][travis-ci] for
-builds.
-
-Currently we have a [Travis Pro][travis-pro] account since the repositories
-are private.  This process will be simpler and have fewer steps once the
-package repos are made public.
-
-Each package builds using the [build-package][build-package] script, any
-changes to the build should be made in that script and will affect all
-package builds immediately.
-
-Each package builds against the latest successful build of atom@master. The
-master builds are stored in the [atom-master-builds][atom-master-builds] repo
-as releases named by the SHA-1 built.
-
-## Configuring a package
-
-* Run `cd ~/github/my-package` to navigate to the package repo locally
-* Run `apm test` to verify that the package currently builds via [apm][apm]
-* Add the package repo to the [Travis CI team][travis-ci-team]
-* Run `gem install travis` to install the [travis gem][travis-gem]
-* Run `travis login --pro` and log in using the [atom-build][atom-build] user
-  and the password from the *Shared-Developers* folder in LastPass
-* Run `apm ci` to add a `.travis.yml` file to the repo and to configure Travis
-* Log into [Travis][travis-ci] as the `atom-build` user and you should now see
-  the package listed and building
-  
-
-[apm]: https://github.com/atom/apm
-[build-package]: https://github.com/atom/apm/blob/master/script/build-package
-[atom-build]: https://github.com/atom-build
-[atom-master-builds]: https://github.com/atom/atom-master-builds/releases
-[atom-org]: https://github.com/atom
-[travis-ci]: https://magnum.travis-ci.com
-[travis-ci-team]: https://github.com/organizations/atom/teams/596636
-[travis-gem]: https://rubygems.org/gems/travis
-[travis-pro]: http://about.travis-ci.org/docs/user/travis-pro

docs/writing-specs.md

@@ -0,0 +1,129 @@
+# Writing specs
+
+Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec framework. Any new functionality should have specs to guard against regressions.
+
+## Create a new spec
+
+[Atom specs](https://github.com/atom/atom/tree/master/spec) and [package specs](https://github.com/atom/markdown-preview/tree/master/spec) are added to their respective `spec` directory. The example below creates a spec for Atom core.
+
+0. Create a spec file
+
+  Spec files **must** end with `-spec` so add `sample-spec.coffee` to `atom/spec`.
+
+0. Add one or more `describe` methods
+
+  The `describe` method takes two arguments, a description and a function. If the description explains a behavior it typically begins with `when` if it is more like a unit test it begins with the method name.
+
+  ```coffee
+  describe "when a test is written", ->
+    # contents
+  ```
+
+  or
+
+  ```coffee
+  describe "Editor::moveUp", ->
+    # contents
+  ```
+
+0. Add one or more `it` method
+
+  The `it` method also takes two arguments, a description and a function. Try and make the description flow with the `it` method. For example, a description of `this should work` doesn't read well as `it this should work`. But a description of `should work` sounds great as `it should work`.
+
+  ```coffee
+  describe "when a test is written", ->
+    it "has some expectations that should pass", ->
+      # Expectations
+  ```
+
+0. Add one or more expectations
+
+  The best way to learn about expectations is to read the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Expectations) about them. Below is a simple example.
+
+  ```coffee
+  describe "when a test is written", ->
+    it "has some expectations that should pass", ->
+      expect("apples").toEqual("apples")
+      expect("oranges").not.toEqual("apples")
+  ```
+
+## Asynchronous specs
+
+Writing Asynchronous specs can be tricky at first. Some examples.
+
+0. Promises
+
+  Working with promises is rather easy in Atom. You can use our `waitsForPromise` function.
+
+  ```coffee
+    describe "when we open a file", ->
+      it "should be opened in an editor", ->
+        waitsForPromise ->
+          atom.workspace.open('c.coffee').then (editor) ->
+            expect(editor.getPath()).toContain 'c.coffee'
+  ```
+
+  This method can be used in the `describe`, `it`, `beforeEach` and `afterEach` functions.
+
+  ```coffee
+  describe "when we open a file", ->
+    beforeEach ->
+      waitsForPromise ->
+        atom.workspace.open 'c.coffee'
+
+    it "should be opened in an editor", ->
+      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'
+
+  ```
+
+  If you need to wait for multiple promises use a new `waitsForPromise` function for each promise. (Caution: Without `beforeEach` this example will fail!)
+
+  ```coffee
+  describe "waiting for the packages to load", ->
+
+    beforeEach ->
+      waitsForPromise ->
+        atom.workspace.open('sample.js')
+      waitsForPromise ->
+        atom.packages.activatePackage('tabs')
+      waitsForPromise ->
+        atom.packages.activatePackage('tree-view')
+
+    it 'should have waited long enough', ->
+      expect(atom.packages.isPackageActive('tabs')).toBe true
+      expect(atom.packages.isPackageActive('tree-view')).toBe true
+  ```
+
+0. Asynchronous functions with callbacks
+
+  Specs for asynchronous functions can be done using the `waitsFor` and `runs` functions. A simple example.
+
+  ```coffee
+  describe "fs.readdir(path, cb)", ->
+    it "is async", ->
+      spy = jasmine.createSpy('fs.readdirSpy')
+
+      fs.readdir('/tmp/example', spy)
+      waitsFor ->
+        spy.callCount > 0
+      runs ->
+        exp = [null, ['example.coffee']]
+        expect(spy.mostRecentCall.args).toEqual exp
+        expect(spy).toHaveBeenCalledWith(null, ['example.coffee'])
+  ```
+
+For a more detailed documentation on asynchronous tests please visit the [jasmine documentation](http://jasmine.github.io/1.3/introduction.html#section-Asynchronous_Support).
+
+
+## Running specs
+
+Most of the time you'll want to run specs by triggering the `window:run-package-specs` command. This command is not only to run package specs, it is also for Atom core specs. This will run all the specs in the current project's spec directory. If you want to run the Atom core specs and **all** the default package specs trigger the `window:run-all-specs` command.
+
+To run a limited subset of specs use the `fdescribe` or `fit` methods. You can use those to focus a single spec or several specs. In the example above, focusing an individual spec looks like this:
+
+```coffee
+describe "when a test is written", ->
+  fit "has some expectations that should pass", ->
+    expect("apples").toEqual("apples")
+    expect("oranges").not.toEqual("apples")
+```

docs/your-first-package.md

@@ -5,6 +5,7 @@ selected text with [ascii art](http://en.wikipedia.org/wiki/ASCII_art). When you
 run our new command with the word "cool" selected, it will be replaced with:
 
 ```
+                     ___
                     /\_ \
   ___    ___     ___\//\ \
  /'___\ / __`\  / __`\\ \ \
@@ -19,23 +20,24 @@ The final package can be viewed at
 To begin, press `cmd-shift-P` to bring up the [Command
 Palette](https://github.com/atom/command-palette). Type "generate package" and
 select the "Package Generator: Generate Package" command. Now we need to name
-the package. Let's call it _ascii-art_.
+the package. Try to avoid naming your package with the *atom-* prefix, for
+example we are going to call this package _ascii-art_.
 
 Atom will open a new window with the contents of our new _ascii-art_ package
 displayed in the Tree View. Because this window is opened **after** the package
 is created, the ASCII Art package will be loaded and available in our new
 window. To verify this, toggle the Command Palette (`cmd-shift-P`) and type
-"ASCII Art" you'll see a new `ASCII Art: Toggle` command. When triggered, this
+"ASCII Art". You'll see a new `ASCII Art: Toggle` command. When triggered, this
 command displays a default message.
 
-Now let's edit the package files to make our ascii art package do something
+Now let's edit the package files to make our ASCII Art package do something
 interesting. Since this package doesn't need any UI, we can remove all
 view-related code. Start by opening up _lib/ascii-art.coffee_. Remove all view
-code, so the file looks like this:
+code, so the `module.exports` section looks like this:
 
 ```coffeescript
-  module.exports =
-    activate: ->
+module.exports =
+  activate: ->
 ```
 
 ## Create a Command
@@ -69,23 +71,24 @@ command palette or by pressing `ctrl-alt-cmd-l`.
 ## Trigger the Command
 
 Now open the command panel and search for the `ascii-art:convert` command. But
-its not there! To fix this open _package.json_ and find the property called
-`activationEvents`. Activation Events speed up load time by allowing an Atom to
-delay a package's activation until it's needed. So add the `ascii-art:convert`
-to the activationEvents array:
+it's not there! To fix this, open _package.json_ and find the property called
+`activationEvents`. Activation Events speed up load time by allowing Atom to
+delay a package's activation until it's needed. So remove the existing command
+and add `ascii-art:convert` to the `activationEvents` array:
 
 ```json
 "activationEvents": ["ascii-art:convert"],
 ```
 
-First, run reload the window by running the command `window:reload`. Now when
-you run the `ascii-art:convert` command it will output 'Hello, World!'
+First, reload the window by running the command `window:reload`. Now when you
+run the `ascii-art:convert` command it will output 'Hello, World!'
 
-## Add A Key Binding
+## Add a Key Binding
 
 Now let's add a key binding to trigger the `ascii-art:convert` command. Open
 _keymaps/ascii-art.cson_ and add a key binding linking `ctrl-alt-a` to the
-`ascii-art:convert` command. When finished, the file will look like this:
+`ascii-art:convert` command. You can delete the pre-existing key binding since
+you don't need it anymore. When finished, the file will look like this:
 
 ```coffeescript
 '.editor':
@@ -105,25 +108,25 @@ that it **doesn't** work when the Tree View is focused.
 
 ## Add the ASCII Art
 
-Now we need to convert the selected text to ascii art. To do this we will use
+Now we need to convert the selected text to ASCII art. To do this we will use
 the [figlet](https://npmjs.org/package/figlet) [node](http://nodejs.org/) module
 from [npm](https://npmjs.org/). Open _package.json_ and add the latest version of
 figlet to the dependencies:
 
 ```json
-  "dependencies": {
-     "figlet": "1.0.8"
-  }
+"dependencies": {
+   "figlet": "1.0.8"
+}
 ```
 
-After saving the file run the command 'update-package-dependencies:update' from
-the Command Palette. This will install the packages node module dependencies,
+After saving the file, run the command 'update-package-dependencies:update' from
+the Command Palette. This will install the package's node module dependencies,
 only figlet in this case. You will need to run
 'update-package-dependencies:update' whenever you update the dependencies field
 in your _package.json_ file.
 
 Now require the figlet node module in _lib/ascii-art.coffee_ and instead of
-inserting 'Hello, World!' convert the selected text to ascii art!
+inserting 'Hello, World!' convert the selected text to ASCII art.
 
 ```coffeescript
 convert: ->
@@ -139,7 +142,17 @@ convert: ->
       selection.insertText("\n#{asciiArt}\n")
 ```
 
+Select some text in an editor window and hit `cmd-alt-a`. :tada: You're now an
+ASCII art professional!
+
 ## Further reading
 
-For more information on the mechanics of packages, check out [Creating a
-Package](creating-a-package.html)
+* [Getting your project on GitHub guide](http://guides.github.com/overviews/desktop)
+
+* [Writing specs](writing-specs.md) for your package
+
+* [Creating a package guide](creating-a-package.html) for more information
+  on the mechanics of packages
+
+* [Publishing a package guide](publishing-a-package.html) for more information
+  on publishing your package to [atom.io](https://atom.io)

dot-atom/.gitignore

@@ -0,0 +1,5 @@
+storage
+compile-cache
+dev
+.npm
+.node-gyp

dot-atom/init.coffee

@@ -0,0 +1,14 @@
+# Your init script
+#
+# Atom will evaluate this file each time a new window is opened. It is run
+# after packages are loaded/activated and after the previous editor state
+# has been restored.
+#
+# An example hack to make opened Markdown files always be soft wrapped:
+#
+# path = require 'path'
+#
+# atom.workspaceView.eachEditorView (editorView) ->
+#   editor = editorView.getEditor()
+#   if path.extname(editor.getPath()) is '.md'
+#     editor.setSoftWrap(true)

dot-atom/keymap.cson

@@ -1,13 +1,18 @@
-# User keymap
+# Your keymap
 #
 # Atom keymaps work similarly to stylesheets. Just as stylesheets use selectors
 # to apply styles to elements, Atom keymaps use selectors to associate
-# keystrokes with events in specific contexts. Here's a small example, excerpted
-# from Atom's built-in keymaps:
+# keystrokes with events in specific contexts.
+#
+# You can create a new keybinding in this file by typing "key" and then hitting
+# tab.
+#
+# Here's an example taken from Atom's built-in keymap:
 #
 # '.editor':
 #   'enter': 'editor:newline'
 #
-# 'body':
+# '.workspace':
 #   'ctrl-P': 'core:move-up'
 #   'ctrl-p': 'core:move-down'
+#

dot-atom/snippets.cson

@@ -3,7 +3,7 @@
 # Atom snippets allow you to enter a simple prefix in the editor and hit tab to
 # expand the prefix into a larger code block with templated values.
 #
-# You can create a new snippet in this file by typing `snip` and then hitting
+# You can create a new snippet in this file by typing "snip" and then hitting
 # tab.
 #
 # An example CoffeeScript snippet to expand log to console.log:

dot-atom/styles.less

@@ -3,6 +3,9 @@
  *
  * This stylesheet is loaded when Atom starts up and is reloaded automatically
  * when it is changed.
+ *
+ * If you are unfamiliar with LESS, you can read more about it here:
+ * http://www.lesscss.org
  */
 
 .tree-view {

dot-atom/user.coffee

@@ -1 +0,0 @@
-# For more on how to configure atom open `~/github/atom/docs/configuring-and-extending.md`

exports/atom.coffee

@@ -1,13 +1,8 @@
 {Point, Range} = require 'text-buffer'
 
 module.exports =
-  _: require 'underscore-plus'
   BufferedNodeProcess: require '../src/buffered-node-process'
   BufferedProcess: require '../src/buffered-process'
-  ConfigObserver: require '../src/config-observer'
-  Directory: require '../src/directory'
-  File: require '../src/file'
-  fs: require 'fs-plus'
   Git: require '../src/git'
   Point: Point
   Range: Range
@@ -20,9 +15,13 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
   module.exports.$ = $
   module.exports.$$ = $$
   module.exports.$$$ = $$$
-  module.exports.EditorView = require '../src/editor-view'
+  if atom.config.get('core.useReactMiniEditors')
+    module.exports.EditorView = require '../src/react-editor-view'
+  else
+    module.exports.EditorView = require '../src/editor-view'
   module.exports.ScrollView = require '../src/scroll-view'
   module.exports.SelectListView = require '../src/select-list-view'
   module.exports.Task = require '../src/task'
   module.exports.View = View
   module.exports.WorkspaceView = require '../src/workspace-view'
+  module.exports.Workspace = require '../src/workspace'

keymaps/base.cson

@@ -1,17 +1,10 @@
 '.editor':
   # Platform Bindings
-  'alt-left': 'editor:move-to-beginning-of-word'
-  'alt-right': 'editor:move-to-end-of-word'
-  'alt-shift-left': 'editor:select-to-beginning-of-word'
-  'alt-shift-right': 'editor:select-to-end-of-word'
   'home': 'editor:move-to-first-character-of-line'
   'end': 'editor:move-to-end-of-screen-line'
   'shift-home': 'editor:select-to-first-character-of-line'
   'shift-end': 'editor:select-to-end-of-line'
 
-  # Sublime Parity
-  'ctrl-t': 'editor:transpose'
-
 '.editor:not(.mini)':
   # Atom Specific
   'ctrl-C': 'editor:copy-path'
@@ -19,10 +12,9 @@
   # Sublime Parity
   'tab': 'editor:indent'
   'enter': 'editor:newline'
+  'num-enter': 'editor:newline'
   'shift-tab': 'editor:outdent-selected-rows'
   'ctrl-K': 'editor:delete-line'
-  'ctrl-shift-up': 'editor:add-selection-above'
-  'ctrl-shift-down': 'editor:add-selection-below'
 
 '.tool-panel.panel-left, .tool-panel.panel-right':
   'escape': 'tool-panel:unfocus'
@@ -35,6 +27,7 @@
   'tab': 'core:focus-next'
   'shift-tab': 'core:focus-previous'
   'enter': 'native!'
+  'num-enter': 'native!'
   'backspace': 'native!'
   'shift-backspace': 'native!'
   'delete': 'native!'

keymaps/darwin.cson

@@ -21,6 +21,7 @@
   'cmd-O': 'application:open-dev'
   'cmd-alt-ctrl-s': 'application:run-all-specs'
   'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -52,7 +53,10 @@
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
+  'shift-pageup': 'core:select-page-up'
+  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
+  'shift-delete': 'core:delete'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
@@ -65,9 +69,15 @@
   'cmd-}': 'pane:show-next-item'
   'cmd-alt-left': 'pane:show-previous-item'
   'cmd-alt-right': 'pane:show-next-item'
+  'ctrl-pageup': 'pane:show-previous-item'
+  'ctrl-pagedown': 'pane:show-next-item'
+  'ctrl-tab': 'pane:show-next-item'
+  'ctrl-shift-tab': 'pane:show-previous-item'
   'cmd-=': 'window:increase-font-size'
   'cmd-+': 'window:increase-font-size'
   'cmd--': 'window:decrease-font-size'
+  'cmd-_': 'window:decrease-font-size'
+  'cmd-0': 'window:reset-font-size'
 
   'cmd-k up': 'pane:split-up' # Atom Specific
   'cmd-k down': 'pane:split-down' # Atom Specific
@@ -75,8 +85,12 @@
   'cmd-k right': 'pane:split-right' # Atom Specific
   'cmd-k cmd-w': 'pane:close' # Atom Specific
   'cmd-k alt-cmd-w': 'pane:close-other-items' # Atom Specific
-  'cmd-k cmd-left': 'window:focus-previous-pane'
-  'cmd-k cmd-right': 'window:focus-next-pane'
+  'cmd-k cmd-p': 'window:focus-previous-pane'
+  'cmd-k cmd-n': 'window:focus-next-pane'
+  'cmd-k cmd-up': 'window:focus-pane-above'
+  'cmd-k cmd-down': 'window:focus-pane-below'
+  'cmd-k cmd-left': 'window:focus-pane-on-left'
+  'cmd-k cmd-right': 'window:focus-pane-on-right'
   'cmd-1': 'pane:show-item-1'
   'cmd-2': 'pane:show-item-2'
   'cmd-3': 'pane:show-item-3'
@@ -88,16 +102,23 @@
   'cmd-9': 'pane:show-item-9'
 
 '.editor':
+  # Platform Bindings
+  'alt-left': 'editor:move-to-beginning-of-word'
+  'alt-right': 'editor:move-to-end-of-word'
+  'alt-shift-left': 'editor:select-to-beginning-of-word'
+  'alt-shift-right': 'editor:select-to-end-of-word'
+
   # Apple Specific
-  'cmd-backspace': 'editor:backspace-to-beginning-of-line'
-  'cmd-delete': 'editor:backspace-to-beginning-of-line'
+  'cmd-backspace': 'editor:delete-to-beginning-of-line'
+  'cmd-shift-backspace': 'editor:delete-to-beginning-of-line'
+  'cmd-delete': 'editor:delete-to-beginning-of-line'
   'ctrl-A': 'editor:select-to-first-character-of-line'
   'ctrl-E': 'editor:select-to-end-of-line'
   'cmd-left': 'editor:move-to-first-character-of-line'
   'cmd-right': 'editor:move-to-end-of-screen-line'
   'cmd-shift-left': 'editor:select-to-first-character-of-line'
   'cmd-shift-right': 'editor:select-to-end-of-line'
-  'alt-backspace': 'editor:backspace-to-beginning-of-word'
+  'alt-backspace': 'editor:delete-to-beginning-of-word'
   'alt-delete': 'editor:delete-to-end-of-word'
   'ctrl-a': 'editor:move-to-beginning-of-line'
   'ctrl-e': 'editor:move-to-end-of-line'
@@ -112,13 +133,13 @@
   'cmd-k cmd-u': 'editor:upper-case'
   'cmd-k cmd-l': 'editor:lower-case'
   'cmd-l': 'editor:select-line'
+  'ctrl-t': 'editor:transpose'
 
 '.workspace .editor:not(.mini)':
   # Atom specific
   'alt-cmd-z': 'editor:checkout-head-revision'
   'cmd-<': 'editor:scroll-to-cursor'
   'alt-cmd-ctrl-f': 'editor:fold-selection'
-  'cmd-=': 'editor:auto-indent'
 
   # Sublime Parity
   'cmd-enter': 'editor:newline-below'
@@ -128,9 +149,11 @@
   'ctrl-cmd-up': 'editor:move-line-up'
   'ctrl-cmd-down': 'editor:move-line-down'
   'cmd-/': 'editor:toggle-line-comments'
-  'cmd-j': 'editor:join-line'
-  'cmd-D': 'editor:duplicate-line'
+  'cmd-j': 'editor:join-lines'
+  'cmd-D': 'editor:duplicate-lines'
   'cmd-L': 'editor:split-selections-into-lines'
+  'ctrl-shift-up': 'editor:add-selection-above'
+  'ctrl-shift-down': 'editor:add-selection-below'
 
   'cmd-alt-[': 'editor:fold-current-row'
   'cmd-alt-]': 'editor:unfold-current-row'

keymaps/emacs.cson

@@ -3,5 +3,5 @@
   'alt-F': 'editor:select-to-end-of-word'
   'alt-b': 'editor:move-to-beginning-of-word'
   'alt-B': 'editor:select-to-beginning-of-word'
-  'alt-h': 'editor:backspace-to-beginning-of-word'
+  'alt-h': 'editor:delete-to-beginning-of-word'
   'alt-d': 'editor:delete-to-end-of-word'

keymaps/linux.cson

@@ -0,0 +1,139 @@
+'body':
+  # Atom Specific
+  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
+  'escape': 'core:cancel'
+  'up': 'core:move-up'
+  'down': 'core:move-down'
+  'left': 'core:move-left'
+  'right': 'core:move-right'
+  'ctrl-alt-r': 'window:reload'
+  'ctrl-shift-i': 'window:toggle-dev-tools'
+  'ctrl-alt-p': 'window:run-package-specs'
+  'ctrl-alt-s': 'application:run-all-specs'
+  'ctrl-shift-o': 'application:open-dev'
+  'F11': 'window:toggle-full-screen'
+
+  # Sublime Parity
+  'ctrl-N': 'application:new-window'
+  'ctrl-W': 'window:close'
+  'ctrl-o': 'application:open-file'
+  'ctrl-q': 'application:quit'
+  'ctrl-T': 'pane:reopen-closed-item'
+  'ctrl-n': 'application:new-file'
+  'ctrl-s': 'core:save'
+  'ctrl-S': 'core:save-as'
+  'ctrl-w': 'core:close'
+  'ctrl-z': 'core:undo'
+  'ctrl-y': 'core:redo'
+  'ctrl-x': 'core:cut'
+  'ctrl-c': 'core:copy'
+  'ctrl-v': 'core:paste'
+  'ctrl-insert': 'core:copy'
+  'shift-insert': 'core:paste'
+  'shift-up': 'core:select-up'
+  'shift-down': 'core:select-down'
+  'shift-left': 'core:select-left'
+  'shift-right': 'core:select-right'
+  'shift-pageup': 'core:select-page-up'
+  'shift-pagedown': 'core:select-page-down'
+  'delete': 'core:delete'
+  'shift-delete': 'core:cut'
+  'pageup': 'core:page-up'
+  'pagedown': 'core:page-down'
+  'backspace': 'core:backspace'
+  'shift-backspace': 'core:backspace'
+  'ctrl-tab': 'pane:show-next-item'
+  'ctrl-shift-tab': 'pane:show-previous-item'
+  'ctrl-pageup': 'pane:show-previous-item'
+  'ctrl-pagedown': 'pane:show-next-item'
+  'ctrl-shift-up': 'core:move-up'
+  'ctrl-shift-down': 'core:move-down'
+  'ctrl-=': 'window:increase-font-size'
+  'ctrl-+': 'window:increase-font-size'
+  'ctrl--': 'window:decrease-font-size'
+  'ctrl-_': 'window:decrease-font-size'
+  'ctrl-0': 'window:reset-font-size'
+
+  'ctrl-k up': 'pane:split-up' # Atom Specific
+  'ctrl-k down': 'pane:split-down' # Atom Specific
+  'ctrl-k left': 'pane:split-left' # Atom Specific
+  'ctrl-k right': 'pane:split-right' # Atom Specific
+  'ctrl-k ctrl-w': 'pane:close' # Atom Specific
+  'ctrl-k alt-ctrl-w': 'pane:close-other-items' # Atom Specific
+  'ctrl-k ctrl-p': 'window:focus-previous-pane'
+  'ctrl-k ctrl-n': 'window:focus-next-pane'
+  'ctrl-k ctrl-up':    'window:focus-pane-above'
+  'ctrl-k ctrl-down':  'window:focus-pane-below'
+  'ctrl-k ctrl-left':  'window:focus-pane-on-left'
+  'ctrl-k ctrl-right': 'window:focus-pane-on-right'
+  'alt-1': 'pane:show-item-1'
+  'alt-2': 'pane:show-item-2'
+  'alt-3': 'pane:show-item-3'
+  'alt-4': 'pane:show-item-4'
+  'alt-5': 'pane:show-item-5'
+  'alt-6': 'pane:show-item-6'
+  'alt-7': 'pane:show-item-7'
+  'alt-8': 'pane:show-item-8'
+  'alt-9': 'pane:show-item-9'
+
+'.workspace .editor':
+  # Platform Bindings
+  'ctrl-left': 'editor:move-to-beginning-of-word'
+  'ctrl-right': 'editor:move-to-end-of-word'
+  'ctrl-shift-left': 'editor:select-to-beginning-of-word'
+  'ctrl-shift-right': 'editor:select-to-end-of-word'
+  'ctrl-backspace': 'editor:delete-to-beginning-of-word'
+  'ctrl-delete': 'editor:delete-to-end-of-word'
+  'ctrl-home': 'core:move-to-top'
+  'ctrl-end': 'core:move-to-bottom'
+  'ctrl-shift-home': 'core:select-to-top'
+  'ctrl-shift-end': 'core:select-to-bottom'
+
+  # Sublime Parity
+  'ctrl-a': 'core:select-all'
+  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
+  'ctrl-k ctrl-u': 'editor:upper-case'
+  'ctrl-k ctrl-l': 'editor:lower-case'
+
+'.workspace .editor:not(.mini)':
+  # Atom specific
+  'alt-ctrl-z': 'editor:checkout-head-revision'
+  'ctrl-<': 'editor:scroll-to-cursor'
+  'alt-ctrl-f': 'editor:fold-selection'
+
+  # Sublime Parity
+  'ctrl-enter': 'editor:newline-below'
+  'ctrl-shift-enter': 'editor:newline-above'
+  'ctrl-]': 'editor:indent-selected-rows'
+  'ctrl-[': 'editor:outdent-selected-rows'
+  'ctrl-up': 'editor:move-line-up'
+  'ctrl-down': 'editor:move-line-down'
+  'ctrl-/': 'editor:toggle-line-comments'
+  'ctrl-j': 'editor:join-lines'
+  'ctrl-D': 'editor:duplicate-lines'
+  'alt-shift-up': 'editor:add-selection-above'
+  'alt-shift-down': 'editor:add-selection-below'
+
+  'ctrl-alt-[': 'editor:fold-current-row'
+  'ctrl-alt-]': 'editor:unfold-current-row'
+  'ctrl-alt-{': 'editor:fold-all' # Atom Specific
+  'ctrl-alt-}': 'editor:unfold-all' # Atom Specific
+  'ctrl-k ctrl-0': 'editor:unfold-all'
+  'ctrl-k ctrl-1': 'editor:fold-at-indent-level-1'
+  'ctrl-k ctrl-2': 'editor:fold-at-indent-level-2'
+  'ctrl-k ctrl-3': 'editor:fold-at-indent-level-3'
+  'ctrl-k ctrl-4': 'editor:fold-at-indent-level-4'
+  'ctrl-k ctrl-5': 'editor:fold-at-indent-level-5'
+  'ctrl-k ctrl-6': 'editor:fold-at-indent-level-6'
+  'ctrl-k ctrl-7': 'editor:fold-at-indent-level-7'
+  'ctrl-k ctrl-8': 'editor:fold-at-indent-level-8'
+  'ctrl-k ctrl-9': 'editor:fold-at-indent-level-9'
+
+# allow standard input fields to work correctly
+'body .native-key-bindings':
+  'ctrl-z': 'native!'
+  'ctrl-Z': 'native!'
+  'ctrl-x': 'native!'
+  'ctrl-c': 'native!'
+  'ctrl-v': 'native!'

keymaps/win32.cson

@@ -1,6 +1,11 @@
 'body':
+  # Platform Bindings
+  'ctrl-pageup': 'pane:show-previous-item'
+  'ctrl-pagedown': 'pane:show-next-item'
+
   # Atom Specific
   'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
   'escape': 'core:cancel'
   'up': 'core:move-up'
   'down': 'core:move-down'
@@ -10,36 +15,52 @@
   'ctrl-alt-i': 'window:toggle-dev-tools'
   'ctrl-alt-p': 'window:run-package-specs'
   'ctrl-alt-s': 'application:run-all-specs'
+  'F11': 'window:toggle-full-screen'
 
   # Sublime Parity
+  'ctrl-,': 'application:show-settings'
   'ctrl-N': 'application:new-window'
   'ctrl-W': 'window:close'
-  'ctrl-o': 'application:open'
+  'ctrl-o': 'application:open-file'
   'ctrl-T': 'pane:reopen-closed-item'
   'ctrl-n': 'application:new-file'
   'ctrl-s': 'core:save'
   'ctrl-S': 'core:save-as'
   'ctrl-w': 'core:close'
+  'ctrl-f4': 'core:close'
   'ctrl-z': 'core:undo'
+  'ctrl-shift-z': 'core:redo'
   'ctrl-y': 'core:redo'
   'ctrl-x': 'core:cut'
   'ctrl-c': 'core:copy'
   'ctrl-v': 'core:paste'
+  'ctrl-insert': 'core:copy'
+  'shift-insert': 'core:paste'
   'shift-up': 'core:select-up'
   'shift-down': 'core:select-down'
   'shift-left': 'core:select-left'
   'shift-right': 'core:select-right'
+  'shift-pageup': 'core:select-page-up'
+  'shift-pagedown': 'core:select-page-down'
   'delete': 'core:delete'
+  'shift-delete': 'core:cut'
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
   'backspace': 'core:backspace'
+  'shift-backspace': 'core:backspace'
   'ctrl-tab': 'pane:show-next-item'
   'ctrl-shift-tab': 'pane:show-previous-item'
+  'ctrl-pageup': 'pane:show-previous-item'
+  'ctrl-pagedown': 'pane:show-next-item'
   'ctrl-shift-up': 'core:move-up'
   'ctrl-shift-down': 'core:move-down'
+  'ctrl-alt-up': 'editor:add-selection-above'
+  'ctrl-alt-down': 'editor:add-selection-below'
   'ctrl-=': 'window:increase-font-size'
   'ctrl-+': 'window:increase-font-size'
   'ctrl--': 'window:decrease-font-size'
+  'ctrl-_': 'window:decrease-font-size'
+  'ctrl-0': 'window:reset-font-size'
 
   'ctrl-k up': 'pane:split-up' # Atom Specific
   'ctrl-k down': 'pane:split-down' # Atom Specific
@@ -47,16 +68,29 @@
   'ctrl-k right': 'pane:split-right' # Atom Specific
   'ctrl-k ctrl-w': 'pane:close' # Atom Specific
   'ctrl-k alt-ctrl-w': 'pane:close-other-items' # Atom Specific
-  'ctrl-k ctrl-left': 'window:focus-previous-pane'
-  'ctrl-k ctrl-right': 'window:focus-next-pane'
+  'ctrl-k ctrl-p': 'window:focus-previous-pane'
+  'ctrl-k ctrl-n': 'window:focus-next-pane'
+  'ctrl-k ctrl-up':    'window:focus-pane-above'
+  'ctrl-k ctrl-down':  'window:focus-pane-below'
+  'ctrl-k ctrl-left':  'window:focus-pane-on-left'
+  'ctrl-k ctrl-right': 'window:focus-pane-on-right'
 
 '.workspace .editor':
-  # Windows specific
-  'ctrl-delete': 'editor:backspace-to-beginning-of-word'
+  # Platform Bindings
+  'ctrl-left': 'editor:move-to-beginning-of-word'
+  'ctrl-right': 'editor:move-to-end-of-word'
+  'ctrl-shift-left': 'editor:select-to-beginning-of-word'
+  'ctrl-shift-right': 'editor:select-to-end-of-word'
+  'ctrl-backspace': 'editor:delete-to-beginning-of-word'
+  'ctrl-delete': 'editor:delete-to-end-of-word'
+  'ctrl-home': 'core:move-to-top'
+  'ctrl-end': 'core:move-to-bottom'
+  'ctrl-shift-home': 'core:select-to-top'
+  'ctrl-shift-end': 'core:select-to-bottom'
 
   # Sublime Parity
   'ctrl-a': 'core:select-all'
-  'ctrl-alt-p': 'editor:log-cursor-scope'
+  'ctrl-alt-shift-p': 'editor:log-cursor-scope'
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
 
@@ -65,7 +99,6 @@
   'alt-ctrl-z': 'editor:checkout-head-revision'
   'ctrl-<': 'editor:scroll-to-cursor'
   'alt-ctrl-f': 'editor:fold-selection'
-  'ctrl-=': 'editor:auto-indent'
 
   # Sublime Parity
   'ctrl-enter': 'editor:newline-below'
@@ -75,8 +108,8 @@
   'ctrl-up': 'editor:move-line-up'
   'ctrl-down': 'editor:move-line-down'
   'ctrl-/': 'editor:toggle-line-comments'
-  'ctrl-j': 'editor:join-line'
-  'ctrl-D': 'editor:duplicate-line'
+  'ctrl-j': 'editor:join-lines'
+  'ctrl-D': 'editor:duplicate-lines'
 
   'ctrl-alt-[': 'editor:fold-current-row'
   'ctrl-alt-]': 'editor:unfold-current-row'

menus/darwin.cson

@@ -3,11 +3,15 @@
     label: 'Atom'
     submenu: [
       { label: 'About Atom', command: 'application:about' }
-      { label: "VERSION", enabled: false }
-      { label: "Install update", command: 'application:install-update', visible: false }
+      { label: 'View License', command: 'application:open-license' }
+      { label: 'VERSION', enabled: false }
+      { label: 'Restart and Install Update', command: 'application:install-update', visible: false}
+      { label: 'Check for Update', command: 'application:check-for-update', visible: false}
+      { label: 'Downloading Update', enabled: false, visible: false}
       { type: 'separator' }
       { label: 'Preferences...', command: 'application:show-settings' }
       { label: 'Open Your Config', command: 'application:open-your-config' }
+      { label: 'Open Your Init Script', command: 'application:open-your-init-script' }
       { label: 'Open Your Keymap', command: 'application:open-your-keymap' }
       { label: 'Open Your Snippets', command: 'application:open-your-snippets' }
       { label: 'Open Your Stylesheet', command: 'application:open-your-stylesheet' }
@@ -34,7 +38,7 @@
       { label: 'Save All', command: 'window:save-all' }
       { type: 'separator' }
       { label: 'Close Buffer', command: 'core:close' }
-      { label: 'Close All Buffers', command: 'pane:close' }
+      { label: 'Close Pane', command: 'pane:close' }
       { label: 'Close Window', command: 'window:close' }
     ]
   }
@@ -61,9 +65,9 @@
           { type: 'separator' }
           { label: 'Move Line Up', command: 'editor:move-line-up' }
           { label: 'Move Line Down', command: 'editor:move-line-down' }
-          { label: 'Duplicate Line', command: 'editor:duplicate-line' }
+          { label: 'Duplicate Lines', command: 'editor:duplicate-lines' }
           { label: 'Delete Line', command: 'editor:delete-line' }
-          { label: 'Join Lines', command: 'editor:join-line' }
+          { label: 'Join Lines', command: 'editor:join-lines' }
         ]
       }
       {
@@ -105,6 +109,7 @@
     submenu: [
       { label: 'Add Selection Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection Below', command: 'editor:add-selection-below' }
+      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { label: 'Split into Lines', command: 'editor:split-selections-into-lines'}
       { type: 'separator' }
       { label: 'Select to Top', command: 'core:select-to-top' }
@@ -130,6 +135,25 @@
     submenu: [
       { label: 'Reload', command: 'window:reload' }
       { label: 'Toggle Full Screen', command: 'window:toggle-full-screen' }
+      {
+        label: 'Panes'
+        submenu: [
+          { label: 'Split Up', command: 'pane:split-up' }
+          { label: 'Split Down', command: 'pane:split-down' }
+          { label: 'Split Left', command: 'pane:split-left' }
+          { label: 'Split Right', command: 'pane:split-right' }
+          { type: 'separator' }
+          { label: 'Focus Next Pane', command: 'window:focus-next-pane' }
+          { label: 'Focus Previous Pane', command: 'window:focus-previous-pane' }
+          { type: 'separator' }
+          { label: 'Focus Pane Above', command: 'window:focus-pane-above' }
+          { label: 'Focus Pane Below', command: 'window:focus-pane-below' }
+          { label: 'Focus Pane On Left', command: 'window:focus-pane-on-left' }
+          { label: 'Focus Pane On Right', command: 'window:focus-pane-on-right' }
+          { type: 'separator' }
+          { label: 'Close Pane', command: 'pane:close' }
+        ]
+      }
       {
         label: 'Developer'
         submenu: [
@@ -162,8 +186,8 @@
   {
     label: 'Help'
     submenu: [
+      { label: 'Terms of Use', command: 'application:open-terms-of-use' }
       { label: 'Documentation', command: 'application:open-documentation' }
-      { label: 'Report an Issue', command: 'application:report-issue' }
       { type: 'separator' }
     ]
   }

menus/linux.cson

@@ -0,0 +1,157 @@
+'menu': [
+  {
+    label: '&File'
+    submenu: [
+      { label: 'New &Window', command: 'application:new-window' }
+      { label: '&New File', command: 'application:new-file' }
+      { label: '&Open File...', command: 'application:open-file' }
+      { label: 'Open Folder...', command: 'application:open-folder' }
+      { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
+      { type: 'separator' }
+      { label: '&Preferences...', command: 'application:show-settings' }
+      { type: 'separator' }
+      { label: '&Save', command: 'core:save' }
+      { label: 'Save &As...', command: 'core:save-as' }
+      { label: 'Save A&ll', command: 'window:save-all' }
+      { type: 'separator' }
+      { label: '&Close Buffer', command: 'core:close' }
+      { label: 'Close All &Buffers', command: 'pane:close' }
+      { label: 'Clos&e Window', command: 'window:close' }
+      { type: 'separator' }
+      { label: 'Quit', command: 'application:quit' }
+    ]
+  }
+
+  {
+    label: '&Edit'
+    submenu: [
+      { label: '&Undo', command: 'core:undo' }
+      { label: '&Redo', command: 'core:redo' }
+      { type: 'separator' }
+      { label: '&Cut', command: 'core:cut' }
+      { label: 'C&opy', command: 'core:copy' }
+      { label: 'Copy Pat&h', command: 'editor:copy-path' }
+      { label: '&Paste', command: 'core:paste' }
+      { label: 'Select &All', command: 'core:select-all' }
+      { type: 'separator' }
+      { label: '&Toggle Comments', command: 'editor:toggle-line-comments' }
+      {
+        label: 'Lines',
+        submenu: [
+          { label: '&Indent', command: 'editor:indent-selected-rows' }
+          { label: '&Outdent', command: 'editor:outdent-selected-rows' }
+          { label: '&Auto Indent', command: 'editor:auto-indent' }
+          { type: 'separator' }
+          { label: 'Move Line &Up', command: 'editor:move-line-up' }
+          { label: 'Move Line &Down', command: 'editor:move-line-down' }
+          { label: 'Du&plicate Lines', command: 'editor:duplicate-lines' }
+          { label: 'D&elete Line', command: 'editor:delete-line' }
+          { label: '&Join Lines', command: 'editor:join-lines' }
+        ]
+      }
+      {
+        label: 'Text',
+        submenu: [
+          { label: '&Upper Case', command: 'editor:upper-case' }
+          { label: '&Lower Case', command: 'editor:lower-case' }
+          { type: 'separator' }
+          { label: 'Delete to End of &Word', command: 'editor:delete-to-end-of-word' }
+          { label: '&Delete Line', command: 'editor:delete-line' }
+          { type: 'separator' }
+          { label: '&Transpose', command: 'editor:transpose' }
+        ]
+      }
+      {
+        label: 'Folding',
+        submenu: [
+          { label: '&Fold', command: 'editor:fold-current-row' }
+          { label: '&Unfold', command: 'editor:unfold-current-row' }
+          { label: 'Unfold &All', command: 'editor:unfold-all' }
+          { type: 'separator' }
+          { label: 'Fol&d All', command: 'editor:fold-all' }
+          { label: 'Fold Level 1', command: 'editor:fold-at-indent-level-1' }
+          { label: 'Fold Level 2', command: 'editor:fold-at-indent-level-2' }
+          { label: 'Fold Level 3', command: 'editor:fold-at-indent-level-3' }
+          { label: 'Fold Level 4', command: 'editor:fold-at-indent-level-4' }
+          { label: 'Fold Level 5', command: 'editor:fold-at-indent-level-5' }
+          { label: 'Fold Level 6', command: 'editor:fold-at-indent-level-6' }
+          { label: 'Fold Level 7', command: 'editor:fold-at-indent-level-7' }
+          { label: 'Fold Level 8', command: 'editor:fold-at-indent-level-8' }
+          { label: 'Fold Level 9', command: 'editor:fold-at-indent-level-9' }
+        ]
+      }
+    ]
+  }
+
+  {
+    label: '&View'
+    submenu: [
+      { label: '&Reload', command: 'window:reload' }
+      { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
+      {
+        label: 'Developer'
+        submenu: [
+          { label: 'Open In &Dev Mode...', command: 'application:open-dev' }
+          { label: 'Run &Atom Specs', command: 'application:run-all-specs' }
+          { label: 'Run Package &Specs', command: 'window:run-package-specs' }
+          { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' }
+        ]
+      }
+      { type: 'separator' }
+      { label: 'Toggle Soft &Wrap', command: 'editor:toggle-soft-wrap' }
+    ]
+  }
+
+  {
+    label: '&Selection'
+    submenu: [
+      { label: 'Add Selection &Above', command: 'editor:add-selection-above' }
+      { label: 'Add Selection &Below', command: 'editor:add-selection-below' }
+      { label: 'S&plit into Lines', command: 'editor:split-selections-into-lines'}
+      { label: 'Single Selection', command: 'editor:consolidate-selections'}
+      { type: 'separator' }
+      { label: 'Select to &Top', command: 'core:select-to-top' }
+      { label: 'Select to Botto&m', command: 'core:select-to-bottom' }
+      { type: 'separator' }
+      { label: 'Select &Line', command: 'editor:select-line' }
+      { label: 'Select &Word', command: 'editor:select-word' }
+      { label: 'Select to Beginning of W&ord', command: 'editor:select-to-beginning-of-word' }
+      { label: 'Select to Beginning of L&ine', command: 'editor:select-to-beginning-of-line' }
+      { label: 'Select to First &Character of Line', command: 'editor:select-to-first-character-of-line' }
+      { label: 'Select to End of Wor&d', command: 'editor:select-to-end-of-word' }
+      { label: 'Select to End of Lin&e', command: 'editor:select-to-end-of-line' }
+    ]
+  }
+
+  {
+    label: 'F&ind'
+    submenu: []
+  }
+
+  {
+    label: '&Packages'
+    submenu: []
+  }
+
+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
+  {
+    label: '&Help'
+    submenu: [
+      { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
+      { label: 'View &License', command: 'application:open-license' }
+      { label: "VERSION", enabled: false }
+      { type: 'separator' }
+      { label: '&Documentation', command: 'application:open-documentation' }
+      { type: 'separator' }
+    ]
+  }
+]

menus/win32.cson

@@ -4,10 +4,11 @@
     submenu: [
       { label: 'New &Window', command: 'application:new-window' }
       { label: '&New File', command: 'application:new-file' }
-      { label: '&Open...', command: 'application:open' }
+      { label: '&Open File...', command: 'application:open-file' }
+      { label: 'Open Folder...', command: 'application:open-folder' }
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
-      { label: '&Preferences...', command: 'application:show-settings' }
+      { label: 'Se&ttings', command: 'application:show-settings' }
       { type: 'separator' }
       { label: '&Save', command: 'core:save' }
       { label: 'Save &As...', command: 'core:save-as' }
@@ -43,9 +44,9 @@
           { type: 'separator' }
           { label: 'Move Line &Up', command: 'editor:move-line-up' }
           { label: 'Move Line &Down', command: 'editor:move-line-down' }
-          { label: 'Du&plicate Line', command: 'editor:duplicate-line' }
+          { label: 'Du&plicate Lines', command: 'editor:duplicate-lines' }
           { label: 'D&elete Line', command: 'editor:delete-line' }
-          { label: '&Join Lines', command: 'editor:join-line' }
+          { label: '&Join Lines', command: 'editor:join-lines' }
         ]
       }
       {
@@ -87,6 +88,25 @@
     submenu: [
       { label: '&Reload', command: 'window:reload' }
       { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
+      {
+        label: 'Panes'
+        submenu: [
+          { label: 'Split Up', command: 'pane:split-up' }
+          { label: 'Split Down', command: 'pane:split-down' }
+          { label: 'Split Left', command: 'pane:split-left' }
+          { label: 'Split Right', command: 'pane:split-right' }
+          { type: 'separator' }
+          { label: 'Focus Next Pane', command: 'window:focus-next-pane' }
+          { label: 'Focus Previous Pane', command: 'window:focus-previous-pane' }
+          { type: 'separator' }
+          { label: 'Focus Pane Above', command: 'window:focus-pane-above' }
+          { label: 'Focus Pane Below', command: 'window:focus-pane-below' }
+          { label: 'Focus Pane On Left', command: 'window:focus-pane-on-left' }
+          { label: 'Focus Pane On Right', command: 'window:focus-pane-on-right' }
+          { type: 'separator' }
+          { label: 'Close pane', command: 'pane:close' }
+        ]
+      }
       {
         label: 'Developer'
         submenu: [
@@ -107,6 +127,7 @@
       { label: 'Add Selection &Above', command: 'editor:add-selection-above' }
       { label: 'Add Selection &Below', command: 'editor:add-selection-below' }
       { label: 'S&plit into Lines', command: 'editor:split-selections-into-lines'}
+      { label: 'Single Selection', command: 'editor:consolidate-selections'}
       { type: 'separator' }
       { label: 'Select to &Top', command: 'core:select-to-top' }
       { label: 'Select to Botto&m', command: 'core:select-to-bottom' }
@@ -144,9 +165,9 @@
   {
     label: '&Help'
     submenu: [
-      { label: '&About Atom...', command: 'application:about' }
+      { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
+      { label: 'View &License', command: 'application:open-license' }
       { label: "VERSION", enabled: false }
-      { label: "Install &update", command: 'application:install-update', visible: false }
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
       { type: 'separator' }

package.json

@@ -1,7 +1,8 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.49.0",
+  "version": "0.116.0",
+  "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -12,132 +13,130 @@
   },
   "licenses": [
     {
-      "type": "Apache",
+      "type": "MIT",
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.8.7",
+  "atomShellVersion": "0.13.3",
   "dependencies": {
     "async": "0.2.6",
-    "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
-    "clear-cut": "0.2.0",
+    "atom-keymap": "^0.28.0",
+    "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
+    "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
-    "delegato": "1.x",
-    "emissary": "1.x",
-    "first-mate": ">=1.1 <2.0",
-    "fs-plus": "1.x",
+    "delegato": "^1",
+    "emissary": "^1.2.1",
+    "first-mate": "^1.7.1",
+    "fs-plus": "^2.2.4",
     "fstream": "0.1.24",
-    "fuzzaldrin": "1.x",
-    "git-utils": "0.34.0",
+    "fuzzaldrin": "^1.1",
+    "git-utils": "^1.6",
+    "grim": "0.11.0",
     "guid": "0.0.10",
-    "jasmine-tagged": "1.x",
+    "jasmine-tagged": "^1.1.2",
+    "less-cache": "0.13.0",
+    "mixto": "^1",
     "mkdirp": "0.3.5",
-    "keytar": "0.15.1",
-    "less-cache": "0.11.0",
-    "mixto": "1.x",
-    "nslog": "0.4.0",
-    "oniguruma": "1.x",
+    "nslog": "0.5.0",
+    "oniguruma": "^1.0.6",
     "optimist": "0.4.0",
-    "pathwatcher": "0.14.2",
-    "pegjs": "0.8.0",
-    "property-accessors": "1.x",
-    "q": "0.9.7",
-    "scandal": "0.13.0",
-    "season": "1.x",
+    "pathwatcher": "^1.5",
+    "property-accessors": "^1",
+    "q": "^1.0.1",
+    "random-words": "0.0.1",
+    "react-atom-fork": "^0.10.0",
+    "reactionary-atom-fork": "^0.9.0",
+    "runas": "0.5.4",
+    "scandal": "0.16.0",
+    "scoped-property-store": "^0.9.0",
+    "scrollbar-style": "^0.4.0",
+    "season": "^1.0.2",
     "semver": "1.1.4",
-    "serializable": "1.x",
-    "space-pen": "3.1.1",
-    "temp": "0.5.0",
-    "text-buffer": "0.16.0",
-    "theorist": "1.x",
-    "underscore-plus": "1.x",
+    "serializable": "^1",
+    "space-pen": "3.2.0",
+    "temp": "0.7.0",
+    "text-buffer": "^2.4.2",
+    "theorist": "^1",
+    "underscore-plus": "^1.5.0",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.12.0",
-    "atom-dark-ui": "0.21.0",
-    "atom-light-syntax": "0.12.0",
-    "atom-light-ui": "0.20.0",
-    "base16-tomorrow-dark-theme": "0.10.0",
-    "solarized-dark-syntax": "0.8.0",
-    "solarized-light-syntax": "0.4.0",
-    "archive-view": "0.21.0",
-    "autocomplete": "0.21.0",
-    "autoflow": "0.12.0",
-    "autosave": "0.10.0",
-    "background-tips": "0.5.0",
-    "bookmarks": "0.18.0",
-    "bracket-matcher": "0.19.0",
-    "command-logger": "0.10.0",
-    "command-palette": "0.15.0",
-    "dev-live-reload": "0.23.0",
-    "editor-stats": "0.12.0",
-    "exception-reporting": "0.13.0",
-    "feedback": "0.22.0",
-    "find-and-replace": "0.81.0",
-    "fuzzy-finder": "0.32.0",
-    "gists": "0.15.0",
-    "git-diff": "0.23.0",
-    "github-sign-in": "0.18.0",
-    "go-to-line": "0.16.0",
-    "grammar-selector": "0.18.0",
-    "image-view": "0.17.0",
-    "keybinding-resolver": "0.9.0",
-    "link": "0.15.0",
-    "markdown-preview": "0.25.1",
-    "metrics": "0.24.0",
-    "package-generator": "0.25.0",
-    "release-notes": "0.17.0",
-    "settings-view": "0.63.0",
-    "snippets": "0.24.0",
-    "spell-check": "0.21.0",
-    "status-bar": "0.32.0",
-    "styleguide": "0.22.0",
-    "symbols-view": "0.30.0",
-    "tabs": "0.18.0",
-    "terminal": "0.27.0",
-    "timecop": "0.13.0",
-    "to-the-hubs": "0.18.0",
-    "tree-view": "0.65.0",
-    "update-package-dependencies": "0.2.0",
-    "visual-bell": "0.6.0",
-    "welcome": "0.4.0",
-    "whitespace": "0.10.0",
-    "wrap-guide": "0.12.0",
-    "language-c": "0.2.0",
-    "language-clojure": "0.1.0",
-    "language-coffee-script": "0.6.0",
-    "language-css": "0.2.0",
-    "language-gfm": "0.12.0",
-    "language-git": "0.3.0",
-    "language-go": "0.2.0",
-    "language-html": "0.2.0",
-    "language-hyperlink": "0.3.0",
-    "language-java": "0.2.0",
-    "language-javascript": "0.5.0",
-    "language-json": "0.2.0",
-    "language-less": "0.1.0",
-    "language-make": "0.1.0",
-    "language-mustache": "0.1.0",
-    "language-objective-c": "0.2.0",
-    "language-pegjs": "0.1.0",
-    "language-perl": "0.2.0",
-    "language-php": "0.3.0",
-    "language-property-list": "0.2.0",
-    "language-puppet": "0.2.0",
-    "language-python": "0.2.0",
-    "language-ruby": "0.8.0",
-    "language-ruby-on-rails": "0.4.0",
-    "language-sass": "0.3.0",
-    "language-shellscript": "0.2.0",
-    "language-source": "0.2.0",
-    "language-sql": "0.2.0",
-    "language-text": "0.2.0",
-    "language-todo": "0.2.0",
-    "language-toml": "0.7.0",
-    "language-xml": "0.2.0",
-    "language-yaml": "0.1.0"
+    "atom-dark-syntax": "0.19.0",
+    "atom-dark-ui": "0.32.0",
+    "atom-light-syntax": "0.20.0",
+    "atom-light-ui": "0.28.0",
+    "base16-tomorrow-dark-theme": "0.19.0",
+    "solarized-dark-syntax": "0.21.0",
+    "solarized-light-syntax": "0.11.0",
+    "archive-view": "0.34.0",
+    "autocomplete": "0.28.0",
+    "autoflow": "0.17.0",
+    "autosave": "0.14.0",
+    "background-tips": "0.15.0",
+    "bookmarks": "0.27.0",
+    "bracket-matcher": "0.48.0",
+    "command-palette": "0.24.0",
+    "deprecation-cop": "0.7.0",
+    "dev-live-reload": "0.31.0",
+    "exception-reporting": "0.18.0",
+    "feedback": "0.33.0",
+    "find-and-replace": "0.127.0",
+    "fuzzy-finder": "0.57.0",
+    "git-diff": "0.37.0",
+    "go-to-line": "0.23.0",
+    "grammar-selector": "0.27.0",
+    "image-view": "0.36.0",
+    "keybinding-resolver": "0.18.0",
+    "link": "0.24.0",
+    "markdown-preview": "0.93.0",
+    "metrics": "0.33.0",
+    "open-on-github": "0.29.0",
+    "package-generator": "0.31.0",
+    "release-notes": "0.35.0",
+    "settings-view": "0.134.0",
+    "snippets": "0.48.0",
+    "spell-check": "0.38.0",
+    "status-bar": "0.41.0",
+    "styleguide": "0.29.0",
+    "symbols-view": "0.60.0",
+    "tabs": "0.45.0",
+    "timecop": "0.21.0",
+    "tree-view": "0.111.0",
+    "update-package-dependencies": "0.6.0",
+    "welcome": "0.17.0",
+    "whitespace": "0.25.0",
+    "wrap-guide": "0.21.0",
+
+    "language-c": "0.22.0",
+    "language-coffee-script": "0.27.0",
+    "language-css": "0.17.0",
+    "language-gfm": "0.43.0",
+    "language-git": "0.9.0",
+    "language-go": "0.13.0",
+    "language-html": "0.22.0",
+    "language-hyperlink": "0.10.0",
+    "language-java": "0.11.0",
+    "language-javascript": "0.36.0",
+    "language-json": "0.8.0",
+    "language-less": "0.13.0",
+    "language-make": "0.10.0",
+    "language-objective-c": "0.11.0",
+    "language-perl": "0.9.0",
+    "language-php": "0.15.0",
+    "language-property-list": "0.7.0",
+    "language-python": "0.18.0",
+    "language-ruby": "0.33.0",
+    "language-ruby-on-rails": "0.15.0",
+    "language-sass": "0.14.0",
+    "language-shellscript": "0.8.0",
+    "language-source": "0.7.0",
+    "language-sql": "0.9.0",
+    "language-text": "0.6.0",
+    "language-todo": "0.10.0",
+    "language-toml": "0.12.0",
+    "language-xml": "0.15.0",
+    "language-yaml": "0.13.0"
   },
   "private": true,
   "scripts": {

resources/linux/Atom.desktop.in

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Atom
+Comment=<%= description %>
+Exec=<%= installDir %>/share/atom/atom %U
+Icon=<%= iconName %>
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Utility;TextEditor;

resources/linux/debian/control.in

@@ -0,0 +1,8 @@
+Package: <%= name %>
+Version: <%= version %>
+Section: <%= section %>
+Priority: optional
+Architecture: <%= arch %>
+Installed-Size: `du -ks usr|cut -f 1`
+Maintainer: <%= maintainer %>
+Description: <%= description %>

script/bootstrap

@@ -1,51 +1,99 @@
-#!/usr/bin/env node --harmony_collections
-var safeExec = require('./utils/child-process-wrapper.js').safeExec;
-var fs = require('fs');
-var path = require('path');
+#!/usr/bin/env node
 
-// OAuth token for atom-bot
-// TODO Remove once all repositories are public
-if (!process.env.ATOM_ACCESS_TOKEN)
-  process.env.ATOM_ACCESS_TOKEN = '362295be4c5258d3f7b967bbabae662a455ca2a7';
+var fs = require('fs');
+var verifyRequirements = require('./utils/verify-requirements');
+var safeExec = require('./utils/child-process-wrapper.js').safeExec;
+var path = require('path');
 
 // Executes an array of commands one by one.
 function executeCommands(commands, done, index) {
   index = (index == undefined ? 0 : index);
   if (index < commands.length) {
     var command = commands[index];
+    if (command.message)
+      console.log(command.message);
     var options = null;
     if (typeof command !== 'string') {
       options = command.options;
       command = command.command;
     }
     safeExec(command, options, executeCommands.bind(this, commands, done, index + 1));
-  } else
+  }
+  else
     done(null);
 }
 
-var apmVendorPath = path.resolve(__dirname, '..', 'vendor', 'apm');
-var apmInstallPath = path.resolve(__dirname, '..', 'apm');
-if (!fs.existsSync(apmInstallPath))
-  fs.mkdirSync(apmInstallPath);
-if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
-  fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
+function bootstrap() {
+  var apmInstallPath = path.resolve(__dirname, '..', 'apm');
+  if (!fs.existsSync(apmInstallPath))
+    fs.mkdirSync(apmInstallPath);
+  if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
+    fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
-var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
-var packagesToDedupe = ['fs-plus', 'humanize-plus', 'nan', 'oniguruma', 'roaster', 'season'];
-var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
-var commands = [
-  'git submodule --quiet sync',
-  'git submodule --quiet update --recursive --init',
-  {command: 'npm install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
-  {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,
-  'node apm/node_modules/atom-package-manager/bin/apm dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
-];
+  var apmPath = path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')
+  var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? ' --no-color' : '';
 
-process.chdir(path.dirname(__dirname));
-executeCommands(commands, process.exit);
+  var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
+  var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
+  var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
+
+  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim'];
+
+  var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
+  var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};
+  var apmInstallCommand = npmPath + npmFlags + 'install';
+  var apmInstallOptions = {cwd: apmInstallPath};
+  var moduleInstallCommand = apmPath + ' install' + apmFlags;
+  var dedupeApmCommand = apmPath + ' dedupe' + apmFlags;
+  var dedupeNpmCommand = npmPath + npmFlags + 'dedupe';
+
+  if (process.argv.indexOf('--no-quiet') === -1) {
+    buildInstallCommand  += ' --quiet';
+    apmInstallCommand    += ' --quiet';
+    moduleInstallCommand += ' --quiet';
+    dedupeApmCommand     += ' --quiet';
+    dedupeNpmCommand     += ' --quiet';
+    buildInstallOptions.ignoreStdout = true;
+    apmInstallOptions.ignoreStdout = true;
+  }
+
+  // apm ships with 32-bit node so make sure its native modules are compiled
+  // for a 32-bit target architecture
+  if (process.env.JANKY_SHA1 && process.platform === 'win32')
+    apmInstallCommand += ' --arch=ia32';
+
+  var commands = [
+    {
+      command: buildInstallCommand,
+      message: 'Installing build modules...',
+      options: buildInstallOptions
+    },
+    {
+      command: apmInstallCommand,
+      message: 'Installing apm...',
+      options: apmInstallOptions
+    },
+    apmPath + ' clean' + apmFlags,
+    moduleInstallCommand,
+    dedupeApmCommand + ' ' + packagesToDedupe.join(' '),
+    {
+      command: dedupeNpmCommand + ' request',
+      options: {
+        cwd: path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager')
+      }
+    },
+  ];
+
+  process.chdir(path.dirname(__dirname));
+  executeCommands(commands, process.exit);
+}
+
+verifyRequirements(function(error, successMessage) {
+  if (error) {
+    console.log(error);
+    process.exit(1);
+  }
+
+  console.log(successMessage);
+  bootstrap();
+});

script/build

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
 var path = require('path');
 

script/cibuild

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
 var fs = require('fs');
 var path = require('path');
@@ -19,26 +19,34 @@ function loadEnvironmentVariables(filePath) {
       var value = parts[1].trim().substr(1, parts[1].length - 2);
       process.env[key] = value;
     }
-  } catch(error) { }
+  } catch(error) {
+    console.error("Failed to load environment variables: " + filePath, error.code);
+  }
 }
 
 function readEnvironmentVariables() {
-  loadEnvironmentVariables('/var/lib/jenkins/config/atomcredentials')
-  loadEnvironmentVariables('/var/lib/jenkins/config/xcodekeychain')
+  if (process.platform === 'win32')
+    loadEnvironmentVariables(path.resolve('/jenkins/config/atomcredentials'));
+  else {
+    loadEnvironmentVariables('/var/lib/jenkins/config/atomcredentials');
+    loadEnvironmentVariables('/var/lib/jenkins/config/xcodekeychain');
+  }
 }
 
 readEnvironmentVariables();
-cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
-  if (error)
-    process.exit(1);
-  require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom'))
-  var async = require('async');
-  var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
-  var tasks = [
-    cp.safeExec.bind(global, 'git clean -dff'),
-    cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
-  ]
-  async.series(tasks, function(error) {
-    process.exit(error ? 1 : 0);
-  });
+cp.safeExec.bind(global, 'npm install npm', {cwd: path.resolve(__dirname, '..', 'build')}, function() {
+  cp.safeExec.bind(global, 'node script/bootstrap', function(error) {
+    if (error)
+      process.exit(1);
+    require('fs-plus').removeSync.bind(global, path.join(homeDir, '.atom'))
+    var async = require('async');
+    var gruntPath = path.join('build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+    var tasks = [
+      cp.safeExec.bind(global, 'git clean -dff'),
+      cp.safeExec.bind(global, gruntPath + ' ci --gruntfile build/Gruntfile.coffee --stack --no-color'),
+    ]
+    async.series(tasks, function(error) {
+      process.exit(error ? 1 : 0);
+    });
+  })();
 })();

script/clean

@@ -1,14 +1,15 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
+var fs = require('fs');
 var path = require('path');
 var os = require('os');
 
-var removeCommand = process.platform === 'win32' ? 'del /F /Q /S ' : 'rm -rf ';
+var removeCommand = process.platform === 'win32' ? 'rmdir /S /Q ' : 'rm -rf ';
 var productName = require('../package.json').productName;
 
 process.chdir(path.dirname(__dirname));
 var home = process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
-var tmpdir = process.platform === 'win32' ? os.tmpdir() : '/tmp';
+var tmpdir = os.tmpdir();
 
 // Windows: Use START as a way to ignore error if Atom.exe isnt running
 var killatom = process.platform === 'win32' ? 'START taskkill /F /IM ' + productName + '.exe' : 'pkill -9 ' + productName + ' || true';
@@ -18,20 +19,27 @@ var commands = [
   [__dirname, '..', 'node_modules'],
   [__dirname, '..', 'build', 'node_modules'],
   [__dirname, '..', 'apm', 'node_modules'],
-  [__dirname, '..', 'vendor', 'apm', 'node_modules'],
   [__dirname, '..', 'atom-shell'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],
+  [home, '.atom', '.npm'],
+  [home, '.atom', 'compile-cache'],
   [tmpdir, 'atom-build'],
   [tmpdir, 'atom-cached-atom-shells'],
-  [tmpdir, 'atom-compile-cache'],
 ];
 var run = function() {
   var next = commands.shift();
   if (!next)
     process.exit(0);
-  if (Array.isArray(next))
-    next = removeCommand + path.resolve.apply(path.resolve, next);
+
+  if (Array.isArray(next)) {
+    var pathToRemove = path.resolve.apply(path.resolve, next);
+    if (fs.existsSync(pathToRemove))
+      next = removeCommand + pathToRemove;
+    else
+      return run();
+  }
+
   cp.safeExec(next, run);
 };
 run();

script/grunt

@@ -1,9 +1,17 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
+var fs = require('fs');
 var path = require('path');
 
 // node build/node_modules/.bin/grunt "$@"
 var gruntPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : '');
+
+if (!fs.existsSync(gruntPath)) {
+  console.error('Grunt command does not exist at: ' + gruntPath);
+  console.error('Run script/bootstrap to install Grunt');
+  process.exit(1);
+}
+
 var args = ['--gruntfile', path.resolve('build', 'Gruntfile.coffee')];
 args = args.concat(process.argv.slice(2));
 cp.safeSpawn(gruntPath, args, process.exit);

script/grunt.cmd

@@ -0,0 +1,5 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\grunt" %*
+) ELSE (
+  node  "%~dp0\grunt" %*
+)

script/install-cli

@@ -1,10 +0,0 @@
-#!/usr/bin/env coffee
-
-path = require 'path'
-CommandInstaller = require '../src/command-installer'
-
-callback = (error) ->
-  console.warn error.message if error?
-
-CommandInstaller.installAtomCommand(path.resolve(__dirname, '..'), callback)
-CommandInstaller.installApmCommand(path.resolve(__dirname, '..'), callback)

script/mkdeb

@@ -0,0 +1,35 @@
+#!/bin/bash
+# mkdeb version control-file-path deb-file-path
+
+set -e
+
+SCRIPT=`readlink -f "$0"`
+ROOT=`readlink -f $(dirname $SCRIPT)/..`
+cd $ROOT
+
+VERSION="$1"
+ARCH="$2"
+CONTROL_FILE="$3"
+DESKTOP_FILE="$4"
+ICON_FILE="$5"
+DEB_PATH="$6"
+
+TARGET_ROOT="`mktemp -d`"
+chmod 755 "$TARGET_ROOT"
+TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"
+
+mkdir -p "$TARGET/usr"
+env INSTALL_PREFIX="$TARGET/usr" script/grunt install
+
+mkdir -p "$TARGET/DEBIAN"
+cp "$CONTROL_FILE" "$TARGET/DEBIAN/control"
+
+mkdir -p "$TARGET/usr/share/applications"
+cp "$DESKTOP_FILE" "$TARGET/usr/share/applications"
+
+mkdir -p "$TARGET/usr/share/pixmaps"
+cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
+
+dpkg-deb -b "$TARGET"
+mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
+rm -rf $TARGET_ROOT

script/test

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var safeExec = require('./utils/child-process-wrapper.js').safeExec;
 var path = require('path');
 

script/utils/update-octicons

@@ -1,32 +0,0 @@
-#!/usr/bin/env coffee
-
-usage = """
-Usage:
-  update-octicons PATH-TO-OCTICONS
-"""
-
-path = require 'path'
-fs = require 'fs'
-YAML = require 'js-yaml'
-
-scriptPath = process.argv[1]
-pathToOcticons = process.argv[2] ? path.join(process.env.HOME, 'github', 'octicons')
-atomDir = path.resolve(scriptPath, "../../..")
-
-unless fs.existsSync(pathToOcticons)
-  console.error(usage)
-  process.exit(1)
-
-# Copy font-file
-fontSrc = path.join(pathToOcticons, 'octicons', 'octicons.woff')
-fontDest = path.join(atomDir, 'static', 'octicons.woff')
-fs.createReadStream(fontSrc).pipe(fs.createWriteStream(fontDest))
-
-# Update Octicon UTF codes
-glyphsSrc = path.join(pathToOcticons, 'data', 'glyphs.yml')
-octiconUtfDest = path.join atomDir, 'static', 'variables', 'octicon-utf-codes.less'
-output = []
-for {css, code} in YAML.load(fs.readFileSync(glyphsSrc).toString())
-  output.push "@#{css}: \"\\#{code}\";"
-
-fs.writeFileSync octiconUtfDest, "#{output.join('\n')}\n"

script/utils/verify-requirements.js

@@ -0,0 +1,117 @@
+var path = require('path');
+var fs = require('fs');
+var childProcess = require('child_process');
+
+var pythonExecutable = process.env.PYTHON;
+
+module.exports = function(cb) {
+  verifyNode(function(error, nodeSuccessMessage) {
+    if (error) {
+      cb(error);
+      return;
+    }
+
+    verifyNpm(function(error, npmSuccessMessage) {
+      if (error) {
+        cb(error);
+        return;
+      }
+
+      verifyPython27(function(error, pythonSuccessMessage) {
+        cb(error, (nodeSuccessMessage + "\n" + npmSuccessMessage + "\n" + pythonSuccessMessage).trim());
+      });
+    });
+  });
+
+};
+
+function verifyNode(cb) {
+  var nodeVersion = process.versions.node;
+  var versionArray = nodeVersion.split('.');
+  var nodeMajorVersion = +versionArray[0];
+  var nodeMinorVersion = +versionArray[1];
+  if (nodeMajorVersion === 0 && nodeMinorVersion < 10) {
+    error = "node v0.10 is required to build Atom.";
+    cb(error);
+  }
+  else {
+    cb(null, "Node: v" + nodeVersion);
+  }
+}
+
+function verifyNpm(cb) {
+  var localNpmPath = path.resolve(__dirname, '..', '..', 'build', 'node_modules', '.bin', 'npm');
+  if (process.platform === 'win32')
+    localNpmPath += ".cmd";
+
+  var npmCommand = fs.existsSync(localNpmPath) ? localNpmPath : 'npm';
+  if (npmCommand === 'npm' && process.platform === 'win32')
+    npmCommand += ".cmd";
+
+  childProcess.execFile(npmCommand, ['-v'], { env: process.env }, function(err, stdout) {
+    if (err)
+      return cb("npm 1.4 is required to build Atom. An error (" + err + ") occured when checking the version.");
+
+    var npmVersion = stdout ? stdout.trim() : '';
+    var versionArray = npmVersion.split('.');
+    var npmMajorVersion = +versionArray[0] || 0;
+    var npmMinorVersion = +versionArray[1] || 0;
+    if (npmMajorVersion === 1 && npmMinorVersion < 4)
+      cb("npm v1.4+ is required to build Atom.");
+    else
+      cb(null, "npm: v" + npmVersion);
+  });
+}
+
+
+function verifyPython27(cb) {
+  if (process.platform == 'win32') {
+    if (!pythonExecutable) {
+      var systemDrive = process.env.SystemDrive || 'C:\\';
+      pythonExecutable = path.join(systemDrive, 'Python27', 'python.exe');
+
+      if (!fs.existsSync(pythonExecutable)) {
+        pythonExecutable = 'python';
+      }
+    }
+
+    checkPythonVersion(pythonExecutable, cb);
+  }
+  else {
+    cb(null, '');
+  }
+}
+
+function checkPythonVersion (python, cb) {
+  var pythonHelpMessage = "Set the PYTHON env var to '/path/to/Python27/python.exe' if your python is installed in a non-default location.";
+
+  childProcess.execFile(python, ['-c', 'import platform; print(platform.python_version());'], { env: process.env }, function (err, stdout) {
+    if (err) {
+      error = "Python 2.7 is required to build Atom. An error (" + err + ") occured when checking the version of '" + python + "'. ";
+      error += pythonHelpMessage;
+      cb(error);
+      return;
+    }
+
+    var version = stdout.trim();
+    if (~version.indexOf('+')) {
+      version = version.replace(/\+/g, '');
+    }
+    if (~version.indexOf('rc')) {
+      version = version.replace(/rc(.*)$/ig, '');
+    }
+
+    // Atom requires python 2.7 or higher (but not python 3) for node-gyp
+    var versionArray = version.split('.').map(function(num) { return +num; });
+    var goodPythonVersion = (versionArray[0] === 2 && versionArray[1] >= 7);
+    if (!goodPythonVersion) {
+      error = "Python 2.7 is required to build Atom. '" + python + "' returns version " + version + ". ";
+      error += pythonHelpMessage;
+      cb(error);
+      return;
+    }
+
+    // Finally, if we've gotten this far, callback to resume the install process.
+    cb(null, "Python: v" + version);
+  });
+}

spec/atom-reporter.coffee

@@ -1,40 +1,63 @@
-{View, $, $$} = require '../src/space-pen-extensions'
+path = require 'path'
 _ = require 'underscore-plus'
 {convertStackTrace} = require 'coffeestack'
+{View, $, $$} = require '../src/space-pen-extensions'
+grim = require 'grim'
 
 sourceMaps = {}
-formatStackTrace = (stackTrace) ->
+formatStackTrace = (spec, message='', stackTrace) ->
   return stackTrace unless stackTrace
 
-  jasminePath = require.resolve('../vendor/jasmine')
-  jasminePattern = new RegExp("\\(#{_.escapeRegExp(jasminePath)}:\\d+:\\d+\\)\\s*$")
+  jasminePattern = /^\s*at\s+.*\(?.*[/\\]jasmine(-[^/\\]*)?\.js:\d+:\d+\)?\s*$/
+  firstJasmineLinePattern = /^\s*at [/\\].*[/\\]jasmine(-[^/\\]*)?\.js:\d+:\d+\)?\s*$/
   convertedLines = []
   for line in stackTrace.split('\n')
     convertedLines.push(line) unless jasminePattern.test(line)
+    break if firstJasmineLinePattern.test(line)
 
-  convertStackTrace(convertedLines.join('\n'), sourceMaps)
+  stackTrace = convertStackTrace(convertedLines.join('\n'), sourceMaps)
+  lines = stackTrace.split('\n')
+
+  # Remove first line of stack when it is the same as the error message
+  errorMatch = lines[0]?.match(/^Error: (.*)/)
+  lines.shift() if message.trim() is errorMatch?[1]?.trim()
+
+  for line, index in lines
+    # Remove prefix of lines matching: at [object Object].<anonymous> (path:1:2)
+    prefixMatch = line.match(/at \[object Object\]\.<anonymous> \(([^)]+)\)/)
+    line = "at #{prefixMatch[1]}" if prefixMatch
+
+    # Relativize locations to spec directory
+    lines[index] = line.replace("at #{spec.specDirectory}#{path.sep}", 'at ')
+
+  lines = lines.map (line) -> line.trim()
+  lines.join('\n').trim()
 
 module.exports =
 class AtomReporter extends View
   @content: ->
-    @div id: 'HTMLReporter', class: 'jasmine_reporter', =>
-      @div outlet: 'specPopup', class: "spec-popup"
+    @div class: 'spec-reporter', =>
       @div outlet: "suites"
-      @div outlet: 'coreArea', =>
-        @div outlet: 'coreHeader', class: 'symbolHeader'
-        @ul outlet: 'coreSummary', class: 'symbolSummary list-unstyled'
-      @div outlet: 'bundledArea', =>
-        @div outlet: 'bundledHeader', class: 'symbolHeader'
-        @ul outlet: 'bundledSummary', class: 'symbolSummary list-unstyled'
-      @div outlet: 'userArea', =>
-        @div outlet: 'userHeader', class: 'symbolHeader'
-        @ul outlet: 'userSummary', class: 'symbolSummary list-unstyled'
-      @div outlet: "status", class: 'status', =>
+      @div outlet: 'coreArea', class: 'symbol-area', =>
+        @div outlet: 'coreHeader', class: 'symbol-header'
+        @ul outlet: 'coreSummary', class: 'symbol-summary list-unstyled'
+      @div outlet: 'bundledArea', class: 'symbol-area', =>
+        @div outlet: 'bundledHeader', class: 'symbol-header'
+        @ul outlet: 'bundledSummary', class: 'symbol-summary list-unstyled'
+      @div outlet: 'userArea', class: 'symbol-area', =>
+        @div outlet: 'userHeader', class: 'symbol-header'
+        @ul outlet: 'userSummary', class: 'symbol-summary list-unstyled'
+      @div outlet: "status", class: 'status alert alert-info', =>
         @div outlet: "time", class: 'time'
         @div outlet: "specCount", class: 'spec-count'
         @div outlet: "message", class: 'message'
       @div outlet: "results", class: 'results'
 
+      @div outlet: "deprecations", class: 'status alert alert-warning', style: 'display: none', =>
+        @span outlet: 'deprecationStatus', '0 deprecations'
+        @div class: 'deprecation-toggle'
+      @div outlet: 'deprecationList', class: 'deprecation-list'
+
   startedAt: null
   runningSpecCount: 0
   completeSpecCount: 0
@@ -42,11 +65,12 @@ class AtomReporter extends View
   failedCount: 0
   skippedCount: 0
   totalSpecCount: 0
+  deprecationCount: 0
   @timeoutId: 0
 
   reportRunnerStarting: (runner) ->
     @handleEvents()
-    @startedAt = new Date()
+    @startedAt = Date.now()
     specs = runner.specs()
     @totalSpecCount = specs.length
     @addSpecs(specs)
@@ -54,57 +78,59 @@ class AtomReporter extends View
 
   reportRunnerResults: (runner) ->
     @updateSpecCounts()
-    if @failedCount == 0
-      @message.text "Success!"
+    @status.addClass('alert-success').removeClass('alert-info') if @failedCount is 0
+    if @failedCount is 1
+      @message.text "#{@failedCount} failure"
     else
-      @message.text "Game Over"
+      @message.text "#{@failedCount} failures"
 
   reportSuiteResults: (suite) ->
 
   reportSpecResults: (spec) ->
     @completeSpecCount++
-    spec.endedAt = new Date().getTime()
+    spec.endedAt = Date.now()
     @specComplete(spec)
     @updateStatusView(spec)
 
   reportSpecStarting: (spec) ->
     @specStarted(spec)
 
-  specFilter: (spec) ->
-    globalFocusPriority = jasmine.getEnv().focusPriority
-    parent = spec.parentSuite ? spec.suite
-
-    if !globalFocusPriority
-      true
-    else if spec.focusPriority >= globalFocusPriority
-      true
-    else if not parent
-      false
+  addDeprecations: (spec) ->
+    deprecations = grim.getDeprecations()
+    @deprecationCount += deprecations.length
+    @deprecations.show() if @deprecationCount > 0
+    if @deprecationCount is 1
+      @deprecationStatus.text("1 deprecation")
     else
-      @specFilter(parent)
+      @deprecationStatus.text("#{@deprecationCount} deprecations")
+
+    for deprecation in deprecations
+      @deprecationList.append $$ ->
+        @div class: 'padded', =>
+          @div class: 'result-message fail deprecation-message', deprecation.message
+
+          for stack in deprecation.stacks
+            fullStack = stack.map ({functionName, location}) ->
+              if functionName is '<unknown>'
+                "  at #{location}"
+              else
+                "  at #{functionName} (#{location})"
+            @pre class: 'stack-trace padded', formatStackTrace(spec, deprecation.message, fullStack.join('\n'))
+    grim.clearDeprecations()
 
   handleEvents: ->
-    $(document).on "mouseover", ".spec-summary", ({currentTarget}) =>
-      element = $(currentTarget)
-      description = element.data("description")
-      return unless description
-
-      clearTimeout @timeoutId if @timeoutId?
-      @specPopup.show()
-      spec = _.find(window.timedSpecs, ({fullName}) -> description is fullName)
-      description = "#{description} #{spec.time}ms" if spec
-      @specPopup.text description
-      {left, top} = element.offset()
-      left += 20
-      top += 20
-      @specPopup.offset({left, top})
-      @timeoutId = setTimeout((=> @specPopup.hide()), 3000)
-
     $(document).on "click", ".spec-toggle", ({currentTarget}) =>
       element = $(currentTarget)
       specFailures = element.parent().find('.spec-failures')
       specFailures.toggle()
-      if specFailures.is(":visible") then element.text "\uf03d" else element.html "\uf03f"
+      element.toggleClass('folded')
+      false
+
+    $(document).on "click", ".deprecation-toggle", ({currentTarget}) =>
+      element = $(currentTarget)
+      deprecationList = $(document).find('.deprecation-list')
+      deprecationList.toggle()
+      element.toggleClass('folded')
       false
 
   updateSpecCounts: ->
@@ -116,7 +142,7 @@ class AtomReporter extends View
 
   updateStatusView: (spec) ->
     if @failedCount > 0
-      @status.addClass('failed') unless @status.hasClass('failed')
+      @status.addClass('alert-danger').removeClass('alert-info')
 
     @updateSpecCounts()
 
@@ -124,7 +150,7 @@ class AtomReporter extends View
     rootSuite = rootSuite.parentSuite while rootSuite.parentSuite
     @message.text rootSuite.description
 
-    time = "#{Math.round((spec.endedAt - @startedAt.getTime()) / 10)}"
+    time = "#{Math.round((spec.endedAt - @startedAt) / 10)}"
     time = "0#{time}" if time.length < 3
     @time[0].textContent = "#{time[0...-2]}.#{time[-2..]}s"
 
@@ -146,15 +172,22 @@ class AtomReporter extends View
           @userSummary.append symbol
 
     if coreSpecs > 0
-      @coreHeader.text("Core Specs (#{coreSpecs}):")
+      @coreHeader.text("Core Specs (#{coreSpecs})")
     else
       @coreArea.hide()
     if bundledPackageSpecs > 0
-      @bundledHeader.text("Bundled Package Specs (#{bundledPackageSpecs}):")
+      @bundledHeader.text("Bundled Package Specs (#{bundledPackageSpecs})")
     else
       @bundledArea.hide()
     if userPackageSpecs > 0
-      @userHeader.text("User Package Specs (#{userPackageSpecs}):")
+      if coreSpecs is 0 and bundledPackageSpecs is 0
+        # Package specs being run, show a more descriptive label
+        {specDirectory} = specs[0]
+        packageFolderName = path.basename(path.dirname(specDirectory))
+        packageName = _.undasherize(_.uncamelcase(packageFolderName))
+        @userHeader.text("#{packageName} Specs")
+      else
+        @userHeader.text("User Package Specs (#{userPackageSpecs})")
     else
       @userArea.hide()
 
@@ -164,7 +197,7 @@ class AtomReporter extends View
   specComplete: (spec) ->
     specSummaryElement = $("#spec-summary-#{spec.id}")
     specSummaryElement.removeClass('pending')
-    specSummaryElement.data("description", spec.getFullName())
+    specSummaryElement.setTooltip(title: spec.getFullName(), container: '.spec-reporter')
 
     results = spec.results()
     if results.skipped
@@ -179,17 +212,16 @@ class AtomReporter extends View
       specView = new SpecResultView(spec)
       specView.attach()
       @failedCount++
+    @addDeprecations(spec)
 
 class SuiteResultView extends View
   @content: ->
     @div class: 'suite', =>
       @div outlet: 'description', class: 'description'
 
-  suite: null
-
   initialize: (@suite) ->
     @attr('id', "suite-view-#{@suite.id}")
-    @description.html @suite.description
+    @description.text(@suite.description)
 
   attach: ->
     (@parentSuiteView() or $('.results')).append this
@@ -206,20 +238,22 @@ class SuiteResultView extends View
 class SpecResultView extends View
   @content: ->
     @div class: 'spec', =>
-      @div "\uf03d", class: 'spec-toggle'
+      @div class: 'spec-toggle'
       @div outlet: 'description', class: 'description'
       @div outlet: 'specFailures', class: 'spec-failures'
-  spec: null
 
   initialize: (@spec) ->
     @addClass("spec-view-#{@spec.id}")
-    @description.html @spec.description
+
+    description = @spec.description
+    description = "it #{description}" if description.indexOf('it ') isnt 0
+    @description.text(description)
 
     for result in @spec.results().getItems() when not result.passed()
-      stackTrace = formatStackTrace(result.trace.stack)
+      stackTrace = formatStackTrace(@spec, result.message, result.trace.stack)
       @specFailures.append $$ ->
-        @div result.message, class: 'resultMessage fail'
-        @div stackTrace, class: 'stackTrace' if stackTrace
+        @div result.message, class: 'result-message fail'
+        @pre stackTrace, class: 'stack-trace padded' if stackTrace
 
   attach: ->
     @parentSuiteView().append this

spec/atom-spec.coffee

@@ -1,6 +1,7 @@
-{$, $$, fs, WorkspaceView}  = require 'atom'
+{$, $$, WorkspaceView}  = require 'atom'
 Exec = require('child_process').exec
 path = require 'path'
+Package = require '../src/package'
 ThemeManager = require '../src/theme-manager'
 
 describe "the `atom` global", ->
@@ -9,35 +10,28 @@ describe "the `atom` global", ->
 
   describe "package lifecycle methods", ->
     describe ".loadPackage(name)", ->
-      describe "when the package has deferred deserializers", ->
-        it "requires the package's main module if one of its deferred deserializers is referenced", ->
-          pack = atom.packages.loadPackage('package-with-activation-events')
-          spyOn(pack, 'activateStylesheets').andCallThrough()
-          expect(pack.mainModule).toBeNull()
-          object = atom.deserializers.deserialize({deserializer: 'Foo', data: 5})
-          expect(pack.mainModule).toBeDefined()
-          expect(object.constructor.name).toBe 'Foo'
-          expect(object.data).toBe 5
-          expect(pack.activateStylesheets).toHaveBeenCalled()
+      it "continues if the package has an invalid package.json", ->
+        spyOn(console, 'warn')
+        atom.config.set("core.disabledPackages", [])
+        expect(-> atom.packages.loadPackage("package-with-broken-package-json")).not.toThrow()
 
-        it "continues if the package has an invalid package.json", ->
-          spyOn(console, 'warn')
-          atom.config.set("core.disabledPackages", [])
-          expect(-> atom.packages.loadPackage("package-with-broken-package-json")).not.toThrow()
-
-        it "continues if the package has an invalid keymap", ->
-          atom.config.set("core.disabledPackages", [])
-          expect(-> atom.packages.loadPackage("package-with-broken-keymap")).not.toThrow()
+      it "continues if the package has an invalid keymap", ->
+        atom.config.set("core.disabledPackages", [])
+        expect(-> atom.packages.loadPackage("package-with-broken-keymap")).not.toThrow()
 
     describe ".unloadPackage(name)", ->
       describe "when the package is active", ->
         it "throws an error", ->
-          pack = atom.packages.activatePackage('package-with-main')
-          expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
-          expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
-          expect( -> atom.packages.unloadPackage(pack.name)).toThrow()
-          expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
-          expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
+          pack = null
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-main').then (p) -> pack = p
+
+          runs ->
+            expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
+            expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
+            expect( -> atom.packages.unloadPackage(pack.name)).toThrow()
+            expect(atom.packages.isPackageLoaded(pack.name)).toBeTruthy()
+            expect(atom.packages.isPackageActive(pack.name)).toBeTruthy()
 
       describe "when the package is not loaded", ->
         it "throws an error", ->
@@ -54,58 +48,96 @@ describe "the `atom` global", ->
 
     describe ".activatePackage(id)", ->
       describe "atom packages", ->
+        describe "when called multiple times", ->
+          it "it only calls activate on the package once", ->
+            spyOn(Package.prototype, 'activateNow').andCallThrough()
+            atom.packages.activatePackage('package-with-index')
+            atom.packages.activatePackage('package-with-index')
+
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-index')
+
+            runs ->
+              expect(Package.prototype.activateNow.callCount).toBe 1
+
         describe "when the package has a main module", ->
           describe "when the metadata specifies a main module path˜", ->
             it "requires the module at the specified path", ->
               mainModule = require('./fixtures/packages/package-with-main/main-module')
               spyOn(mainModule, 'activate')
-              pack = atom.packages.activatePackage('package-with-main')
-              expect(mainModule.activate).toHaveBeenCalled()
-              expect(pack.mainModule).toBe mainModule
+              pack = null
+              waitsForPromise ->
+                atom.packages.activatePackage('package-with-main').then (p) -> pack = p
+
+              runs ->
+                expect(mainModule.activate).toHaveBeenCalled()
+                expect(pack.mainModule).toBe mainModule
 
           describe "when the metadata does not specify a main module", ->
             it "requires index.coffee", ->
               indexModule = require('./fixtures/packages/package-with-index/index')
               spyOn(indexModule, 'activate')
-              pack = atom.packages.activatePackage('package-with-index')
-              expect(indexModule.activate).toHaveBeenCalled()
-              expect(pack.mainModule).toBe indexModule
+              pack = null
+              waitsForPromise ->
+                atom.packages.activatePackage('package-with-index').then (p) -> pack = p
+
+              runs ->
+                expect(indexModule.activate).toHaveBeenCalled()
+                expect(pack.mainModule).toBe indexModule
 
           it "assigns config defaults from the module", ->
             expect(atom.config.get('package-with-config-defaults.numbers.one')).toBeUndefined()
-            atom.packages.activatePackage('package-with-config-defaults')
-            expect(atom.config.get('package-with-config-defaults.numbers.one')).toBe 1
-            expect(atom.config.get('package-with-config-defaults.numbers.two')).toBe 2
+
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-config-defaults')
+
+            runs ->
+              expect(atom.config.get('package-with-config-defaults.numbers.one')).toBe 1
+              expect(atom.config.get('package-with-config-defaults.numbers.two')).toBe 2
 
           describe "when the package metadata includes activation events", ->
-            [mainModule, pack] = []
+            [mainModule, promise] = []
 
             beforeEach ->
               mainModule = require './fixtures/packages/package-with-activation-events/index'
               spyOn(mainModule, 'activate').andCallThrough()
-              AtomPackage = require '../src/atom-package'
-              spyOn(AtomPackage.prototype, 'requireMainModule').andCallThrough()
-              pack = atom.packages.activatePackage('package-with-activation-events')
+              spyOn(Package.prototype, 'requireMainModule').andCallThrough()
+
+              promise = atom.packages.activatePackage('package-with-activation-events')
 
             it "defers requiring/activating the main module until an activation event bubbles to the root view", ->
-              expect(pack.requireMainModule).not.toHaveBeenCalled()
-              expect(mainModule.activate).not.toHaveBeenCalled()
+              expect(promise.isFulfilled()).not.toBeTruthy()
               atom.workspaceView.trigger 'activation-event'
-              expect(mainModule.activate).toHaveBeenCalled()
+
+              waitsForPromise ->
+                promise
 
             it "triggers the activation event on all handlers registered during activation", ->
-              atom.workspaceView.openSync()
-              editorView = atom.workspaceView.getActiveView()
-              eventHandler = jasmine.createSpy("activation-event")
-              editorView.command 'activation-event', eventHandler
-              editorView.trigger 'activation-event'
-              expect(mainModule.activate.callCount).toBe 1
-              expect(mainModule.activationEventCallCount).toBe 1
-              expect(eventHandler.callCount).toBe 1
-              editorView.trigger 'activation-event'
-              expect(mainModule.activationEventCallCount).toBe 2
-              expect(eventHandler.callCount).toBe 2
-              expect(mainModule.activate.callCount).toBe 1
+              waitsForPromise ->
+                atom.workspaceView.open()
+
+              runs ->
+                editorView = atom.workspaceView.getActiveView()
+                eventHandler = jasmine.createSpy("activation-event")
+                editorView.command 'activation-event', eventHandler
+                editorView.trigger 'activation-event'
+                expect(mainModule.activate.callCount).toBe 1
+                expect(mainModule.activationEventCallCount).toBe 1
+                expect(eventHandler.callCount).toBe 1
+                editorView.trigger 'activation-event'
+                expect(mainModule.activationEventCallCount).toBe 2
+                expect(eventHandler.callCount).toBe 2
+                expect(mainModule.activate.callCount).toBe 1
+
+            it "activates the package immediately when the events are empty", ->
+              mainModule = require './fixtures/packages/package-with-empty-activation-events/index'
+              spyOn(mainModule, 'activate').andCallThrough()
+
+              waitsForPromise ->
+                atom.packages.activatePackage('package-with-empty-activation-events')
+
+              runs ->
+                expect(mainModule.activate.callCount).toBe 1
 
         describe "when the package has no main module", ->
           it "does not throw an exception", ->
@@ -116,13 +148,17 @@ describe "the `atom` global", ->
             expect(console.warn).not.toHaveBeenCalled()
 
         it "passes the activate method the package's previously serialized state if it exists", ->
-          pack = atom.packages.activatePackage("package-with-serialization")
-          expect(pack.mainModule.someNumber).not.toBe 77
-          pack.mainModule.someNumber = 77
-          atom.packages.deactivatePackage("package-with-serialization")
-          spyOn(pack.mainModule, 'activate').andCallThrough()
-          atom.packages.activatePackage("package-with-serialization")
-          expect(pack.mainModule.activate).toHaveBeenCalledWith({someNumber: 77})
+          pack = null
+          waitsForPromise ->
+            atom.packages.activatePackage("package-with-serialization").then (p) -> pack = p
+
+          runs ->
+            expect(pack.mainModule.someNumber).not.toBe 77
+            pack.mainModule.someNumber = 77
+            atom.packages.deactivatePackage("package-with-serialization")
+            spyOn(pack.mainModule, 'activate').andCallThrough()
+            atom.packages.activatePackage("package-with-serialization")
+            expect(pack.mainModule.activate).toHaveBeenCalledWith({someNumber: 77})
 
         it "logs warning instead of throwing an exception if the package fails to load", ->
           atom.config.set("core.disabledPackages", [])
@@ -137,28 +173,28 @@ describe "the `atom` global", ->
               element2 = $$ -> @div class: 'test-2'
               element3 = $$ -> @div class: 'test-3'
 
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)).toHaveLength 0
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element2)).toHaveLength 0
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element3)).toHaveLength 0
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])).toHaveLength 0
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element2[0])).toHaveLength 0
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element3[0])).toHaveLength 0
 
               atom.packages.activatePackage("package-with-keymaps")
 
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)[0].command).toBe "test-1"
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element2)[0].command).toBe "test-2"
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element3)).toHaveLength 0
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])[0].command).toBe "test-1"
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element2[0])[0].command).toBe "test-2"
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element3[0])).toHaveLength 0
 
           describe "when the metadata contains a 'keymaps' manifest", ->
             it "loads only the keymaps specified by the manifest, in the specified order", ->
               element1 = $$ -> @div class: 'test-1'
               element3 = $$ -> @div class: 'test-3'
 
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)).toHaveLength 0
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])).toHaveLength 0
 
               atom.packages.activatePackage("package-with-keymaps-manifest")
 
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', element1)[0].command).toBe 'keymap-1'
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-n', element1)[0].command).toBe 'keymap-2'
-              expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-y', element3)).toHaveLength 0
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target:element1[0])[0].command).toBe 'keymap-1'
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-n', target:element1[0])[0].command).toBe 'keymap-2'
+              expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-y', target:element3[0])).toHaveLength 0
 
         describe "menu loading", ->
           beforeEach ->
@@ -239,116 +275,155 @@ describe "the `atom` global", ->
 
         describe "grammar loading", ->
           it "loads the package's grammars", ->
-            atom.packages.activatePackage('package-with-grammars')
-            expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Alot'
-            expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Alittle'
+            waitsForPromise ->
+              atom.packages.activatePackage('package-with-grammars')
+
+            runs ->
+              expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Alot'
+              expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Alittle'
 
         describe "scoped-property loading", ->
           it "loads the scoped properties", ->
-            atom.packages.activatePackage("package-with-scoped-properties")
-            expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
-
-      describe "textmate packages", ->
-        it "loads the package's grammars", ->
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
-          atom.packages.activatePackage('language-ruby', sync: true)
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
-
-        it "translates the package's scoped properties to Atom terms", ->
-          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
-          atom.packages.activatePackage('language-ruby', sync: true)
-          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBe '# '
-
-        describe "when the package has no grammars but does have preferences", ->
-          it "loads the package's preferences as scoped properties", ->
-            jasmine.unspy(window, 'setTimeout')
-            spyOn(atom.syntax, 'addProperties').andCallThrough()
-
-            atom.packages.activatePackage('package-with-preferences-tmbundle')
-
-            waitsFor ->
-              atom.syntax.addProperties.callCount > 0
+            waitsForPromise ->
+              atom.packages.activatePackage("package-with-scoped-properties")
 
             runs ->
-              expect(atom.syntax.getProperty(['.source.pref'], 'editor.increaseIndentPattern')).toBe '^abc$'
+              expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
+
+      describe "converted textmate packages", ->
+        it "loads the package's grammars", ->
+          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+
+          waitsForPromise ->
+            atom.packages.activatePackage('language-ruby')
+
+          runs ->
+            expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
+
+        it "loads the translated scoped properties", ->
+          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
+
+          waitsForPromise ->
+            atom.packages.activatePackage('language-ruby')
+
+          runs ->
+            expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBe '# '
 
     describe ".deactivatePackage(id)", ->
       describe "atom packages", ->
         it "calls `deactivate` on the package's main module if activate was successful", ->
-          pack = atom.packages.activatePackage("package-with-deactivate")
-          expect(atom.packages.isPackageActive("package-with-deactivate")).toBeTruthy()
-          spyOn(pack.mainModule, 'deactivate').andCallThrough()
+          pack = null
+          waitsForPromise ->
+            atom.packages.activatePackage("package-with-deactivate").then (p) -> pack = p
 
-          atom.packages.deactivatePackage("package-with-deactivate")
-          expect(pack.mainModule.deactivate).toHaveBeenCalled()
-          expect(atom.packages.isPackageActive("package-with-module")).toBeFalsy()
+          runs ->
+            expect(atom.packages.isPackageActive("package-with-deactivate")).toBeTruthy()
+            spyOn(pack.mainModule, 'deactivate').andCallThrough()
 
-          spyOn(console, 'warn')
-          badPack = atom.packages.activatePackage("package-that-throws-on-activate")
-          expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeTruthy()
-          spyOn(badPack.mainModule, 'deactivate').andCallThrough()
+            atom.packages.deactivatePackage("package-with-deactivate")
+            expect(pack.mainModule.deactivate).toHaveBeenCalled()
+            expect(atom.packages.isPackageActive("package-with-module")).toBeFalsy()
 
-          atom.packages.deactivatePackage("package-that-throws-on-activate")
-          expect(badPack.mainModule.deactivate).not.toHaveBeenCalled()
-          expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeFalsy()
+            spyOn(console, 'warn')
+
+          badPack = null
+          waitsForPromise ->
+            atom.packages.activatePackage("package-that-throws-on-activate").then (p) -> badPack = p
+
+          runs ->
+            expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeTruthy()
+            spyOn(badPack.mainModule, 'deactivate').andCallThrough()
+
+            atom.packages.deactivatePackage("package-that-throws-on-activate")
+            expect(badPack.mainModule.deactivate).not.toHaveBeenCalled()
+            expect(atom.packages.isPackageActive("package-that-throws-on-activate")).toBeFalsy()
 
         it "does not serialize packages that have not been activated called on their main module", ->
           spyOn(console, 'warn')
-          badPack = atom.packages.activatePackage("package-that-throws-on-activate")
-          spyOn(badPack.mainModule, 'serialize').andCallThrough()
+          badPack = null
+          waitsForPromise ->
+            atom.packages.activatePackage("package-that-throws-on-activate").then (p) -> badPack = p
 
-          atom.packages.deactivatePackage("package-that-throws-on-activate")
-          expect(badPack.mainModule.serialize).not.toHaveBeenCalled()
+          runs ->
+            spyOn(badPack.mainModule, 'serialize').andCallThrough()
+
+            atom.packages.deactivatePackage("package-that-throws-on-activate")
+            expect(badPack.mainModule.serialize).not.toHaveBeenCalled()
 
         it "absorbs exceptions that are thrown by the package module's serialize methods", ->
           spyOn(console, 'error')
-          atom.packages.activatePackage('package-with-serialize-error',  immediate: true)
-          atom.packages.activatePackage('package-with-serialization', immediate: true)
-          atom.packages.deactivatePackages()
-          expect(atom.packages.packageStates['package-with-serialize-error']).toBeUndefined()
-          expect(atom.packages.packageStates['package-with-serialization']).toEqual someNumber: 1
-          expect(console.error).toHaveBeenCalled()
+
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-serialize-error')
+
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-serialization')
+
+          runs ->
+            atom.packages.deactivatePackages()
+            expect(atom.packages.packageStates['package-with-serialize-error']).toBeUndefined()
+            expect(atom.packages.packageStates['package-with-serialization']).toEqual someNumber: 1
+            expect(console.error).toHaveBeenCalled()
 
         it "removes the package's grammars", ->
-          atom.packages.activatePackage('package-with-grammars')
-          atom.packages.deactivatePackage('package-with-grammars')
-          expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Null Grammar'
-          expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Null Grammar'
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-grammars')
+
+          runs ->
+            atom.packages.deactivatePackage('package-with-grammars')
+            expect(atom.syntax.selectGrammar('a.alot').name).toBe 'Null Grammar'
+            expect(atom.syntax.selectGrammar('a.alittle').name).toBe 'Null Grammar'
 
         it "removes the package's keymaps", ->
-          atom.packages.activatePackage('package-with-keymaps')
-          atom.packages.deactivatePackage('package-with-keymaps')
-          expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', $$ -> @div class: 'test-1')).toHaveLength 0
-          expect(atom.keymap.keyBindingsForKeystrokeMatchingElement('ctrl-z', $$ -> @div class: 'test-2')).toHaveLength 0
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-keymaps')
+
+          runs ->
+            atom.packages.deactivatePackage('package-with-keymaps')
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-1')[0])).toHaveLength 0
+            expect(atom.keymaps.findKeyBindings(keystrokes:'ctrl-z', target: ($$ -> @div class: 'test-2')[0])).toHaveLength 0
 
         it "removes the package's stylesheets", ->
-          atom.packages.activatePackage('package-with-stylesheets')
-          atom.packages.deactivatePackage('package-with-stylesheets')
-          one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css")
-          two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less")
-          three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css")
-          expect(atom.themes.stylesheetElementForId(one)).not.toExist()
-          expect(atom.themes.stylesheetElementForId(two)).not.toExist()
-          expect(atom.themes.stylesheetElementForId(three)).not.toExist()
+          waitsForPromise ->
+            atom.packages.activatePackage('package-with-stylesheets')
+
+          runs ->
+            atom.packages.deactivatePackage('package-with-stylesheets')
+            one = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/1.css")
+            two = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/2.less")
+            three = require.resolve("./fixtures/packages/package-with-stylesheets-manifest/stylesheets/3.css")
+            expect(atom.themes.stylesheetElementForId(one)).not.toExist()
+            expect(atom.themes.stylesheetElementForId(two)).not.toExist()
+            expect(atom.themes.stylesheetElementForId(three)).not.toExist()
 
         it "removes the package's scoped-properties", ->
-          atom.packages.activatePackage("package-with-scoped-properties")
-          expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
-          atom.packages.deactivatePackage("package-with-scoped-properties")
-          expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()
+          waitsForPromise ->
+            atom.packages.activatePackage("package-with-scoped-properties")
+
+          runs ->
+            expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
+            atom.packages.deactivatePackage("package-with-scoped-properties")
+            expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()
 
       describe "textmate packages", ->
         it "removes the package's grammars", ->
           expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
-          atom.packages.activatePackage('language-ruby', sync: true)
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
-          atom.packages.deactivatePackage('language-ruby')
-          expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
+
+          waitsForPromise ->
+            atom.packages.activatePackage('language-ruby')
+
+          runs ->
+            expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
+            atom.packages.deactivatePackage('language-ruby')
+            expect(atom.syntax.selectGrammar("file.rb").name).toBe "Null Grammar"
 
         it "removes the package's scoped properties", ->
-          atom.packages.activatePackage('language-ruby', sync: true)
-          atom.packages.deactivatePackage('language-ruby')
-          expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
+          waitsForPromise ->
+            atom.packages.activatePackage('language-ruby')
+
+          runs ->
+            atom.packages.deactivatePackage('language-ruby')
+            expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
 
     describe ".activate()", ->
       packageActivator = null
@@ -382,7 +457,7 @@ describe "the `atom` global", ->
         themes = themeActivator.mostRecentCall.args[0]
         expect(['theme']).toContain(theme.getType()) for theme in themes
 
-    describe ".en/disablePackage()", ->
+    describe ".enablePackage() and disablePackage()", ->
       describe "with packages", ->
         it ".enablePackage() enables a disabled package", ->
           packageName = 'package-with-main'
@@ -391,28 +466,36 @@ describe "the `atom` global", ->
           expect(atom.config.get('core.disabledPackages')).toContain packageName
 
           pack = atom.packages.enablePackage(packageName)
-
           loadedPackages = atom.packages.getLoadedPackages()
-          activatedPackages = atom.packages.getActivePackages()
-          expect(loadedPackages).toContain(pack)
-          expect(activatedPackages).toContain(pack)
-          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+          activatedPackages = null
+          waitsFor ->
+            activatedPackages = atom.packages.getActivePackages()
+            activatedPackages.length > 0
+
+          runs ->
+            expect(loadedPackages).toContain(pack)
+            expect(activatedPackages).toContain(pack)
+            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
 
         it ".disablePackage() disables an enabled package", ->
           packageName = 'package-with-main'
-          atom.packages.activatePackage(packageName)
-          atom.packages.observeDisabledPackages()
-          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+          waitsForPromise ->
+            atom.packages.activatePackage(packageName)
 
-          pack = atom.packages.disablePackage(packageName)
+          runs ->
+            atom.packages.observeDisabledPackages()
+            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
 
-          activatedPackages = atom.packages.getActivePackages()
-          expect(activatedPackages).not.toContain(pack)
-          expect(atom.config.get('core.disabledPackages')).toContain packageName
+            pack = atom.packages.disablePackage(packageName)
+
+            activatedPackages = atom.packages.getActivePackages()
+            expect(activatedPackages).not.toContain(pack)
+            expect(atom.config.get('core.disabledPackages')).toContain packageName
 
       describe "with themes", ->
         beforeEach ->
-          atom.themes.activateThemes()
+          waitsForPromise ->
+            atom.themes.activateThemes()
 
         afterEach ->
           atom.themes.deactivateThemes()
@@ -426,18 +509,24 @@ describe "the `atom` global", ->
 
           # enabling of theme
           pack = atom.packages.enablePackage(packageName)
-          activatedPackages = atom.packages.getActivePackages()
-          expect(activatedPackages).toContain(pack)
-          expect(atom.config.get('core.themes')).toContain packageName
-          expect(atom.config.get('core.disabledPackages')).not.toContain packageName
 
-          # disabling of theme
-          pack = atom.packages.disablePackage(packageName)
-          activatedPackages = atom.packages.getActivePackages()
-          expect(activatedPackages).not.toContain(pack)
-          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
+          waitsFor ->
+            pack in atom.packages.getActivePackages()
+
+          runs ->
+            expect(atom.config.get('core.themes')).toContain packageName
+            expect(atom.config.get('core.disabledPackages')).not.toContain packageName
+
+            # disabling of theme
+            pack = atom.packages.disablePackage(packageName)
+
+          waitsFor ->
+            not (pack in atom.packages.getActivePackages())
+
+          runs ->
+            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", ->
@@ -446,3 +535,18 @@ describe "the `atom` global", ->
       expect(atom.isReleasedVersion()).toBe true
       version = '36b5518'
       expect(atom.isReleasedVersion()).toBe false
+
+  describe "window:update-available", ->
+    it "is triggered when the auto-updater sends the update-downloaded event", ->
+      updateAvailableHandler = jasmine.createSpy("update-available-handler")
+      atom.workspaceView.on 'window:update-available', updateAvailableHandler
+      autoUpdater = require('remote').require('auto-updater')
+      autoUpdater.emit 'update-downloaded', null, "notes", "version"
+
+      waitsFor ->
+        updateAvailableHandler.callCount > 0
+
+      runs ->
+        [event, version, notes] = updateAvailableHandler.mostRecentCall.args
+        expect(notes).toBe 'notes'
+        expect(version).toBe 'version'

spec/clipboard-spec.coffee

@@ -0,0 +1,12 @@
+describe "Clipboard", ->
+  describe "write(text, metadata) and read()", ->
+    it "writes and reads text to/from the native clipboard", ->
+      expect(atom.clipboard.read()).toBe 'initial clipboard content'
+      atom.clipboard.write('next')
+      expect(atom.clipboard.read()).toBe 'next'
+
+    it "returns metadata if the item on the native clipboard matches the last written item", ->
+      atom.clipboard.write('next', {meta: 'data'})
+      expect(atom.clipboard.read()).toBe 'next'
+      expect(atom.clipboard.readWithMetadata().text).toBe 'next'
+      expect(atom.clipboard.readWithMetadata().metadata).toEqual {meta: 'data'}

spec/command-installer-spec.coffee

@@ -1,5 +1,5 @@
-{fs} = require 'atom'
 path = require 'path'
+fs = require 'fs-plus'
 temp = require 'temp'
 installer = require '../src/command-installer'
 
@@ -10,17 +10,17 @@ describe "install(commandPath, callback)", ->
   installationFilePath = path.join(installationPath, commandName)
 
   beforeEach ->
+    fs.chmodSync(commandFilePath, '755')
     spyOn(installer, 'getInstallDirectory').andReturn installationPath
 
   describe "on #darwin", ->
     it "symlinks the command and makes it executable", ->
       expect(fs.isFileSync(commandFilePath)).toBeTruthy()
-      expect(fs.isExecutableSync(commandFilePath)).toBeFalsy()
       expect(fs.isFileSync(installationFilePath)).toBeFalsy()
 
       installDone = false
       installError = null
-      installer.install commandFilePath, (error) ->
+      installer.install commandFilePath, false, (error) ->
         installDone = true
         installError = error
 

spec/config-spec.coffee

@@ -1,10 +1,14 @@
-{fs} = require 'atom'
 path = require 'path'
 temp = require 'temp'
 CSON = require 'season'
+fs = require 'fs-plus'
 
 describe "Config", ->
   dotAtomPath = path.join(temp.dir, 'dot-atom-dir')
+  dotAtomPath = null
+
+  beforeEach ->
+    dotAtomPath = temp.path('dot-atom-dir')
 
   describe ".get(keyPath)", ->
     it "allows a key path's value to be read", ->
@@ -36,15 +40,53 @@ describe "Config", ->
 
     describe "when the value equals the default value", ->
       it "does not store the value", ->
-        atom.config.setDefaults("foo", same: 1, changes: 1)
+        atom.config.setDefaults "foo",
+          same: 1
+          changes: 1
+          sameArray: [1, 2, 3]
+          sameObject: {a: 1, b: 2}
+          null: null
+          undefined: undefined
         expect(atom.config.settings.foo).toBeUndefined()
+
         atom.config.set('foo.same', 1)
         atom.config.set('foo.changes', 2)
+        atom.config.set('foo.sameArray', [1, 2, 3])
+        atom.config.set('foo.null', undefined)
+        atom.config.set('foo.undefined', null)
+        atom.config.set('foo.sameObject', {b: 2, a: 1})
         expect(atom.config.settings.foo).toEqual {changes: 2}
 
         atom.config.set('foo.changes', 1)
         expect(atom.config.settings.foo).toEqual {}
 
+  describe ".getDefault(keyPath)", ->
+    it "returns a clone of the default value", ->
+      atom.config.setDefaults("foo", same: 1, changes: 1)
+      expect(atom.config.getDefault('foo.same')).toBe 1
+      expect(atom.config.getDefault('foo.changes')).toBe 1
+
+      atom.config.set('foo.same', 2)
+      atom.config.set('foo.changes', 3)
+      expect(atom.config.getDefault('foo.same')).toBe 1
+      expect(atom.config.getDefault('foo.changes')).toBe 1
+
+      initialDefaultValue = [1, 2, 3]
+      atom.config.setDefaults("foo", bar: initialDefaultValue)
+      expect(atom.config.getDefault('foo.bar')).toEqual initialDefaultValue
+      expect(atom.config.getDefault('foo.bar')).not.toBe initialDefaultValue
+
+  describe ".isDefault(keyPath)", ->
+    it "returns true when the value of the key path is its default value", ->
+      atom.config.setDefaults("foo", same: 1, changes: 1)
+      expect(atom.config.isDefault('foo.same')).toBe true
+      expect(atom.config.isDefault('foo.changes')).toBe true
+
+      atom.config.set('foo.same', 2)
+      atom.config.set('foo.changes', 3)
+      expect(atom.config.isDefault('foo.same')).toBe false
+      expect(atom.config.isDefault('foo.changes')).toBe false
+
   describe ".toggle(keyPath)", ->
     it "negates the boolean value of the current key path value", ->
       atom.config.set('foo.a', 1)
@@ -63,6 +105,19 @@ describe "Config", ->
       atom.config.toggle('foo.a')
       expect(atom.config.get('foo.a')).toBe false
 
+  describe ".restoreDefault(keyPath)", ->
+    it "sets the value of the key path to its default", ->
+      atom.config.setDefaults('a', b: 3)
+      atom.config.set('a.b', 4)
+      expect(atom.config.get('a.b')).toBe 4
+      atom.config.restoreDefault('a.b')
+      expect(atom.config.get('a.b')).toBe 3
+
+      atom.config.set('a.c', 5)
+      expect(atom.config.get('a.c')).toBe 5
+      atom.config.restoreDefault('a.c')
+      expect(atom.config.get('a.c')).toBeUndefined()
+
   describe ".pushAtKeyPath(keyPath, value)", ->
     it "pushes the given value to the array at the key path and updates observers", ->
       atom.config.set("foo.bar.baz", ["a"])
@@ -157,6 +212,13 @@ describe "Config", ->
       expect(atom.config.get("foo.quux.x")).toBe 0
       expect(atom.config.get("foo.quux.y")).toBe 1
 
+    it "emits an updated event", ->
+      updatedCallback = jasmine.createSpy('updated')
+      atom.config.observe('foo.bar.baz.a', callNow: false, updatedCallback)
+      expect(updatedCallback.callCount).toBe 0
+      atom.config.setDefaults("foo.bar.baz", a: 2)
+      expect(updatedCallback.callCount).toBe 1
+
   describe ".observe(keyPath)", ->
     [observeHandler, observeSubscription] = []
 
@@ -200,11 +262,13 @@ describe "Config", ->
 
   describe ".initializeConfigDirectory()", ->
     beforeEach ->
+      if fs.existsSync(dotAtomPath)
+        fs.removeSync(dotAtomPath)
+
       atom.config.configDirPath = dotAtomPath
-      expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the configDirPath doesn't exist", ->
       it "copies the contents of dot-atom to ~/.atom", ->
@@ -220,6 +284,8 @@ describe "Config", ->
           expect(fs.existsSync(path.join(atom.config.configDirPath, 'packages'))).toBeTruthy()
           expect(fs.isFileSync(path.join(atom.config.configDirPath, 'snippets.cson'))).toBeTruthy()
           expect(fs.isFileSync(path.join(atom.config.configDirPath, 'config.cson'))).toBeTruthy()
+          expect(fs.isFileSync(path.join(atom.config.configDirPath, 'init.coffee'))).toBeTruthy()
+          expect(fs.isFileSync(path.join(atom.config.configDirPath, 'styles.less'))).toBeTruthy()
 
   describe ".loadUserConfig()", ->
     beforeEach ->
@@ -228,7 +294,7 @@ describe "Config", ->
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the config file contains valid cson", ->
       beforeEach ->
@@ -271,7 +337,7 @@ describe "Config", ->
 
     afterEach ->
       atom.config.unobserveUserConfig()
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the config file changes to contain valid cson", ->
       it "updates the config data", ->

spec/context-menu-manager-spec.coffee

@@ -17,6 +17,59 @@ describe "ContextMenuManager", ->
       expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
       expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
 
+    it 'does not add duplicate menu items',  ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'
+
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'
+
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
+      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
+      expect(contextMenu.definitions['.selector'].length).toBe 1
+
+    it 'allows multiple separators', ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'separator1': '-'
+          'separator2': '-'
+
+      expect(contextMenu.definitions['.selector'].length).toBe 2
+      expect(contextMenu.definitions['.selector'][0].type).toEqual 'separator'
+      expect(contextMenu.definitions['.selector'][1].type).toEqual 'separator'
+
+    it 'allows duplicate commands with different labels',  ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'label': 'command'
+
+      contextMenu.add 'file-path',
+        '.selector':
+          'another label': 'command'
+
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'label'
+      expect(contextMenu.definitions['.selector'][0].command).toEqual 'command'
+      expect(contextMenu.definitions['.selector'][1].label).toEqual 'another label'
+      expect(contextMenu.definitions['.selector'][1].command).toEqual 'command'
+
+    it "loads submenus", ->
+      contextMenu.add 'file-path',
+        '.selector':
+          'parent':
+            'child-1': 'child-1:trigger'
+            'child-2': 'child-2:trigger'
+          'parent-2': 'parent-2:trigger'
+
+      expect(contextMenu.definitions['.selector'].length).toBe 2
+      expect(contextMenu.definitions['.selector'][0].label).toEqual 'parent'
+      expect(contextMenu.definitions['.selector'][0].submenu.length).toBe 2
+      expect(contextMenu.definitions['.selector'][0].submenu[0].label).toBe 'child-1'
+      expect(contextMenu.definitions['.selector'][0].submenu[0].command).toBe 'child-1:trigger'
+      expect(contextMenu.definitions['.selector'][0].submenu[1].label).toBe 'child-2'
+      expect(contextMenu.definitions['.selector'][0].submenu[1].command).toBe 'child-2:trigger'
+
     describe 'dev mode', ->
       it 'loads',  ->
         contextMenu.add 'file-path',
@@ -105,7 +158,7 @@ describe "ContextMenuManager", ->
           expect(menu[2].command).toEqual 'dev-command'
           expect(menu[3]).toBeUndefined()
 
-  describe "#executeBuildHandlers", ->
+  describe "executeBuildHandlers", ->
     menuTemplate = [
         label: 'label'
         executeAtBuild: ->
@@ -119,4 +172,3 @@ describe "ContextMenuManager", ->
 
       expect(buildFn).toHaveBeenCalled()
       expect(buildFn.mostRecentCall.args[0]).toBe event
-

spec/directory-spec.coffee

@@ -1,138 +0,0 @@
-Directory = require '../src/directory'
-{fs} = require 'atom'
-path = require 'path'
-
-describe "Directory", ->
-  directory = null
-
-  beforeEach ->
-    directory = new Directory(path.join(__dirname, 'fixtures'))
-
-  afterEach ->
-    directory.off()
-
-  describe "when the contents of the directory change on disk", ->
-    temporaryFilePath = null
-
-    beforeEach ->
-      temporaryFilePath = path.join(__dirname, 'fixtures', 'temporary')
-      fs.removeSync(temporaryFilePath) if fs.existsSync(temporaryFilePath)
-
-    afterEach ->
-      fs.removeSync(temporaryFilePath) if fs.existsSync(temporaryFilePath)
-
-    it "triggers 'contents-changed' event handlers", ->
-      changeHandler = null
-
-      runs ->
-        changeHandler = jasmine.createSpy('changeHandler')
-        directory.on 'contents-changed', changeHandler
-        fs.writeFileSync(temporaryFilePath, '')
-
-      waitsFor "first change", -> changeHandler.callCount > 0
-
-      runs ->
-        changeHandler.reset()
-        fs.removeSync(temporaryFilePath)
-
-      waitsFor "second change", -> changeHandler.callCount > 0
-
-  describe "when the directory unsubscribes from events", ->
-    temporaryFilePath = null
-
-    beforeEach ->
-      temporaryFilePath = path.join(directory.path, 'temporary')
-      fs.removeSync(temporaryFilePath) if fs.existsSync(temporaryFilePath)
-
-    afterEach ->
-      fs.removeSync(temporaryFilePath) if fs.existsSync(temporaryFilePath)
-
-    it "no longer triggers events", ->
-      changeHandler = null
-
-      runs ->
-        changeHandler = jasmine.createSpy('changeHandler')
-        directory.on 'contents-changed', changeHandler
-        fs.writeFileSync(temporaryFilePath, '')
-
-      waitsFor "change event", -> changeHandler.callCount > 0
-
-      runs ->
-        changeHandler.reset()
-        directory.off()
-      waits 20
-
-      runs -> fs.removeSync(temporaryFilePath)
-      waits 20
-      runs -> expect(changeHandler.callCount).toBe 0
-
-  describe "on #darwin or #linux", ->
-    it "includes symlink information about entries", ->
-      entries = directory.getEntriesSync()
-      for entry in entries
-        name = entry.getBaseName()
-        if name is 'symlink-to-dir' or name is 'symlink-to-file'
-          expect(entry.symlink).toBeTruthy()
-        else
-          expect(entry.symlink).toBeFalsy()
-
-      callback = jasmine.createSpy('getEntries')
-      directory.getEntries(callback)
-
-      waitsFor -> callback.callCount is 1
-
-      runs ->
-        entries = callback.mostRecentCall.args[1]
-        for entry in entries
-          name = entry.getBaseName()
-          if name is 'symlink-to-dir' or name is 'symlink-to-file'
-            expect(entry.symlink).toBeTruthy()
-          else
-            expect(entry.symlink).toBeFalsy()
-
-  describe ".relativize(path)", ->
-    describe "on #darwin or #linux", ->
-      it "returns a relative path based on the directory's path", ->
-        absolutePath = directory.getPath()
-        expect(directory.relativize(absolutePath)).toBe ''
-        expect(directory.relativize(path.join(absolutePath, "b"))).toBe "b"
-        expect(directory.relativize(path.join(absolutePath, "b/file.coffee"))).toBe "b/file.coffee"
-        expect(directory.relativize(path.join(absolutePath, "file.coffee"))).toBe "file.coffee"
-
-      it "returns a relative path based on the directory's symlinked source path", ->
-        symlinkPath = path.join(__dirname, 'fixtures', 'symlink-to-dir')
-        symlinkDirectory = new Directory(symlinkPath)
-        realFilePath = require.resolve('./fixtures/dir/a')
-        expect(symlinkDirectory.relativize(symlinkPath)).toBe ''
-        expect(symlinkDirectory.relativize(realFilePath)).toBe 'a'
-
-      it "returns the full path if the directory's path is not a prefix of the path", ->
-        expect(directory.relativize('/not/relative')).toBe '/not/relative'
-
-    describe "on #win32", ->
-      it "returns a relative path based on the directory's path", ->
-        absolutePath = directory.getPath()
-        expect(directory.relativize(absolutePath)).toBe ''
-        expect(directory.relativize(path.join(absolutePath, "b"))).toBe "b"
-        expect(directory.relativize(path.join(absolutePath, "b/file.coffee"))).toBe "b\\file.coffee"
-        expect(directory.relativize(path.join(absolutePath, "file.coffee"))).toBe "file.coffee"
-
-      it "returns the full path if the directory's path is not a prefix of the path", ->
-        expect(directory.relativize('/not/relative')).toBe "\\not\\relative"
-
-  describe ".contains(path)", ->
-    it "returns true if the path is a child of the directory's path", ->
-      absolutePath = directory.getPath()
-      expect(directory.contains(path.join(absolutePath, "b"))).toBe true
-      expect(directory.contains(path.join(absolutePath, "b", "file.coffee"))).toBe true
-      expect(directory.contains(path.join(absolutePath, "file.coffee"))).toBe true
-
-    it "returns false if the directory's path is not a prefix of the path", ->
-      expect(directory.contains('/not/relative')).toBe false
-
-    describe "on #darwin or #linux", ->
-      it "returns true if the path is a child of the directory's symlinked source path", ->
-        symlinkPath = path.join(__dirname, 'fixtures', 'symlink-to-dir')
-        symlinkDirectory = new Directory(symlinkPath)
-        realFilePath = require.resolve('./fixtures/dir/a')
-        expect(symlinkDirectory.contains(realFilePath)).toBe true