Merge pull request #8 from ember-cli-deploy/chore/update-ember-cli

Upgrade ember-cli and embrace being a node-only ember-cli addon

.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    node: true
+  },
+  rules: {
+  }
+};

.travis.yml

@@ -1,22 +1,19 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "6"
 
 sudo: false
 
 cache:
-  directories:
-    - node_modules
+  yarn: true
 
 before_install:
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - npm install -g bower
-  - npm install
-  - bower install
+  - yarn install --no-lockfile
 
 script:
-  - npm test
+  - yarn test

README.md

@@ -135,7 +135,7 @@ The client used to create the ssh tunnel. This allows the user the ability to us
 
 ## Authorization
 
-ember-cli-deploy-ssh-tunnel uses the [tunnel-ssh](https://github.com/Finanzchef24-GmbH/tunnel-ssh) module to provide the SSH tunnel. Two options exist to configure tunnel-ssh from ember-cli-deploy-ssh-tunnel: `privateKeyPath` and `password`. By default, we assume you have created a public and private key and added it to ssh-agent as described in the [default GitHub setup](https://help.github.com/articles/generating-ssh-keys/). 
+ember-cli-deploy-ssh-tunnel uses the [tunnel-ssh](https://github.com/Finanzchef24-GmbH/tunnel-ssh) module to provide the SSH tunnel. Two options exist to configure tunnel-ssh from ember-cli-deploy-ssh-tunnel: `privateKeyPath` and `password`. By default, we assume you have created a public and private key and added it to ssh-agent as described in the [default GitHub setup](https://help.github.com/articles/generating-ssh-keys/).
 
 If no authentication information is delivered to tunnel-ssh, it will [default to using ssh-agent](https://github.com/Finanzchef24-GmbH/tunnel-ssh), so it will default to using the default id_rsa keys generated as described in the GitHub article. This includes password-protected SSH keys. If you would like to use a different SSH key, set the `privateKeyPath` option:
 
@@ -161,8 +161,11 @@ NOTE: at this time, this plugin does not support setting a path to `privateKeyPa
 
 ## Running Tests
 
-1. `npm install`
-2. `npm test`
+* yarn test
+
+## Why `ember build` and `ember test` don't work
+
+Since this is a node-only ember-cli addon, this package does not include many files and dependencies which are part of ember-cli's typical `ember build` and `ember test` processes.
 
 ## Thanks to:
 

index.js

@@ -1,8 +1,7 @@
-/* jshint node: true */
 'use strict';
 
-var Promise   = require('ember-cli/lib/ext/promise');
-var fs        = require('fs');
+var RSVP = require('rsvp');
+var fs = require('fs');
 var tunnelSsh = require('tunnel-ssh');
 var untildify = require('untildify');
 
@@ -59,7 +58,7 @@ module.exports = {
           sshConfig.privateKey = fs.readFileSync(untildify(privateKey));
         }
 
-        return new Promise(function(resolve, reject) {
+        return new RSVP.Promise(function(resolve, reject) {
           var sshTunnel = tunnel(sshConfig, function(error /*, result */) {
             if (error) {
               reject(error);

package.json

@@ -7,50 +7,30 @@
     "test": "tests"
   },
   "scripts": {
-    "start": "ember server",
-    "build": "ember build",
-    "test": "node tests/runner.js"
+    "test": "node tests/runner.js && ./node_modules/.bin/eslint index.js lib/* tests/*"
   },
   "repository": "https://github.com/ghedamat/ember-cli-deploy-ssh-tunnel",
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 4"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "chai": "^2.2.0",
-    "chai-as-promised": "^5.0.0",
-    "ember-cli": "1.13.1",
-    "ember-cli-app-version": "0.4.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
-    "ember-cli-ic-ajax": "0.2.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.15",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.13.5",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.2",
-    "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-try": "0.0.6",
-    "mocha": "^2.2.4",
-    "glob": "^5.0.14"
+    "chai-as-promised": "^6.0.0",
+    "chai": "^3.5.0",
+    "ember-cli-release": "1.0.0-beta.2",
+    "ember-cli": "^2.12.0",
+    "eslint": "^3.18.0",
+    "glob": "^7.1.1",
+    "mocha": "^3.2.0"
   },
   "keywords": [
     "ember-addon",
     "ember-cli-deploy-plugin"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.0.0",
-    "ember-cli-deploy-plugin": "^0.2.2",
+    "ember-cli-deploy-plugin": "^0.2.6",
     "tunnel-ssh": "^1.0.1",
     "untildify": "^2.0.0"
-  },
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
   }
-}
+}

tests/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  globals: {
+    "describe": true,
+    "beforeEach": true,
+    "it": true
+  },
+  env: {
+    mocha: true
+  }
+};