Skip to content

Commit

Permalink
Bump some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
SBoudrias committed May 1, 2016
1 parent 3a41fa0 commit 3272f44
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions lib/actions/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ user.git.name = function () {
}

if (shell.which('git')) {
name = shell.exec('git config --get user.name', { silent: true }).output.trim();
name = shell.exec('git config --get user.name', { silent: true }).stdout.trim();
nameCache[process.cwd()] = name;
}

Expand All @@ -47,7 +47,7 @@ user.git.email = function () {
}

if (shell.which('git')) {
email = shell.exec('git config --get user.email', { silent: true }).output.trim();
email = shell.exec('git config --get user.email', { silent: true }).stdout.trim();
emailCache[process.cwd()] = email;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ Base.prototype.run = function run(cb) {
this.runHooks();
});

_.invoke(this._composedWith, 'run');
_.invokeMap(this._composedWith, 'run');
return this;
};

Expand Down
2 changes: 1 addition & 1 deletion lib/util/prompt-suggestion.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var getListDefault = function (question, defaultValue) {
* @private
*/
var storeListAnswer = function (question, answer) {
var choiceValues = _.pluck(question.choices, 'value');
var choiceValues = _.map(question.choices, 'value');
var choiceIndex = choiceValues.indexOf(answer);

// Check if answer is not equal to default value
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@
"error": "^7.0.2",
"find-up": "^1.0.0",
"github-username": "^2.0.0",
"glob": "^6.0.1",
"glob": "^7.0.3",
"gruntfile-editor": "^1.0.0",
"html-wiring": "^1.0.0",
"inquirer": "^0.11.0",
"istextorbinary": "^1.0.2",
"lodash": "^3.5.0",
"lodash": "^4.11.1",
"mem-fs-editor": "^2.0.0",
"mkdirp": "^0.5.0",
"nopt": "^3.0.0",
"path-exists": "^2.0.0",
"path-exists": "^3.0.0",
"path-is-absolute": "^1.0.0",
"pretty-bytes": "^2.0.1",
"read-chunk": "^1.0.1",
"pretty-bytes": "^3.0.1",
"read-chunk": "^2.0.0",
"read-pkg-up": "^1.0.1",
"rimraf": "^2.2.0",
"run-async": "^2.0.0",
"shelljs": "^0.5.0",
"shelljs": "^0.7.0",
"text-table": "^0.2.0",
"through2": "^2.0.0",
"underscore.string": "^3.0.3",
Expand Down
1 change: 1 addition & 0 deletions test/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ describe('generators.Base', function () {
// generator before the base one is ran.
setTimeout(function () {
this.dummy.run(function () {
sinon.assert.callOrder(runSpy, this.spy);
assert(this.spy.calledAfter(runSpy));
done();
}.bind(this));
Expand Down
2 changes: 1 addition & 1 deletion test/conflicter.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ describe('Conflicter', function () {
contents: null
}, function () {
assert.equal(
_.where(spy.firstCall.args[0][0].choices, { value: 'diff' }).length,
_.filter(spy.firstCall.args[0][0].choices, { value: 'diff' }).length,
0
);
done();
Expand Down

0 comments on commit 3272f44

Please sign in to comment.