Updated the readme and Ionic.

Author: PizzaPete

README.md

@@ -4,9 +4,9 @@
 ## Features
 
 * [Gulp](http://gulpjs.com/) for task automation
-* Compiles and concats your SASS
+* Compiles and concats your sass
 * Local development server with [Apache Ripple](http://ripple.incubator.apache.org/) included
-* Providing custom Ionic changes in a seperate SASS file
+* Providing custom Ionic changes in a seperate sass file
 * [ng-cordova](http://ngcordova.com/) is built in
 
 ## Installation
@@ -18,10 +18,10 @@ npm install -g yo
 npm install -g generator-ionic-incubator
 ```
 
-Then generate your new project:
+Then generate your new project inside your app directory:
 
 ```bash
-yo generator-ionic-incubator
+yo ionic-incubator
 ```
 
 To run the application just run:
@@ -30,6 +30,86 @@ To run the application just run:
 gulp
 ```
 
+## Workflow commands
+
+### `gulp` or `gulp default`
+
+Runs the following commands: `clean, fonts, templates, styles, images, vendor, buildIndex, watchers, serve`
+
+### `gulp -b` or `gulp default -b`
+
+Runs the following commands: `clean, fonts, templates, styles, images, vendor, buildIndex`
+
+### `gulp -e` or `gulp default -e`
+
+Runs the following commands: `clean, fonts, templates, styles, images, vendor, buildIndex, ionic:emulate, watchers`
+(Make sure you've added a platform before running this command)
+
+### `gulp -r` or `gulp default -r`
+
+Runs the following commands: `clean, fonts, templates, styles, images, vendor, buildIndex, ionic:run`
+(Make sure you've added a platform before running this command)
+
+### `gulp clean`
+
+Deletes the `www` folder.
+
+### `gulp styles`
+
+Concatenates, autoprefixes and strips comments from the scss files into a single main.css file.
+
+### `gulp scripts`
+
+Concatenates, and uglifies js files from the templates and scripts directories into a single app.js file.
+
+### `gulp fonts`
+
+Builds a webfont from the Ionicons webfont.
+
+### `gulp templates`
+
+Copies the templates directory from the `src` folder to the `www` folder.
+
+### `gulp images`
+
+Copies the images directory from the `src` folder to the `www` folder.
+
+### `gulp jsHint`
+
+Lints the js files based on the .jshintrc ruleset.
+
+### `gulp vendor`
+
+Concatenates and uglifies all the vendor scripts and places the vendor.js file in the `www` directory.
+
+### `gulp buildIndex`
+
+Injects the css and js files into the index.html file.
+
+### `gulp karma`
+
+Runs the [Karma](http://karma-runner.github.io/) unit tests.
+
+### `gulp protractor`
+
+Runs the [Protractor](http://www.protractortest.org/) E2E tests.
+
+### `gulp watchers`
+
+Starts watching the scss, fonts, images and template files.
+
+### `gulp ripple`
+
+Launches [Apache Ripple](http://ripple.incubator.apache.org/) (make sure you've added a platform before running this command).
+
+## Changelog
+
+### 0.1.0
+
+* Update to [Ionic 1.2.0](https://github.com/driftyco/ionic/blob/master/CHANGELOG.md#120-zirconium-zeren-2015-12-09).
+* Update the readme.
+* Change the tilde into a carret for angular-mocks.
+
 ## License
 
 MIT © [Pieter Bogaerts](http://www.goedonthouden.com/)

generators/app/index.js

@@ -13,7 +13,7 @@ module.exports = yeoman.generators.Base.extend({
 
 		// Have Yeoman greet the user.
 		this.log(yosay(
-			'Welcome to the sublime ' + chalk.red('generator-ionic-incubator') + ' generator!'
+			'Welcome to the sublime ' + chalk.red('ionic-incubator') + ' generator!'
 		));
 
 		var prompts = [{

generators/app/templates/_bower.json

@@ -5,10 +5,10 @@
 	"devDependencies": {},
 	"dependencies": {
 		"angular": "^1.4.3",
-		"angular-mocks": "~1.4.3",
+		"angular-mocks": "^1.4.8",
 		"angular-resource": "^1.4.3",
-		"ionic": "^1.1.1",
-		"ngCordova": "^0.1.20-alpha"
+		"ionic": "^1.2.0",
+		"ngCordova": "^0.1.17-alpha"
 	},
 	"resolutions": {
 		"angular": "1.4.3"

generators/app/templates/_gulpfile.js

@@ -259,7 +259,6 @@ gulp.task('watchers', function() {
 	plugins.livereload.listen();
 	gulp.watch('src/styles/**/*.scss', ['styles']);
 	gulp.watch('src/fonts/**', ['fonts']);
-	gulp.watch('src/icons/**', ['iconfont']);
 	gulp.watch('src/images/**', ['images']);
 	gulp.watch('src/scripts/**/*.js', ['buildIndex']);
 	gulp.watch('./vendor.json', ['vendor']);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "generator-ionic-incubator",
-	"version": "0.0.2",
+	"version": "0.1.0",
 	"description": "Yeoman generator for Ionic Projects",
 	"homepage": "",
 	"bugs": "https://github.com/PizzaPete/generator-ionic-incubator/issues",