Add ember-cpm, ember-cli-mirage, ember-sinon-qunit, ember-try

Fixes #14 Fixes #22 Fixes #23 Fix travis config
elwayman02 · Oct 10, 2015 · 4d53b51 · 4d53b51
1 parent 95bca51
commit 4d53b51
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ before_install:
 install:
   - npm install -g bower
   - npm install
-  - bower install
 
 script:
   - npm test
diff --git a/README.md b/README.md
@@ -103,6 +103,18 @@ _Minor Setup_
 
 _Additional Install: [`blanket`](http://jhawk.co/blanket-js)_
 
+### [ember-cli-mirage](http://jhawk.co/ember-cli-mirage)
+**Enhanced: Testing**
+
+Client-side server for mocking API calls for testing & development.
+
+_Minor Setup_
+
+The project's [documentation](http://www.ember-cli-mirage.com/docs/v0.1.x/) has thorough instructions on setting up 
+the mock server.
+
+_Additional Install: [Faker](http://jhawk.co/fakerjs), [lodash](http://jhawk.co/lodashjs), & [pretender](http://jhawk.co/pretenderjs)_
+
 ### [ember-cli-sass-pods](http://jhawk.co/ember-cli-sass-pods)
 **Enhanced: Pods**
 
@@ -116,9 +128,6 @@ _Additional Install: [`ember-cli-sass`](http://jhawk.co/ember-cli-sass)_
 Provides Computed Property Macros, including 
 [Composable Macros](https://github.com/cibernox/ember-cpm/blob/master/README.md#composable-computed-property-macros)!
 
-_Note: `ember-cpm` is not currently installed by Ember-CLI-Opinionated, pending its [update](https://github.com/cibernox/ember-cpm/pull/125) 
-to Ember 2.x compatibility._
-
 _No Setup_
 
 _Additional Install: N/A_
@@ -196,6 +205,15 @@ _No Setup_
 
 _Additional Install: N/A_
 
+### [ember-sinon-qunit](http://jhawk.co/ember-sinon-qunit)
+**Enhanced: Testing**
+
+Easy integration between [`sinon`](http://jhawk.co/sinonjs) and [`ember-qunit`](http://jhawk.co/ember-qunit).
+
+_No Setup_
+
+_Additional Install: [`ember-sinon`](http://jhawk.co/ember-sinon)
+
 ### [ember-suave](http://jhawk.co/ember-suave)
 Enforce code styles using [`JSCS`](http://jhawk.co/js-cs). Defaults to the 
 DockYard [JavaScript](https://github.com/dockyard/styleguides/blob/master/javascript.md) and 
@@ -212,6 +230,16 @@ _No Setup_
 
 _Additional Install: N/A_
 
+### [ember-try](http://jhawk.co/ember-try)
+**Enhanced: Testing**
+
+Run tests against multiple bower dependencies, such as Ember or Ember-Data. Incredibly useful in 
+maintaining an upgrade path for your application!
+
+_No Setup_
+
+_Additional Install: N/A_
+
 ### [liquid-fire](http://jhawk.co/liquid-fire)
 **Enhanced: Animations**
 

diff --git a/blueprints/ember-cli-opinionated/index.js b/blueprints/ember-cli-opinionated/index.js
@@ -12,7 +12,7 @@ module.exports = {
       'ember-cli-autoprefixer',
       'ember-cli-blanket',
       'ember-cli-sass',
-      //'ember-cpm',
+      'ember-cpm',
       'ember-feature-flags',
       'ember-metrics',
       'ember-moment',
@@ -32,11 +32,12 @@ module.exports = {
 
     var prompts = [
       extend({ message: 'Would you like to enhance your ember-cli-opinionated setup?', packages: packages }, updatePrompt),
-      extend({ message: 'Organizing Your App Into Pods?', packages: ['ember-cli-sass-pods'] }, updatePrompt),
-      extend({ message: 'Analytics/Reports?', packages: ['ember-e3'] }, updatePrompt),
-      extend({ message: 'Mobile Touch?', packages: ['ember-gestures'] }, updatePrompt),
-      extend({ message: 'Material Design?', packages: ['ember-paper'] }, updatePrompt),
-      extend({ message: 'Animations?', packages: ['liquid-fire'] }, updatePrompt)
+      extend({ message: 'Organizing Your App Into Pods', packages: ['ember-cli-sass-pods'] }, updatePrompt),
+      extend({ message: 'Analytics/Reports', packages: ['ember-e3'] }, updatePrompt),
+      extend({ message: 'Testing', packages: ['ember-cli-mirage', 'ember-sinon-qunit', 'ember-try'] }, updatePrompt),
+      extend({ message: 'Mobile Touch', packages: ['ember-gestures'] }, updatePrompt),
+      extend({ message: 'Material Design', packages: ['ember-paper'] }, updatePrompt),
+      extend({ message: 'Animations', packages: ['liquid-fire'] }, updatePrompt)
     ];
 
     return this.promptUserForOpinions(packages, prompts);
@@ -60,7 +61,9 @@ module.exports = {
             this.ui.writeLine('Tell us what extra features your app needs:');
           }
           if (index < prompts.length - 1) { // Keep giving prompts until the last iteration
-            return this.ui.prompt(prompts[index + 1]);
+            var nextPrompt = prompts[index + 1];
+            nextPrompt.message += ' (' + nextPrompt.packages.join(', ') + ')?';
+            return this.ui.prompt(nextPrompt);
           }
           return this.addOpinionatedPackagesToProject(packages);
         }