Skip to content

Commit 089269b

Browse files
authored
Merge pull request ember-cli-deploy#18 from ember-cli-deploy/chore/update-ember-cli
Update ember-cli and eliminate deprecation warning
2 parents dc01de4 + d280117 commit 089269b

Some content is hidden

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

43 files changed

+1062
-1269
lines changed

.bowerrc

-4
This file was deleted.

.eslintrc.js

+13
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+
browser: true
10+
},
11+
rules: {
12+
}
13+
};

.jshintrc

-32
This file was deleted.

.travis.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
4+
- "6"
55

66
sudo: false
77

88
cache:
99
yarn: true
10-
directories:
11-
- $HOME/.cache # includes bowers cache
1210

13-
before_script:
14-
- yarn global add bower # this would be better to do in install step,
15-
- bower install # once travis' yarn support improves
11+
before_install:
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash
13+
- export PATH=$HOME/.yarn/bin:$PATH
14+
15+
install:
16+
- yarn install --no-lockfile
1617

1718
script:
1819
- yarn test

README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,8 @@ Omitted keys are not displayed in listing the results.
6464

6565
## Tests
6666

67-
* ember test
67+
* yarn test
68+
69+
## Why `ember build` and `ember test` don't work
70+
71+
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.

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

bower.json

-4
This file was deleted.

ember-cli-build.js

-18
This file was deleted.

index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* jshint node: true */
1+
/*eslint-env node*/
22
'use strict';
33

44
var DeployPluginBase = require('ember-cli-deploy-plugin');
@@ -22,7 +22,7 @@ module.exports = {
2222
}
2323
},
2424

25-
displayRevisions: function(context) {
25+
displayRevisions: function(/* context */) {
2626
var table;
2727
var revisions = this.readConfig('revisions');
2828
if(!revisions || revisions.length === 0) {
@@ -41,7 +41,7 @@ module.exports = {
4141
} else {
4242
table = new LegacyTable(this, revisions);
4343
}
44-
44+
4545
table.display();
4646
}
4747
});

lib/legacy-table.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
/*eslint-env node*/
12
var moment = require('moment');
2-
33
var CoreObject = require('core-object');
4-
var Promise = require('ember-cli/lib/ext/promise');
54

65
module.exports = CoreObject.extend({
76
init: function(plugin, revisions) {

lib/scm-table.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
/* jshint node: true */
1+
/*eslint-env node*/
22
var Table = require('cli-table2');
33
var moment = require('moment');
4-
54
var CoreObject = require('core-object');
6-
var Promise = require('ember-cli/lib/ext/promise');
5+
var RSVP = require('rsvp');
76

87
module.exports = CoreObject.extend({
98
init: function(plugin, revisions) {
@@ -13,12 +12,12 @@ module.exports = CoreObject.extend({
1312
this.revisions = revisions;
1413
},
1514

16-
display: function(revisions) {
15+
display: function(/* revisions */) {
1716
var table = this._createTable();
1817
this._tableRows(table);
1918

2019
this._plugin.logRaw(table.toString());
21-
return Promise.resolve();
20+
return RSVP.resolve();
2221
},
2322

2423
_isWide: function() {

package.json

+13-36
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,28 @@
1212
"doc": "doc",
1313
"test": "tests"
1414
},
15-
"repository": "https://github.com/duizendnegen/ember-cli-deploy-display-revisions",
15+
"repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-display-revisions",
1616
"scripts": {
17-
"build": "ember build",
18-
"start": "ember server",
19-
"test": "node tests/runner.js"
17+
"test": "node tests/runner.js && ./node_modules/.bin/eslint index.js lib/* tests/*"
2018
},
2119
"dependencies": {
2220
"cli-table2": "^0.2.0",
2321
"core-object": "^2.0.0",
24-
"ember-cli-babel": "^5.1.7",
2522
"ember-cli-deploy-plugin": "^0.2.3",
26-
"moment": "2.10.6"
23+
"moment": "^2.18.0",
24+
"rsvp": "^3.5.0"
2725
},
2826
"devDependencies": {
29-
"broccoli-asset-rev": "^2.4.5",
30-
"chai": "^2.2.0",
31-
"chai-as-promised": "^5.0.0",
32-
"ember-ajax": "^2.4.1",
33-
"ember-cli": "2.11.1",
34-
"ember-cli-app-version": "^2.0.0",
35-
"ember-cli-dependency-checker": "^1.3.0",
36-
"ember-cli-htmlbars": "^1.1.1",
37-
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
38-
"ember-cli-inject-live-reload": "^1.4.1",
39-
"ember-cli-jshint": "^2.0.1",
40-
"ember-cli-qunit": "^3.0.1",
41-
"ember-cli-release": "^0.2.9",
42-
"ember-cli-shims": "^1.0.2",
43-
"ember-cli-sri": "^2.1.0",
44-
"ember-cli-test-loader": "^1.1.0",
45-
"ember-cli-uglify": "^1.2.0",
46-
"ember-data": "^2.11.0",
47-
"ember-disable-prototype-extensions": "^1.1.0",
48-
"ember-export-application-global": "^1.0.5",
49-
"ember-load-initializers": "^0.6.0",
50-
"ember-resolver": "^2.0.3",
51-
"ember-source": "~2.11.0",
52-
"loader.js": "^4.0.10",
53-
"glob": "^5.0.5",
54-
"mocha": "^2.2.4"
27+
"chai": "^3.5.0",
28+
"chai-as-promised": "^6.0.0",
29+
"ember-cli": "^2.12.0",
30+
"ember-cli-release": "^1.0.0-beta.2",
31+
"eslint": "^3.18.0",
32+
"glob": "^7.1.1",
33+
"mocha": "^3.2.0"
5534
},
5635
"engines": {
57-
"node": ">= 0.12.0"
36+
"node": ">= 4"
5837
},
59-
"ember-addon": {
60-
"configPath": "tests/dummy/config"
61-
}
38+
"ember-addon": {}
6239
}

testem.js

-13
This file was deleted.

tests/.eslintrc.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
globals: {
3+
"describe": true,
4+
"beforeEach": true,
5+
"it": true
6+
},
7+
env: {
8+
embertest: true
9+
}
10+
};

tests/.jshintrc

-52
This file was deleted.

tests/dummy/app/app.js

-18
This file was deleted.

tests/dummy/app/components/.gitkeep

Whitespace-only changes.

tests/dummy/app/controllers/.gitkeep

Whitespace-only changes.

tests/dummy/app/helpers/.gitkeep

Whitespace-only changes.

tests/dummy/app/index.html

-25
This file was deleted.

tests/dummy/app/models/.gitkeep

Whitespace-only changes.

tests/dummy/app/resolver.js

-3
This file was deleted.

tests/dummy/app/router.js

-12
This file was deleted.

tests/dummy/app/routes/.gitkeep

Whitespace-only changes.

tests/dummy/app/styles/app.css

Whitespace-only changes.

tests/dummy/app/templates/application.hbs

-3
This file was deleted.

tests/dummy/app/templates/components/.gitkeep

Whitespace-only changes.

tests/dummy/app/views/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)