Merge branch 'master' into ns-property-selectors

atom.sh

@@ -66,14 +66,17 @@ if [ $OS == 'Mac' ]; then
     open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ "$@"
   fi
 elif [ $OS == 'Linux' ]; then
-  ATOM_PATH='/opt/Atom/atom'
+  SCRIPT=`readlink -f "$0"`
+  USR_DIRECTORY=`readlink -f $(dirname $SCRIPT)/..`
+  ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
+
   [ -x "$ATOM_PATH" ] || ATOM_PATH='/tmp/atom-build/Atom/atom'
 
   if [ $EXPECT_OUTPUT ]; then
     "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
     exit $?
   else
-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > /dev/null &
+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > /dev/null 2>&1 &
   fi
 fi
 

build/Gruntfile.coffee

@@ -39,35 +39,33 @@ module.exports = (grunt) ->
   if process.platform is 'win32'
     appName = 'Atom'
     tmpDir = os.tmpdir()
-    installRoot = process.env.ProgramFiles
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
     symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
     atomShellDownloadDir = path.join(os.tmpdir(), 'atom-cached-atom-shells')
+    installDir = path.join(process.env.ProgramFiles, appName)
   else if process.platform is 'darwin'
     appName = 'Atom.app'
     tmpDir = '/tmp'
-    installRoot = '/Applications'
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
     symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = path.join(shellAppDir, 'Contents')
     appDir = path.join(contentsDir, 'Resources', 'app')
     atomShellDownloadDir = '/tmp/atom-cached-atom-shells'
+    installDir = path.join('/Applications', appName)
   else
     appName = 'Atom'
     tmpDir = '/tmp'
-    installRoot = '/opt'
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
     symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
     atomShellDownloadDir = '/tmp/atom-cached-atom-shells'
-
-  installDir = path.join(installRoot, appName)
+    installDir = process.env.INSTALL_PREFIX ? '/usr/local'
 
   coffeeConfig =
     options:

build/tasks/install-task.coffee

@@ -15,7 +15,16 @@ module.exports = (grunt) ->
 
       createShortcut = path.resolve 'script', 'create-shortcut.cmd'
       runas('cmd', ['/c', createShortcut, path.join(installDir, 'atom.exe'), 'Atom'])
-    else
+    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')
+
+      mkdir binDir
+      cp 'atom.sh', path.join(binDir, 'atom')
+      rm shareDir
+      mkdir path.dirname(shareDir)
+      cp shellAppDir, shareDir

build/tasks/mkdeb-task.coffee

@@ -0,0 +1,31 @@
+fs = require 'fs'
+path = require 'path'
+_ = require 'underscore-plus'
+
+fillTemplate = (filePath, data) ->
+  template = _.template(String(fs.readFileSync(filePath + '.in')))
+  filled = template(data)
+  fs.writeFileSync(filePath, filled)
+
+module.exports = (grunt) ->
+  {spawn} = require('./task-helpers')(grunt)
+
+  grunt.registerTask 'mkdeb', 'Create debian package', ->
+    done = @async()
+
+    {name, version, description} = grunt.file.readJSON('package.json')
+    section = 'devel'
+    arch = 'amd64'
+    maintainer = 'GitHub <support@github.com>'
+    data = {name, version, description, section, arch, maintainer}
+
+    control = path.join('resources', 'linux', 'debian', 'control')
+    fillTemplate(control, data)
+    desktop = path.join('resources', 'linux', 'Atom.desktop')
+    fillTemplate(desktop, data)
+    icon = path.join('resources', 'atom.png')
+    buildDir = grunt.config.get('atom.buildDir')
+
+    cmd = path.join('script', 'mkdeb')
+    args = [version, control, desktop, icon, buildDir]
+    spawn({cmd, args}, done)

package.json

@@ -1,7 +1,8 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.77.0",
+  "version": "0.78.0",
+  "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -11,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "All Rights Reserved",
-  "atomShellVersion": "0.11.2",
+  "atomShellVersion": "0.11.3",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^0.11.0",
@@ -20,7 +21,7 @@
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
     "delegato": "1.x",
-    "emissary": "1.x",
+    "emissary": "^1.2",
     "first-mate": ">=1.4.2 <2.0",
     "fs-plus": ">=2.0.4 < 3.0",
     "fstream": "0.1.24",
@@ -35,7 +36,7 @@
     "nslog": "0.5.0",
     "oniguruma": "^1.0.4",
     "optimist": "0.4.0",
-    "pathwatcher": "^1.0.0",
+    "pathwatcher": "^1.1",
     "property-accessors": "1.x",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -48,7 +49,7 @@
     "serializable": "1.x",
     "space-pen": "3.1.1",
     "temp": "0.5.0",
-    "text-buffer": "^1.4.4",
+    "text-buffer": "^1.4.5",
     "theorist": "1.x",
     "underscore-plus": "^1.1.1",
     "vm-compatibility-layer": "0.1.0"
@@ -61,7 +62,7 @@
     "base16-tomorrow-dark-theme": "0.13.0",
     "solarized-dark-syntax": "0.14.0",
     "solarized-light-syntax": "0.7.0",
-    "archive-view": "0.29.0",
+    "archive-view": "0.30.0",
     "autocomplete": "0.27.0",
     "autoflow": "0.15.0",
     "autosave": "0.13.0",
@@ -69,7 +70,7 @@
     "bookmarks": "0.22.0",
     "bracket-matcher": "0.26.0",
     "command-palette": "0.19.0",
-    "dev-live-reload": "0.29.0",
+    "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
     "feedback": "0.28.0",
     "find-and-replace": "0.92.0",
@@ -80,17 +81,17 @@
     "image-view": "0.32.0",
     "keybinding-resolver": "0.12.0",
     "link": "0.20.0",
-    "markdown-preview": "0.50.0",
+    "markdown-preview": "0.51.0",
     "metrics": "0.32.0",
     "open-on-github": "0.23.0",
     "package-generator": "0.30.0",
     "release-notes": "0.26.0",
     "settings-view": "0.97.0",
-    "snippets": "0.38.0",
+    "snippets": "0.40.0",
     "spell-check": "0.28.0",
     "status-bar": "0.37.0",
     "styleguide": "0.26.0",
-    "symbols-view": "0.44.0",
+    "symbols-view": "0.46.0",
     "tabs": "0.31.0",
     "timecop": "0.17.0",
     "tree-view": "0.84.0",
@@ -111,12 +112,12 @@
     "language-json": "0.8.0",
     "language-less": "0.6.0",
     "language-make": "0.9.0",
-    "language-objective-c": "0.10.0",
+    "language-objective-c": "0.11.0",
     "language-perl": "0.8.0",
     "language-php": "0.13.0",
     "language-property-list": "0.7.0",
     "language-python": "0.12.0",
-    "language-ruby": "0.16.0",
+    "language-ruby": "0.17.0",
     "language-ruby-on-rails": "0.12.0",
     "language-sass": "0.8.0",
     "language-shellscript": "0.8.0",

resources/linux/Atom.desktop.in

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Atom
+Comment=<%= description %>
+Exec=/usr/share/atom/atom %U
+Icon=atom
+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,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 
 var nodeMinorVersion = process.versions.node.split('.')[1]
 if (nodeMinorVersion !== '10') {

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');

script/clean

@@ -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');
 var os = require('os');

script/grunt

@@ -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/mkdeb

@@ -0,0 +1,31 @@
+#!/bin/bash
+# mkdeb version control-file-path deb-file-path
+
+SCRIPT=`readlink -f "$0"`
+ROOT=`readlink -f $(dirname $SCRIPT)/..`
+cd $ROOT
+
+VERSION="$1"
+CONTROL_FILE="$2"
+DESKTOP_FILE="$3"
+ICON_FILE="$4"
+DEB_PATH="$5"
+
+TARGET_ROOT="`mktemp -d`"
+TARGET="$TARGET_ROOT/atom-$VERSION"
+
+mkdir -p "$TARGET/usr"
+env INSTALL_PREFIX="$TARGET/usr" script/grunt install
+
+mkdir -p "$TARGET/DEBIAN"
+mv "$CONTROL_FILE" "$TARGET/DEBIAN/control"
+
+mkdir -p "$TARGET/usr/share/applications"
+mv "$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.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');
 

src/browser/main.coffee

@@ -9,12 +9,7 @@ optimist = require 'optimist'
 nslog = require 'nslog'
 dialog = require 'dialog'
 
-console.log = (args...) ->
-  # TODO: Make NSLog work as expected
-  output = args.map((arg) -> JSON.stringify(arg)).join(" ")
-  nslog(output)
-  if process.platform isnt 'darwin'
-    fs.writeFileSync('debug.log', output, flag: 'a')
+console.log = nslog
 
 process.on 'uncaughtException', (error={}) ->
   nslog(error.message) if error.message?

src/editor-view.coffee

@@ -750,11 +750,14 @@ class EditorView extends View
   # Returns a {String} identifying the CSS `font-family`.
   getFontFamily: -> @css("font-family")
 
-  # Public: Sets the line height of the editor
+  # Public: Sets the line height of the editor.
+  #
+  # Calling this method has no effect when called on a mini editor.
   #
   # lineHeight - A {Number} without a unit suffix identifying the CSS
   # `line-height`.
   setLineHeight: (lineHeight) ->
+    return if @mini
     @css('line-height', lineHeight)
     @redraw()