Update to ember-cli 0.1.3

Author: towerhe

.travis.yml

@@ -7,6 +7,10 @@ cache:
   directories:
     - node_modules
 
+before_install:
+  - "npm config set spin false"
+  - "npm install -g npm@^2"
+
 install:
   - npm install -g bower
   - npm install

Brocfile.js

@@ -30,19 +30,13 @@ var app = new EmberApp({
 app.import('bower_components/html5shiv/dist/html5shiv.js', { destDir: 'assets' });
 app.import('bower_components/respond/dest/respond.min.js', { destDir: 'assets' });
 
-app.import('bower_components/select2/select2.css');
-app.import('bower_components/select2/select2-bootstrap.css');
-
 app.import('bower_components/jquery.browser/dist/jquery.browser.js');
 app.import('bower_components/cldr/plurals.js');
 app.import('bower_components/ember-i18n/lib/i18n.js');
 app.import('bower_components/bootstrap/dist/js/bootstrap.js');
-app.import('bower_components/ember-list-view/index.js');
 app.import('bower_components/ember-addons.bs_for_ember/dist/js/bs-core.max.js');
 app.import('bower_components/ember-addons.bs_for_ember/dist/js/bs-button.max.js');
 app.import('bower_components/ember-addons.bs_for_ember/dist/js/bs-modal.max.js');
-app.import('bower_components/select2/select2.js');
-app.import('bower_components/select2/select2_locale_zh-CN.js');
 app.import('bower_components/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js');
 app.import('bower_components/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js');
 app.import('bower_components/notifier/notifier.js');
@@ -65,16 +59,10 @@ var bootstrapAssets = pickFiles('bower_components/bootstrap', {
   destDir: '/fonts'
 });
 
-var select2Assets = pickFiles('bower_components/select2', {
-  srcDir: '/',
-  files: ['select2.png', 'select2x2.png'],
-  destDir: '/assets'
-});
-
 var gloitComponentAssets = pickFiles('bower_components/gloit-component', {
   srcDir: 'images/',
   files: ['**/*'],
   destDir: '/images'
 });
 
-module.exports = mergeTrees([app.toTree(), fontAwesomeAssets, bootstrapAssets, select2Assets, gloitComponentAssets]);
+module.exports = mergeTrees([app.toTree(), fontAwesomeAssets, bootstrapAssets, gloitComponentAssets]);

app/controllers/account/password.coffee

@@ -1,6 +1,7 @@
 `import Ember from 'ember'`
+`import EmberValidations from 'ember-validations'`
 
-PasswordController = Ember.ObjectController.extend Ember.Validations.Mixin,
+PasswordController = Ember.ObjectController.extend EmberValidations.Mixin,
   actions:
     save: ->
       @send('loading')

app/models/user.coffee

@@ -1,8 +1,9 @@
 `import Ember from 'ember'`
 `import DS from 'ember-data'`
 `import config from '../config/environment'`
+`import EmberValidations from 'ember-validations'`
 
-User = DS.Model.extend Ember.Validations.Mixin,
+User = DS.Model.extend EmberValidations.Mixin,
   username: DS.attr()
   realname: DS.attr()
   email: DS.attr()

bower.json

@@ -3,9 +3,9 @@
   "dependencies": {
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.7.0",
+    "ember": "1.8.1",
     "ember-data": "1.0.0-beta.11",
-    "ember-resolver": "~0.1.7",
+    "ember-resolver": "~0.1.10",
     "loader.js": "stefanpenner/loader.js#1.0.1",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
@@ -19,7 +19,6 @@
     "respond": "~1.4.2",
     "gloit-component": "gloit/gloit-component#master",
     "ember-forms": "*",
-    "ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/release/ember-validations.js",
     "ember-addons.bs_for_ember": "~0.7.0",
     "ember-simple-auth": "0.6.7",
     "ic-styled": "~2.0.0",

config/environment.js

@@ -58,7 +58,7 @@ module.exports = function(environment) {
   if (environment === 'test') {
     // Testem prefers this...
     ENV.baseURL = '/';
-    ENV.locationType = 'auto';
+    ENV.locationType = 'none';
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;

package.json

@@ -18,26 +18,28 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.3.1",
-    "broccoli-ember-hbs-template-compiler": "^1.6.2",
-    "broccoli-emblem-compiler": "^0.3.18",
+    "broccoli-asset-rev": "^1.0.0",
+    "broccoli-ember-hbs-template-compiler": "^1.6.1",
+    "broccoli-emblem-compiler": "^0.3.19",
     "broccoli-merge-trees": "^0.2.1",
     "broccoli-static-compiler": "^0.2.1",
-    "ember-cli": "^0.1.2",
-    "ember-cli-coffeescript": "0.0.4",
+    "ember-cli": "^0.1.3",
+    "ember-cli-coffeescript": "0.4.0",
     "ember-cli-components": "git://github.com/towerhe/ember-cli-components.git",
     "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-divshot": "^0.1.5",
+    "ember-cli-esnext": "0.1.1",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-less": "1.0.4",
-    "ember-cli-loading-slider": "^1.0.2",
-    "ember-cli-qunit": "0.1.0",
+    "ember-cli-less": "1.0.5",
+    "ember-cli-loading-slider": "^1.1.0",
+    "ember-cli-qunit": "0.1.2",
     "ember-cli-simple-auth": "git://github.com/simplabs/ember-cli-simple-auth.git",
     "ember-cli-simple-auth-devise": "git://github.com/simplabs/ember-cli-simple-auth-devise.git",
     "ember-data": "1.0.0-beta.11",
     "ember-devtools": "^2.0.1",
+    "ember-export-application-global": "^1.0.1",
+    "ember-validations": "^2.0.0-alpha.1",
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "grunt": "^0.4.5",

public/robots.txt

@@ -1,3 +1,2 @@
-# robotstxt.org/
-
+# http://www.robotstxt.org
 User-agent: *

tests/helpers/start-app.js

@@ -9,17 +9,11 @@ export default function startApp(attrs) {
   var attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Router.reopen({
-    location: 'none'
-  });
-
   Ember.run(function() {
     App = Application.create(attributes);
     App.setupForTesting();
     App.injectTestHelpers();
   });
 
-  App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"
-
   return App;
 }

tests/index.html

@@ -31,8 +31,6 @@
     </style>
   </head>
   <body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
 
     {{content-for 'body'}}
     {{content-for 'test-body'}}