Merge branch 'master' into ns-telepathic-pane-items

Conflicts:
	src/pane.coffee

.gitignore

@@ -10,3 +10,4 @@ debug.log
 /atom-shell/
 docs/output
 spec/fixtures/evil-files/
+/apm

package.json

@@ -26,7 +26,7 @@
     "diff": "git://github.com/benogle/jsdiff.git",
     "emissary": "0.19.0",
     "first-mate": "0.5.0",
-    "fs-plus": "0.11.0",
+    "fs-plus": "0.13.0",
     "fuzzaldrin": "0.1.0",
     "git-utils": "0.29.0",
     "guid": "0.0.10",
@@ -82,7 +82,7 @@
     "solarized-dark-syntax": "0.6.0",
     "solarized-light-syntax": "0.2.0",
     "archive-view": "0.16.0",
-    "autocomplete": "0.18.0",
+    "autocomplete": "0.19.0",
     "autoflow": "0.11.0",
     "autosave": "0.10.0",
     "bookmarks": "0.15.0",
@@ -100,7 +100,7 @@
     "github-sign-in": "0.15.0",
     "go-to-line": "0.12.0",
     "grammar-selector": "0.13.0",
-    "image-view": "0.10.0",
+    "image-view": "0.11.0",
     "keybinding-resolver": "0.6.0",
     "link": "0.11.0",
     "markdown-preview": "0.22.0",

script/bootstrap

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 var safeExec = require('./utils/child-process-wrapper.js').safeExec;
+var fs = require('fs');
 var path = require('path');
 
 // OAuth token for atom-bot
@@ -22,16 +23,25 @@ function executeCommands(commands, done, index) {
     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'));
+
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
 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, '..', 'vendor', 'apm'), ignoreStdout: true}},
-  {command: 'npm install --quiet vendor/apm', options: {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 node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
-  'node node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,
+  'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
+  'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,
 ];
 
 process.chdir(path.dirname(__dirname));

src/command-installer.coffee

@@ -64,5 +64,5 @@ module.exports =
       resourcePath = null
 
     resourcePath ?= atom.getLoadSettings().resourcePath
-    commandPath = path.join(resourcePath, 'node_modules', '.bin', 'apm')
+    commandPath = path.join(resourcePath, 'apm', 'node_modules', '.bin', 'apm')
     @install(commandPath, callback)

src/directory.coffee

@@ -88,11 +88,9 @@ class Directory
     directories = []
     files = []
     for entryPath in fs.listSync(@path)
-      try
-        stat = fs.lstatSync(entryPath)
-        symlink = stat.isSymbolicLink()
-        stat = fs.statSync(entryPath) if symlink
-      catch e
+      if stat = fs.statSyncNoException(entryPath)
+        symlink = fs.isSymbolicLinkSync(entryPath)
+      else
         continue
       if stat.isDirectory()
         directories.push(new Directory(entryPath, symlink))

tasks/build-task.coffee

@@ -21,6 +21,7 @@ module.exports = (grunt) ->
 
     cp 'atom.sh', path.join(appDir, 'atom.sh')
     cp 'package.json', path.join(appDir, 'package.json')
+    cp 'apm', path.join(appDir, 'apm')
 
     packageDirectories = []
     nonPackageDirectories = [

tasks/spec-task.coffee

@@ -15,7 +15,7 @@ module.exports = (grunt) ->
     rootDir = grunt.config.get('atom.shellAppDir')
     appDir = grunt.config.get('atom.appDir')
     atomPath = path.join(appDir, 'atom.sh')
-    apmPath = path.join(appDir, 'node_modules/.bin/apm')
+    apmPath = path.join(appDir, 'apm/node_modules/.bin/apm')
 
     packageSpecQueue = async.queue (packagePath, callback) ->
       options =
@@ -26,7 +26,7 @@ module.exports = (grunt) ->
           env: _.extend({}, process.env, ATOM_PATH: rootDir)
       grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs."
       spawn options, (error, results, code) ->
-        
+
         failedPackages.push path.basename(packagePath) if error
         callback()