0.0.42

ember-cli · Dec 13, 2014 · 0e09ae8 · 0e09ae8
1 parent 292960b
commit 0e09ae8
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 16 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}
diff --git a/README.md b/README.md
@@ -2,24 +2,50 @@
 
 This README outlines the details of collaborating on this Ember application.
 
+A short introduction of this app could easily go here.
+
+## Prerequisites
+
+You will need the following things properly installed on your computer.
+
+* [Git](http://git-scm.com/)
+* [Node.js](http://nodejs.org/) (with NPM) and [Bower](http://bower.io/)
+
 ## Installation
 
-* `git clone` this repository
+* `git clone <repository-url>` this repository
+* change into the new directory
 * `npm install`
 * `bower install`
 
-## Running
+## Running / Development
 
 * `ember server`
 * Visit your app at http://localhost:4200.
 
-## Running Tests
+### Code Generators
+
+Make use of the many generators for code, try `ember help generate` for more details
+
+### Running Tests
 
 * `ember test`
 * `ember test --server`
 
-## Building
+### Building
+
+* `ember build` (development)
+* `ember build --environment production` (production)
+
+### Deploying
+
+Specify what it takes to deploy your app.
+
+## Further Reading / Useful Links
 
-* `ember build`
+* ember: http://emberjs.com/
+* ember-cli: http://www.ember-cli.com/
+* Development Browser Extensions
+  * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
+  * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
 
-For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/).
diff --git a/app/index.html b/app/index.html
@@ -13,13 +13,11 @@
     <link rel="stylesheet" href="assets/my-app.css">
   </head>
   <body>
-    <script>
-      window.MyAppENV = {{ENV}};
-      window.EmberENV = window.MyAppENV.EmberENV;
-    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/my-app.js"></script>
     <script>
+      window.MyAppENV = require('my-app/config/environment')['default'];
+      window.EmberENV = window.MyAppENV.EmberENV;
       window.MyApp = require('my-app/app')['default'].create(MyAppENV.APP);
     </script>
   </body>

diff --git a/config/environment.js b/config/environment.js
@@ -27,7 +27,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'test') {
-
+    ENV.baseURL = '/'; // Testem prefers this...
   }
 
   if (environment === 'production') {

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "body-parser": "^1.2.0",
     "broccoli-asset-rev": "0.0.17",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.0.41",
+    "ember-cli": "0.0.42",
     "ember-cli-ember-data": "0.1.0",
     "ember-cli-inject-live-reload": "^1.0.2",
     "ember-cli-ic-ajax": "0.1.1",

diff --git a/tests/index.html b/tests/index.html
@@ -33,15 +33,14 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
-    <script>
-      window.MyAppENV = {{ENV}};
-      window.EmberENV = window.MyAppENV.EmberENV;
-    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/my-app.js"></script>
     <script src="testem.js"></script>
     <script>
+      window.MyAppENV = require('my-app/config/environment')['default'];
+      window.EmberENV = window.MyAppENV.EmberENV;
+
       require('my-app/tests/test-helper');
     </script>
     <script src="assets/test-loader.js"></script>