Merge commit 'a14ecd0fadbdbfa3bd332361d86b6f3cdef08140'

* commit 'a14ecd0fadbdbfa3bd332361d86b6f3cdef08140': (39 commits)
  docs(docs): Add docs directory
  docs(readme): Plugin management
  docs(CHANGELOG): Update for 0.6.0
  0.6.0
  feat(ionic): Update to Beta 13
  fix(plugins): Add default plugins to be installed by new hooks
  feat(generator): Add support for Plugin management hooks. Closes diegonetto#72
  fix(generator): Fix issue when running emulate/run before serve
  fix(generator): Fix JSHint errors. Closes diegonetto#113
  docs(readme): Clean up some descriptions
  docs(readme): Add description for each command.
  docs(README): Begin documentation overhaul
  Update README.md
  Update README.md
  Update README.md
  Updated Readme with Android Walkthrough
  feat(generator): Pass CLI flags to cordova wrapper functions. Closes diegonetto#97 and diegonetto#107
  feat(generator): Add ionic-cli support. Closes diegonetto#112
  feature(generator): Add support for Plugin management hooks. Closes diegonetto#72
  bug(generator): Fix issue when running emulate/run before serve
  ...

CHANGELOG.md

@@ -1,4 +1,35 @@
-<a name="0.5.2"></a>
+<a name="0.6.0"></a>
+## 0.6.0 (2014-10-06)
+
+
+#### Bug Fixes
+
+* **generator:**
+  * Fix issue when running emulate/run before serve ([56c40741](http://github.com/diegonetto/generator-ionic/commit/56c40741ac5ae06a2a76da6357e95538b4f6bd36))
+  * Fix JSHint errors. ([d9ed14e6](http://github.com/diegonetto/generator-ionic/commit/d9ed14e65d0b4ca9cf0b70d291e3dd5a41aa9cd9), closes [#113](http://github.com/diegonetto/generator-ionic/issues/113))
+* **package.json:** Remove warnings as mentioned in #99 ([4ef83b34](http://github.com/diegonetto/generator-ionic/commit/4ef83b3408305e7e24db1f49b7246a830dd43099))
+* **plugins:** Add default plugins to be installed by new hooks ([2774b39c](http://github.com/diegonetto/generator-ionic/commit/2774b39c13806c12d15d3836975baaaadc577b55))
+
+
+#### Features
+
+* **generator:**
+  * Add support for Plugin management hooks. ([0498bc1b](http://github.com/diegonetto/generator-ionic/commit/0498bc1bd815339ce4a38ddbaa69fa3c3c5a04de), closes [#72](http://github.com/diegonetto/generator-ionic/issues/72))
+  * Pass CLI flags to cordova wrapper functions. and #107 ([b2821f49](http://github.com/diegonetto/generator-ionic/commit/b2821f49923915f91752df26cd68e3e22320c0eb), closes [#97](http://github.com/diegonetto/generator-ionic/issues/97))
+  * Add ionic-cli support. ([f6f9e0fc](http://github.com/diegonetto/generator-ionic/commit/f6f9e0fcd472ef7bbb6fef3038064e2f0d91b8f8), closes [#112](http://github.com/diegonetto/generator-ionic/issues/112))
+* **ionic:** Update to Beta 13 ([60e1cf4b](http://github.com/diegonetto/generator-ionic/commit/60e1cf4bff2f2d37783d098f5ad9962d04b8e7c4))
+
+
+<a name="0.5.4"></a>
+### 0.5.4 (2014-09-07)
+
+
+#### Bug Fixes
+
+* **sass:** Ensure CSS or SCSS files are properly created. Change wiredep config. ([b2cb5cf2](http://github.com/diegonetto/generator-ionic/commit/b2cb5cf2279692c98c76bf0fa5510a4459cc381b), closes [#99](http://github.com/diegonetto/generator-ionic/issues/99))
+
+
+<a name="0.5.3"></a>
 ### 0.5.3 (2014-08-26)
 
 

app/index.js

@@ -135,16 +135,21 @@ IonicGenerator.prototype.createIndexHtml = function createIndexHtml() {
   this.write(path.join(this.appPath, 'index.html'), this.indexFile);
 };
 
-IonicGenerator.prototype.copyStyles = function copyStyles() {
-  var sass = this.compass;
-  var mainFile = 'main.' + (sass ? 'sass' : 'css');
-
+IonicGenerator.prototype.ensureStyles = function ensureStyles() {
   // Only create a main style file if the starter template didn't
   // have any styles. In the case it does, the starter should
-  // supply both main.css and main.sass files.
-  if (_.isEmpty(this.expand('app/styles/main.*'))) {
-    this.copy('styles/' + mainFile, 'app/styles/' + mainFile);
-  }
+  // supply both main.css and main.scss files, one of which
+  // will be deleted
+  var done = this.async();
+  var unusedFile = 'main.' + (this.compass ? 'css' : 'scss');
+  fs.unlink(path.resolve('app/styles', unusedFile), function (err) {
+    if (_.isEmpty(this.expand('app/styles/main.*'))) {
+      var cssFile = 'main.' + (this.compass ? 'scss' : 'css');
+      this.copy('styles/' + cssFile, 'app/styles/' + cssFile);
+    }
+    done();
+  }.bind(this));
+
 };
 
 IonicGenerator.prototype.packageFiles = function packageFiles() {
@@ -156,8 +161,7 @@ IonicGenerator.prototype.packageFiles = function packageFiles() {
 };
 
 IonicGenerator.prototype.cordovaHooks = function cordovaHooks() {
-  var iconsAndSplash = 'hooks/after_prepare/icons_and_splashscreens.js';
-  this.template(iconsAndSplash);
+  this.directory('hooks', 'hooks', true);
 };
 
 IonicGenerator.prototype.hookPerms = function hookPerms() {

contributing.md

@@ -1,6 +1,17 @@
-* When submitting a PR, make sure that the commit messages match the [AngularJS conventions][commit-message-format] (see below).
-* When submitting a bugfix, write a test that exposes the bug and fails before applying your fix. Submit the test alongside the fix.
-* When submitting a new feature, add tests that cover the feature.
+## Issue submission
+
+In order for us to help you please check that you've completed the following steps:
+
+* Made sure you're on the latest version `npm update -g generator-ionic`
+* Used the search feature to ensure that the bug hasn't been reported before
+* Included as much information about the bug as possible, including any output you've received, what OS and version you're on, etc.
+* Share the output from running the following command in your project root as this can also help track down the issue.
+
+Unix: `yo --version && echo $PATH $NODE_PATH && node -e 'console.log(process.platform, process.versions)'`
+
+Windows: `yo --version && echo %PATH% %NODE_PATH% && node -e "console.log(process.platform, process.versions)"`  
+
+[Submit your issue](https://github.com/diegonetto/generator-ionic/issues/new)
 
 ## Git Commit Guidelines
 

docs/README.md

@@ -0,0 +1,3 @@
+# Ionic Generator documentation
+
+FAQ and Guides coming soon.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-ionic",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "A generator for the Ionic Framework",
   "keywords": [
     "yeoman-generator",