Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
}
};
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -13,5 +13,5 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
testem.log
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

22 changes: 12 additions & 10 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
bower_components/
tests/
tmp/

/bower_components
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.travis.yml
.npmignore
**/.gitkeep
bower.json
Brocfile.js
testem.json
.gitignore
.eslintrc.js
.watchmanconfig
circle.yml
ember-cli-build.js
testem.js
15 changes: 6 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
}
21 changes: 0 additions & 21 deletions Brocfile.js

This file was deleted.

8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ The path to the directory you'd like the project to be built in to.

None

## Running Tests
## Tests

- `npm test`
* yarn test

## Why `ember test` doesn't work

Since this is a node-only ember-cli addon, we use mocha for testing and this package does not include many files and devDependencies which are part of ember-cli's typical `ember test` processes.

[1]: https://ember-cli-deploy.github.io/ember-cli-deploy/plugins/ "Plugin Documentation"
Empty file removed addon/.gitkeep
Empty file.
Empty file removed app/.gitkeep
Empty file.
8 changes: 0 additions & 8 deletions bin/prepare-release

This file was deleted.

16 changes: 0 additions & 16 deletions bower.json

This file was deleted.

10 changes: 0 additions & 10 deletions circle.yml

This file was deleted.

1 change: 1 addition & 0 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
17 changes: 17 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* eslint-env node */
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
// Add options here
});

/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree();
};
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* jshint node: true */
/*eslint-env node*/
'use strict';

var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var glob = require('glob');
var DeployPluginBase = require('ember-cli-deploy-plugin');
var path = require('path');
Expand All @@ -17,7 +17,7 @@ module.exports = {
outputPath: 'tmp' + path.sep + 'deploy-dist'
},

build: function(context) {
build: function(/* context */) {
var self = this;
var outputPath = this.readConfig('outputPath');
var buildEnv = this.readConfig('environment');
Expand Down Expand Up @@ -46,7 +46,7 @@ module.exports = {
})
.catch(function(error) {
self.log('build failed', { color: 'red' });
return Promise.reject(error);
return RSVP.reject(error);
});
},
_logSuccess: function(outputPath) {
Expand All @@ -60,7 +60,7 @@ module.exports = {
}
self.log('build ok', { verbose: true });

return Promise.resolve(files);
return RSVP.resolve(files);
}
});
return new DeployPlugin();
Expand Down
49 changes: 20 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,40 @@
"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 tests/**/*.js"
},
"repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-build",
"engines": {
"node": ">= 0.10.0"
"node": ">= 4"
},
"author": "Aaron Chambers and the ember-cli-deploy team",
"license": "MIT",
"dependencies": {
"chalk": "^1.0.0",
"ember-cli-deploy-plugin": "^0.2.1",
"glob": "^7.1.1",
"rsvp": "^3.5.0"
},
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"chai": "^2.2.0",
"chai-as-promised": "^5.0.0",
"ember-cli": "0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.10",
"ember-cli-release": "1.0.0-beta.1",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.16.1",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-export-application-global": "^1.0.2",
"ember-try": "0.0.4",
"chai-as-promised": "^6.0.0",
"chai": "^3.5.0",
"ember-cli-babel": "^5.2.4",
"ember-cli-htmlbars": "^1.2.0",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-shims": "^1.0.2",
"ember-cli": "^2.12.0",
"ember-source": "^2.12.0",
"eslint": "^3.18.0",
"github": "^0.2.4",
"mocha": "^2.2.4",
"glob": "^7.1.1",
"loader.js": "^4.2.3",
"mocha": "^3.2.0",
"multiline": "^1.0.2"
},
"keywords": [
"ember-addon",
"ember-cli-deploy-plugin"
],
"dependencies": {
"chalk": "^1.0.0",
"ember-cli-babel": "^5.0.0",
"ember-cli-deploy-plugin": "^0.2.1",
"glob": "^5.0.5",
"rsvp": "^3.0.18"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
Expand Down
11 changes: 0 additions & 11 deletions testem.json

This file was deleted.

10 changes: 10 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
globals: {
"describe": true,
"beforeEach": true,
"it": true
},
env: {
embertest: true
}
};
Loading