Merge pull request #53 from mbilker/travis-update

Travis update

.travis.yml

@@ -1,16 +1,34 @@
-language: node_js
-sudo: true
-before_install:
-  - sudo apt-get install libgnome-keyring-dev
-install:
-  - ./script/bootstrap
 env:
-  - CXX=g++-4.8
+  global:
+    - NYLAS_ACCESS_TOKEN=cb200be7c921f73a1c35930f6a4ac8758b271be0
+
+compiler: clang
+
+matrix:
+  include:
+    - os: linux
+      env: NODE_VERSION=0.10
+    - os: linux
+      env: NODE_VERSION=0.12
+    - os: osx
+      env: NODE_VERSION=0.10
+    - os: osx
+      env: NODE_VERSION=0.12
+
+sudo: false
+
+install:
+  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
+  - source /tmp/.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - nvm use $NODE_VERSION
+
+script: script/cibuild
+
 addons:
   apt:
-    sources:
-    - ubuntu-toolchain-r-test
     packages:
-    - g++-4.8
-node_js:
-  - "0.10"
+    - build-essential
+    - git
+    - libgnome-keyring-dev
+    - fakeroot

build/Gruntfile.coffee

@@ -297,7 +297,7 @@ module.exports = (grunt) ->
       outputDir: 'electron'
       downloadDir: electronDownloadDir
       rebuild: true  # rebuild native modules after electron is updated
-      token: process.env.ATOM_ACCESS_TOKEN
+      token: process.env.NYLAS_ACCESS_TOKEN
 
     'create-windows-installer':
       appDirectory: shellAppDir
@@ -325,11 +325,11 @@ module.exports = (grunt) ->
   ciTasks.push('set-version', 'lint', 'generate-asar')
   ciTasks.push('mkdeb') if process.platform is 'linux'
   ciTasks.push('test') if process.platform is 'darwin'
-  ciTasks.push('codesign')
-  ciTasks.push('mkdmg') if process.platform is 'darwin'
-  ciTasks.push('create-windows-installer') if process.platform is 'win32'
-  # ciTasks.push('publish-docs') if process.platform is 'darwin'
-  ciTasks.push('publish-nylas-build') if process.platform is 'darwin'
+  ciTasks.push('codesign') unless process.env.TRAVIS
+  ciTasks.push('mkdmg') if process.platform is 'darwin' and not process.env.TRAVIS
+  ciTasks.push('create-windows-installer') if process.platform is 'win32' and not process.env.TRAVIS
+  # ciTasks.push('publish-docs') if process.platform is 'darwin' and not process.env.TRAVIS
+  ciTasks.push('publish-nylas-build') if process.platform is 'darwin' and not process.env.TRAVIS
   grunt.registerTask('ci', ciTasks)
 
   defaultTasks = ['download-electron', 'build', 'set-version', 'generate-asar']

src/flux/models/label.coffee

@@ -16,7 +16,7 @@ While the two appear fairly similar, they have different behavioral
 semantics and are treated separately.
 
 Nylas also exposes a set of standard types or categories of folders/
-labels: an extended version of [rfc-6154](http://tools.ietf.org/html/rfc6154), 
+labels: an extended version of [rfc-6154](http://tools.ietf.org/html/rfc6154),
 returned as the name of the folder/
 label:
   - inbox