Merge branch 'release/1.0.8'

Author: bn3t

README.md

@@ -8,6 +8,8 @@ First, install [Yeoman](http://yeoman.io) and generator-angular2-firebase-bootst
 ```bash
 npm install -g yo
 npm install -g generator-angular2-firebase-bootstrap
+# If you want this generator to init a git repository for yoy
+npm install -g generator-git-init
 ```
 
 Then generate your new project:
@@ -18,10 +20,12 @@ yo angular2-firebase-bootstrap
 
 ## Features
 
-* Angular 2 with angular-cli.
+* An Angular 2 generated with angular-cli.
 * Bootstrap with ng2-bootstrap
 * AngularFire2 for Firebase
-* An initial implementation of an authentication service (See auth-service).
+* An initial implementation of an authentication service (See auth-service)
+* One ready to use component to display user information (from Firebase)
+* One ready to use component to login using username/password, Google or Twitter.
 
 ## Getting Started
 
@@ -30,8 +34,7 @@ Authentication. The seeded project contains the auth-service that can handle sev
 as we don't provide forms for registration and login, the Email/Password is not supported as such.
 
 1. Create a project folder and enter it: `mkdir myProject && cd $_`
-
-2. Generate project: `yo generator-angular2-firebase-bootstrap`
+2. Generate project: `yo angular2-firebase-bootstrap`
 
 The generator will ask you a few information on your Firebase project:
 
@@ -54,6 +57,9 @@ Go to [Firebase Authentication Documentation](https://firebase.google.com/docs/a
 project in Firebase. Please note that to use Email/Password authentication you will have to register users yourself via the 
 Firebase Console.
 
+The generated project will contain 2 ready to be used components for login and display user information. They are initially
+present in the home page of the application but can be moved elsewhere at your convenience.
+
 ## Angular 2 Specifics
 
 This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.21.

generators/app/index.js

@@ -1,13 +1,16 @@
 'use strict';
-var yeoman = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 var chalk = require('chalk');
 var yosay = require('yosay');
 
-module.exports = yeoman.Base.extend({
-    prompting: function () {
+module.exports = class extends Generator {
+    constructor(args, opts) {
+        super(args, opts);
+    }
+    prompting() {
         // Have Yeoman greet the user.
         this.log(yosay(
-            'Welcome to the laudable ' + chalk.red('generator-angular2-firebase-bootstrap') + ' generator!'
+            'Welcome to the laudable ' + chalk.red('angular2-firebase-bootstrap') + ' generator!'
         ));
 
         var prompts = [
@@ -54,18 +57,15 @@ module.exports = yeoman.Base.extend({
             // To access props later use this.props.someAnswer;
             this.props = props;
         }.bind(this));
-    },
-    configuring: function() {
+    }
+    configuring() {
         if(this.props.initGit) {
-            this.composeWith('git-init', {
-                options: { commit: 'Initial commit by angular-2-firebase-bootstrap generator' }
-            }, {
-                local: require.resolve('generator-git-init')
-            });
+            this.composeWith(require.resolve('generator-git-init'),
+                { commit: 'Initial commit by angular2-firebase-bootstrap generator' });
         }
-    },
+    }
 
-    writing: function () {
+    writing () {
         var toCopy = [
             "./.editorconfig",
             "./e2e/app.po.ts",
@@ -116,9 +116,9 @@ module.exports = yeoman.Base.extend({
         for(i = 0; i < toCopyTpl.length; i++) {
             this.fs.copyTpl(this.templatePath(toCopyTpl[i]), this.destinationPath(toCopyTpl[i]), this.props);
         }
-    },
+    }
 
-    install: function () {
+    install() {
         this.npmInstall();
     }
-});
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular2-firebase-bootstrap",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Generator for Angular 2 - Firebase - Bootstrap projects",
   "homepage": "",
   "author": {
@@ -17,14 +17,14 @@
     "yeoman-generator"
   ],
   "dependencies": {
-    "chalk": "^1.0.0",
-    "generator-git-init": "^1.1.3",
-    "yeoman-generator": "^0.23.0",
-    "yosay": "^1.0.0"
+    "yeoman-generator": "^1.0.0",
+    "chalk": "^1.1.3",
+    "yosay": "^1.2.1",
+    "generator-git-init": "^1.1.3"
   },
   "devDependencies": {
-    "yeoman-test": "^1.0.0",
-    "yeoman-assert": "^2.0.0",
+    "yeoman-test": "^1.6.0",
+    "yeoman-assert": "^2.2.1",
     "eslint": "^3.1.1",
     "eslint-config-xo-space": "^0.15.0",
     "gulp": "^3.9.0",