yeoman-environment 1.6.1 → 1.6.6

package/lib/environment.js

@@ -230,20 +230,22 @@ Environment.prototype.getGeneratorNames = function getGeneratorNames() {
  * get `angular:common:all` then we get `angular:common` as a fallback (unless
  * an `angular:common:all` generator is registered).
  *
- * @param  {String} namespace
+ * @param  {String} namespaceOrPath
  * @return {Generator|null} - the generator registered under the namespace
  */
 
-Environment.prototype.get = function get(namespace) {
+Environment.prototype.get = function get(namespaceOrPath) {
   // Stop the recursive search if nothing is left
-  if (!namespace) {
+  if (!namespaceOrPath) {
     return;
   }
 
+  var namespace = namespaceOrPath;
+
   // Legacy yeoman-generator `#hookFor()` function is passing the generator path as part
   // of the namespace. If we find a path delimiter in the namespace, then ignore the
   // last part of the namespace.
-  var parts = namespace.split(':');
+  var parts = namespaceOrPath.split(':');
   var maybePath = _.last(parts);
   if (parts.length > 1 && /[\/\\]/.test(maybePath)) {
     parts.pop();
@@ -258,7 +260,9 @@ Environment.prototype.get = function get(namespace) {
 
   return this.store.get(namespace) ||
     this.store.get(this.alias(namespace)) ||
-    this.getByPath(namespace);
+    // namespace is empty if namespaceOrPath contains a win32 absolute path of the form 'C:\path\to\generator'.
+    // for this reason we pass namespaceOrPath to the getByPath function.
+    this.getByPath(namespaceOrPath);
 };
 
 /**
@@ -294,10 +298,14 @@ Environment.prototype.create = function create(namespace, options) {
   if (!_.isFunction(Generator)) {
     return this.error(
       new Error(
-        'You don\'t seem to have a generator with the name ' + namespace + ' installed.\n' +
-        chalk.bold('You can see available generators with ' + 'npm search yeoman-generator') +
-        chalk.bold(' and then install them with ' + 'npm install [name]') + '.\n' +
-        'To see the ' + this.namespaces().length + ' registered generators run yo with the `--help` option.'
+        chalk.red('You don\’t seem to have a generator with the name “' + namespace + '” installed.') + '\n' +
+        'But help is on the way:\n\n' +
+        'You can see available generators via ' +
+        chalk.yellow('npm search yeoman-generator') + ' or via ' + chalk.yellow('http://yeoman.io/generators/') + '. \n' +
+        'Install them with ' + chalk.yellow('npm install generator-' + namespace) + '.\n\n' +
+        'To see all your installed generators run ' + chalk.yellow('yo') + ' without any arguments. ' +
+        'Adding the ' + chalk.yellow('--help') + ' option will also show subgenerators. \n\n' +
+        'If ' + chalk.yellow('yo') + ' cannot find the generator, run ' + chalk.yellow('yo doctor') + ' to troubleshoot your system.'
       )
     );
   }

package/lib/resolver.js

@@ -127,13 +127,16 @@ resolver.getNpmPaths = function () {
   paths.push(path.join(__dirname, '../..'));
 
   // adds support for generator resolving when yeoman-generator has been linked
-  paths.push(path.join(path.dirname(process.argv[1]), '../..'));
+  if (process.argv[1]) {
+    paths.push(path.join(path.dirname(process.argv[1]), '../..'));
+  }
 
   // Default paths for each system
   if (win32) {
     paths.push(path.join(process.env.APPDATA, 'npm/node_modules'));
   } else {
     paths.push('/usr/lib/node_modules');
+    paths.push('/usr/local/lib/node_modules');
   }
 
   // Walk up the CWD and add `node_modules/` folder lookup on each level

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "1.6.1",
+  "version": "1.6.6",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",

package/readme.md

@@ -1,6 +1,6 @@
 # Yeoman Environment
 
-[![npm](https://badge.fury.io/js/yeoman-environment.svg)](http://badge.fury.io/js/yeoman-environment) [![Build Status](https://travis-ci.org/yeoman/generator.svg?branch=master)](https://travis-ci.org/yeoman/environment) [![Coverage Status](https://coveralls.io/repos/yeoman/environment/badge.svg?branch=master&service=github)](https://coveralls.io/github/yeoman/environment?branch=master) [![Gitter](https://img.shields.io/badge/Gitter-Join_the_Yeoman_chat_%E2%86%92-00d06f.svg)](https://gitter.im/yeoman/yeoman)
+[![npm](https://badge.fury.io/js/yeoman-environment.svg)](http://badge.fury.io/js/yeoman-environment) [![Build Status](https://travis-ci.org/yeoman/generator.svg?branch=master)](https://travis-ci.org/yeoman/environment) [![Coverage Status](https://coveralls.io/repos/github/yeoman/environment/badge.svg?branch=master)](https://coveralls.io/github/yeoman/environment?branch=master) [![Gitter](https://img.shields.io/badge/Gitter-Join_the_Yeoman_chat_%E2%86%92-00d06f.svg)](https://gitter.im/yeoman/yeoman)
 
 > Handles the lifecycle and bootstrapping of generators in a specific environment