Skip to content

Commit d118c1e

Browse files
authored
Merge pull request #8 from ember-cli-deploy/chore/update-ember-cli
Upgrade ember-cli and embrace being a node-only ember-cli addon
2 parents f4758d5 + 5351d2c commit d118c1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+5240
-443
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.ember-cli

Lines changed: 0 additions & 9 deletions
This file was deleted.

.eslintrc.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 6,
5+
sourceType: 'module'
6+
},
7+
extends: 'eslint:recommended',
8+
env: {
9+
node: true
10+
},
11+
rules: {
12+
}
13+
};

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
---
22
language: node_js
33
node_js:
4-
- "0.12"
4+
- "6"
55

66
sudo: false
77

88
cache:
9-
directories:
10-
- node_modules
9+
yarn: true
1110

1211
before_install:
13-
- "npm config set spin false"
14-
- "npm install -g npm@^2"
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash
13+
- export PATH=$HOME/.yarn/bin:$PATH
1514

1615
install:
17-
- npm install -g bower
18-
- npm install
19-
- bower install
16+
- yarn install --no-lockfile
2017

2118
script:
22-
- npm test
19+
- yarn test

.watchmanconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ The client used to create the ssh tunnel. This allows the user the ability to us
135135

136136
## Authorization
137137

138-
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/).
138+
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/).
139139

140140
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:
141141

@@ -161,8 +161,11 @@ NOTE: at this time, this plugin does not support setting a path to `privateKeyPa
161161

162162
## Running Tests
163163

164-
1. `npm install`
165-
2. `npm test`
164+
* yarn test
165+
166+
## Why `ember build` and `ember test` don't work
167+
168+
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.
166169

167170
## Thanks to:
168171

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

bower.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)