Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Convert the project to Ember-cli #209

Closed
wants to merge 16 commits into from
Closed
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: 4 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"directory": "bower_components",
"analytics": false
}
34 changes: 34 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true


[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.html]
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false
9 changes: 9 additions & 0 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
}
55 changes: 17 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,17 @@
*.bpkg
*.gem
*.rbc
.DS_Store
.bpm
.bundle
.config
.github-upload-token
.yardoc
InstalledFiles
_site
_yardoc
assets
assets/bpm_libs.js
assets/bpm_styles.css
bin/
coverage
dist
docs/build
docs/node_modules
lib/*/tests/all.js
lib/*/tests/qunit*
lib/bundler/man
pkg
rdoc
spade-boot.js
spec/reports
test/tmp
test/version_tmp
test_*.html
/tests/ember-tests.js
tmp
tmp*.gem
tmp.bpm
tmp.spade
tests/source
node_modules
.vagrant
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp

# dependencies
/node_modules
/bower_components

# misc
/.sass-cache
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
testem.log
83 changes: 30 additions & 53 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,55 +1,32 @@
{
"predef": [
"console",
"Ember",
"DS",
"Handlebars",
"Metamorph",
"ember_assert",
"ember_warn",
"ember_deprecate",
"ember_deprecateFunc",
"require",
"equal",
"asyncTest",
"test",
"raises",
"deepEqual",
"start",
"stop",
"ok",
"strictEqual",
"module",
"expect",
"minispade",
"async",
"invokeAsync",
"requirejs"
],

"node" : false,
"es5" : true,
"browser" : true,

"boss" : true,
"curly": false,
"debug": false,
"devel": false,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"newcap": true,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"sub": true,
"strict": false,
"white": false
"predef": [
"document",
"window",
"-Promise"
],
"browser": true,
"boss": true,
"curly": true,
"debug": false,
"devel": true,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"newcap": true,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"sub": true,
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"unused": true
}
15 changes: 15 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
bower_components/
tests/
tmp/
dist/

.bowerrc
.editorconfig
.ember-cli
.travis.yml
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
Brocfile.js
testem.json
42 changes: 33 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
language: ruby
before_script: sudo apt-get update && sudo apt-get install git
script: bundle exec rake test[all]
after_success: bundle exec rake publish_build BUILD_TYPE=release
---
language: node_js
node_js:
- "0.12"

sudo: false

cache:
directories:
- node_modules

env:
global:
- S3_BUCKET_NAME=builds.dockyard.com
- S3_FILE_PREFIX=ember-easyForm
- secure: eiR9ujb8OeuU1GM0M5owT79OjrDuASuoZwdjgfXw7Uihhcr56PZt8BNaW286rg8t7S/BJKdJ01cRImWTezlrklpE1jWb8comcSYQUlVpP9F5ziPM/kjhg1/5uOh1UelVIEeawntkIcJhIc8Qh/uL1EQ857hTNB5TOnO1D7STG3o=
- secure: MrLcuhH0IItaW01607Df1iIktJKIpMrucv9qnpKaMvf3/5ZvPsIh3viP4m/qdPcNN4v1s4eElBBT0Z7FUCQ8vtyTH4DmTp7Ek8PVRUMnJA+GupxsQqQmt9fIbQXYhUm460E1zNk2Bk5J17vetTX9ArgbgQkE4uV6Yn1BCzyo8SU=
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"

install:
- npm install -g bower
- npm install
- bower install

script:
- ember try $EMBER_TRY_SCENARIO 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"]
}
59 changes: 0 additions & 59 deletions Assetfile

This file was deleted.

8 changes: 0 additions & 8 deletions Gemfile

This file was deleted.

Loading