yeoman-generator 0.22.2 → 0.22.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/base.js +10 -3
  2. package/{index.js → lib/index.js} +4 -4
  3. package/lib/util/storage.js +0 -1
  4. package/package.json +1 -2
  5. package/readme.md +96 -1
package/lib/base.js CHANGED
@@ -115,6 +115,7 @@ var Base = module.exports = function Base(args, options) {
115
115
  return function () {};
116
116
  };
117
117
 
118
+ this.fs = FileEditor.create(this.env.sharedFs);
118
119
  this.conflicter = new Conflicter(this.env.adapter, this.options.force);
119
120
 
120
121
  // Mirror the adapter log method on the generator.
@@ -136,7 +137,7 @@ var Base = module.exports = function Base(args, options) {
136
137
  'Just found a `.yo-rc.json` in a parent directory.',
137
138
  'Setting the project root at: ' + rootPath
138
139
  ].join('\n'));
139
- process.chdir(rootPath);
140
+ this.destinationRoot(rootPath);
140
141
  }
141
142
 
142
143
  var deprecatedFileUtils = deprecate.log.bind(null, [
@@ -152,7 +153,6 @@ var Base = module.exports = function Base(args, options) {
152
153
  ].join(' '))
153
154
  });
154
155
 
155
- this.fs = FileEditor.create(this.env.sharedFs);
156
156
  this.appname = this.determineAppname();
157
157
  this.config = this._getStorage();
158
158
  this._globalConfig = this._getGlobalStorage();
@@ -435,10 +435,16 @@ Base.prototype.run = function run(cb) {
435
435
 
436
436
  return method.apply(self, self.args);
437
437
  },
438
+ // runAsync return a promise which wraps first function.
439
+ // So ensure the callback function never throw an error.
438
440
  function (err) {
439
441
  if (err) {
440
442
  debug('An error occured while running ' + methodName, err);
441
- self.emit('error', err);
443
+ if (self.listeners('error').length > 0) {
444
+ self.emit('error', err);
445
+ }
446
+ cb(err);
447
+ return;
442
448
  }
443
449
 
444
450
  completed();
@@ -699,6 +705,7 @@ Base.prototype.destinationRoot = function (rootPath) {
699
705
  }
700
706
 
701
707
  process.chdir(rootPath);
708
+ this.env.cwd = rootPath;
702
709
 
703
710
  // Reset the storage
704
711
  this.config = this._getStorage();
package/{index.js → lib/index.js} RENAMED
@@ -4,7 +4,7 @@
4
4
 
5
5
  'use strict';
6
6
  var Environment = require('yeoman-environment');
7
- var deprecate = require('./lib/util/deprecate');
7
+ var deprecate = require('./util/deprecate');
8
8
 
9
9
  /**
10
10
  * The generator system is a framework for node to author reusable and
@@ -39,8 +39,8 @@ var yeoman = module.exports = function createEnv() {
39
39
  };
40
40
 
41
41
  // hoist up top level class the generator extend
42
- yeoman.Base = require('./lib/base');
43
- yeoman.NamedBase = require('./lib/named-base');
42
+ yeoman.Base = require('./base');
43
+ yeoman.NamedBase = require('./named-base');
44
44
 
45
45
  deprecate.property(
46
46
  'NamedBase constructor is deprecated. See https://github.com/yeoman/generator/issues/882',
@@ -85,7 +85,7 @@ yeoman.generators = {
85
85
  * Named Base Generator
86
86
  * {@link NamedBase}
87
87
  */
88
- NamedBase: require('./lib/named-base')
88
+ NamedBase: require('./named-base')
89
89
  };
90
90
  deprecate.property(
91
91
  'require(\'yeoman-generator\').generators.Base is deprecated. Use require(\'yeoman-generator\').Base directly',
package/lib/util/storage.js CHANGED
@@ -51,7 +51,6 @@ Storage.prototype._persist = function (val) {
51
51
 
52
52
  /**
53
53
  * Save a new object of values
54
- * @param {Object} val - Store new state
55
54
  * @return {null}
56
55
  */
57
56
 
package/package.json CHANGED
@@ -1,11 +1,10 @@
1
1
  {
2
2
  "name": "yeoman-generator",
3
- "version": "0.22.2",
3
+ "version": "0.22.6",
4
4
  "description": "Rails-inspired generator system that provides scaffolding for your apps",
5
5
  "homepage": "http://yeoman.io",
6
6
  "author": "Yeoman",
7
7
  "files": [
8
- "index.js",
9
8
  "lib"
10
9
  ],
11
10
  "main": "lib/index.js",
package/readme.md CHANGED
@@ -1,4 +1,4 @@
1
- # Generator [![npm](https://badge.fury.io/js/yeoman-generator.svg)](http://badge.fury.io/js/yeoman-generator) [![Build Status](https://travis-ci.org/yeoman/generator.svg?branch=master)](https://travis-ci.org/yeoman/generator) [![Coverage Status](https://coveralls.io/repos/yeoman/generator/badge.svg)](https://coveralls.io/r/yeoman/generator)
1
+ # Generator [![npm](https://badge.fury.io/js/yeoman-generator.svg)](http://badge.fury.io/js/yeoman-generator) [![Build Status](https://travis-ci.org/yeoman/generator.svg?branch=master)](https://travis-ci.org/yeoman/generator) [![Coverage Status](https://coveralls.io/repos/yeoman/generator/badge.svg)](https://coveralls.io/r/yeoman/generator) [![Gitter](https://img.shields.io/badge/Gitter-Join_the_Yeoman_chat_%E2%86%92-00d06f.svg)](https://gitter.im/yeoman/yeoman)
2
2
 
3
3
  > Rails-inspired generator system that provides scaffolding for your apps
4
4
 
@@ -23,6 +23,101 @@ See the [debugging guide](http://yeoman.io/authoring/debugging.html).
23
23
 
24
24
  We love contributors! See our [contribution guideline](http://yeoman.io/contributing/) to get started.
25
25
 
26
+ ## Sponsors
27
+ Love Yeoman work and community? Help us keep it alive by donating funds to cover project expenses! <br />
28
+ [[Become a sponsor](https://opencollective.com/yeoman#support)]
29
+
30
+ <a href="https://opencollective.com/yeoman/backers/0/website" target="_blank">
31
+ <img src="https://opencollective.com/yeoman/backers/0/avatar">
32
+ </a>
33
+ <a href="https://opencollective.com/yeoman/backers/1/website" target="_blank">
34
+ <img src="https://opencollective.com/yeoman/backers/1/avatar">
35
+ </a>
36
+ <a href="https://opencollective.com/yeoman/backers/2/website" target="_blank">
37
+ <img src="https://opencollective.com/yeoman/backers/2/avatar">
38
+ </a>
39
+ <a href="https://opencollective.com/yeoman/backers/3/website" target="_blank">
40
+ <img src="https://opencollective.com/yeoman/backers/3/avatar">
41
+ </a>
42
+ <a href="https://opencollective.com/yeoman/backers/4/website" target="_blank">
43
+ <img src="https://opencollective.com/yeoman/backers/4/avatar">
44
+ </a>
45
+ <a href="https://opencollective.com/yeoman/backers/5/website" target="_blank">
46
+ <img src="https://opencollective.com/yeoman/backers/5/avatar">
47
+ </a>
48
+ <a href="https://opencollective.com/yeoman/backers/6/website" target="_blank">
49
+ <img src="https://opencollective.com/yeoman/backers/6/avatar">
50
+ </a>
51
+ <a href="https://opencollective.com/yeoman/backers/7/website" target="_blank">
52
+ <img src="https://opencollective.com/yeoman/backers/7/avatar">
53
+ </a>
54
+ <a href="https://opencollective.com/yeoman/backers/8/website" target="_blank">
55
+ <img src="https://opencollective.com/yeoman/backers/8/avatar">
56
+ </a>
57
+ <a href="https://opencollective.com/yeoman/backers/9/website" target="_blank">
58
+ <img src="https://opencollective.com/yeoman/backers/9/avatar">
59
+ </a>
60
+ <a href="https://opencollective.com/yeoman/backers/10/website" target="_blank">
61
+ <img src="https://opencollective.com/yeoman/backers/10/avatar">
62
+ </a>
63
+ <a href="https://opencollective.com/yeoman/backers/11/website" target="_blank">
64
+ <img src="https://opencollective.com/yeoman/backers/11/avatar">
65
+ </a>
66
+ <a href="https://opencollective.com/yeoman/backers/12/website" target="_blank">
67
+ <img src="https://opencollective.com/yeoman/backers/12/avatar">
68
+ </a>
69
+ <a href="https://opencollective.com/yeoman/backers/13/website" target="_blank">
70
+ <img src="https://opencollective.com/yeoman/backers/13/avatar">
71
+ </a>
72
+ <a href="https://opencollective.com/yeoman/backers/14/website" target="_blank">
73
+ <img src="https://opencollective.com/yeoman/backers/14/avatar">
74
+ </a>
75
+ <a href="https://opencollective.com/yeoman/backers/15/website" target="_blank">
76
+ <img src="https://opencollective.com/yeoman/backers/15/avatar">
77
+ </a>
78
+ <a href="https://opencollective.com/yeoman/backers/16/website" target="_blank">
79
+ <img src="https://opencollective.com/yeoman/backers/16/avatar">
80
+ </a>
81
+ <a href="https://opencollective.com/yeoman/backers/17/website" target="_blank">
82
+ <img src="https://opencollective.com/yeoman/backers/17/avatar">
83
+ </a>
84
+ <a href="https://opencollective.com/yeoman/backers/18/website" target="_blank">
85
+ <img src="https://opencollective.com/yeoman/backers/18/avatar">
86
+ </a>
87
+ <a href="https://opencollective.com/yeoman/backers/19/website" target="_blank">
88
+ <img src="https://opencollective.com/yeoman/backers/19/avatar">
89
+ </a>
90
+ <a href="https://opencollective.com/yeoman/backers/20/website" target="_blank">
91
+ <img src="https://opencollective.com/yeoman/backers/20/avatar">
92
+ </a>
93
+ <a href="https://opencollective.com/yeoman/backers/21/website" target="_blank">
94
+ <img src="https://opencollective.com/yeoman/backers/21/avatar">
95
+ </a>
96
+ <a href="https://opencollective.com/yeoman/backers/22/website" target="_blank">
97
+ <img src="https://opencollective.com/yeoman/backers/22/avatar">
98
+ </a>
99
+ <a href="https://opencollective.com/yeoman/backers/23/website" target="_blank">
100
+ <img src="https://opencollective.com/yeoman/backers/23/avatar">
101
+ </a>
102
+ <a href="https://opencollective.com/yeoman/backers/24/website" target="_blank">
103
+ <img src="https://opencollective.com/yeoman/backers/24/avatar">
104
+ </a>
105
+ <a href="https://opencollective.com/yeoman/backers/25/website" target="_blank">
106
+ <img src="https://opencollective.com/yeoman/backers/25/avatar">
107
+ </a>
108
+ <a href="https://opencollective.com/yeoman/backers/26/website" target="_blank">
109
+ <img src="https://opencollective.com/yeoman/backers/26/avatar">
110
+ </a>
111
+ <a href="https://opencollective.com/yeoman/backers/27/website" target="_blank">
112
+ <img src="https://opencollective.com/yeoman/backers/27/avatar">
113
+ </a>
114
+ <a href="https://opencollective.com/yeoman/backers/28/website" target="_blank">
115
+ <img src="https://opencollective.com/yeoman/backers/28/avatar">
116
+ </a>
117
+ <a href="https://opencollective.com/yeoman/backers/29/website" target="_blank">
118
+ <img src="https://opencollective.com/yeoman/backers/29/avatar">
119
+ </a>
120
+
26
121
  ## License
27
122
 
28
123
  [BSD license](http://opensource.org/licenses/bsd-license.php)