Merge pull request #1277 from kingcody/chore/update-yeoman-generator

chore(gen): update yeoman-generator to `~0.20.3`

Author: Awk34

Diff for: app/generator.js

@@ -30,7 +30,6 @@ export default class Generator extends Base {
     return {
 
       init: function () {
-        this.pkg = require('../package.json');
         this.filters = {};
 
         // init shared generator properies and methods

Diff for: app/templates/Gruntfile.js

@@ -1,4 +1,4 @@
-// Generated on <%= (new Date).toISOString().split('T')[0] %> using <%= pkg.name %> <%= pkg.version %>
+// Generated on <%= (new Date).toISOString().split('T')[0] %> using <%= rootGeneratorName() %> <%= rootGeneratorVersion() %>
 'use strict';
 
 module.exports = function (grunt) {

Diff for: app/templates/README.md

@@ -1,6 +1,6 @@
 # <%= lodash.slugify(lodash.humanize(appname)) %>
 
-This project was generated with the [Angular Full-Stack Generator](https://github.com/DaftMonk/generator-angular-fullstack) version <%= pkg.version %>.
+This project was generated with the [Angular Full-Stack Generator](https://github.com/DaftMonk/generator-angular-fullstack) version <%= rootGeneratorVersion() %>.
 
 ## Getting Started
 

Diff for: app/templates/client/app/app(coffee).coffee

@@ -1,6 +1,6 @@
 'use strict'
 
-angular.module '<%= scriptAppName %>', [<%= angularModules %>]
+angular.module '<%= scriptAppName %>', [<%- angularModules %>]
 <% if (filters.ngroute) { %>.config ($routeProvider, $locationProvider<% if (filters.auth) { %>, $httpProvider<% } %>) ->
   $routeProvider
   .otherwise

Diff for: app/templates/client/app/app(js).js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('<%= scriptAppName %>', [<%= angularModules %>])
+angular.module('<%= scriptAppName %>', [<%- angularModules %>])
   <% if (filters.ngroute) { %>.config(function($routeProvider, $locationProvider<% if (filters.auth) { %>, $httpProvider<% } %>) {
     $routeProvider
       .otherwise({

Diff for: app/templates/client/components/footer/footer(html).html

@@ -1,5 +1,5 @@
 <div class="container">
-  <p>Angular Fullstack v<%= pkg.version %> |
+  <p>Angular Fullstack v<%= rootGeneratorVersion() %> |
     <a href="https://twitter.com/tyhenkel">@tyhenkel</a> |
     <a href="https://github.com/DaftMonk/generator-angular-fullstack/issues?state=open">Issues</a>
   </p>

Diff for: app/templates/client/components/footer/footer(jade).jade

@@ -1,6 +1,6 @@
 .container
   p
-    | Angular Fullstack v<%= pkg.version %>
+    | Angular Fullstack v<%= rootGeneratorVersion() %>
     = ' | '
     a(href='https://twitter.com/tyhenkel') @tyhenkel
     = ' | '

Diff for: generator-base.js

@@ -16,12 +16,9 @@ export function genBase(self) {
   self.lodash = lodash;
   self.yoWelcome = yoWelcome;
 
-  try {
-    self.appname = require(path.join(process.cwd(), 'bower.json')).name;
-  } catch (e) {
-    self.appname = self.name || path.basename(process.cwd());
-  }
-  self.appname = lodash.camelize(lodash.slugify(lodash.humanize(self.appname)));
+  self.appname = lodash.camelize(lodash.slugify(
+    lodash.humanize(self.determineAppname())
+  ));
   self.scriptAppName = self.appname + genUtils.appSuffix(self);
 
   self.filters = self.filters || self.config.get('filters');

Diff for: package.json

@@ -40,7 +40,7 @@
     "glob": "^5.0.14",
     "lodash": "^3.10.1",
     "underscore.string": "^3.1.1",
-    "yeoman-generator": "~0.19.2",
+    "yeoman-generator": "~0.20.3",
     "yeoman-welcome": "^1.0.1"
   },
   "devDependencies": {

Diff for: util.js

@@ -68,19 +68,9 @@ export function appSuffix(self) {
   return (typeof suffix === 'string') ? self.lodash.classify(suffix) : '';
 }
 
-function destinationPath(self, filepath) {
-  filepath = path.normalize(filepath);
-  if (!path.isAbsolute(filepath)) {
-    filepath = path.join(self.destinationRoot(), filepath);
-  }
-
-  return filepath;
-}
-
 export function relativeRequire(to, fr) {
-  var self = this;
-  fr = destinationPath(self, fr || self.filePath);
-  to = destinationPath(self, to);
+  fr = this.destinationPath(fr || this.filePath);
+  to = this.destinationPath(to);
   return path.relative(path.dirname(fr), to)
     .replace(/\\/g, '/') // convert win32 separator to posix
     .replace(/^(?!\.\.)(.*)/, './$1') // prefix non parent path with ./
@@ -148,10 +138,10 @@ export function processDirectory(source, destination) {
 
     if(templateIsUsable(self, filteredFile)) {
       if(copy) {
-        self.copy(src, dest);
+        self.fs.copy(src, dest);
       } else {
         self.filePath = dest;
-        self.template(src, dest);
+        self.fs.copyTpl(src, dest, self);
         delete self.filePath;
       }
     }