Skip to content

Commit 81deefb

Browse files
committed
Switched generator commands to a more commander-compliant syntax
1 parent c5032e9 commit 81deefb

File tree

4 files changed

+25
-71
lines changed

4 files changed

+25
-71
lines changed

lib/cli/build.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
var program = require('commander');
44

55
var dasherize = require('../utils/string').dasherize;
6-
var Promise = require('../ext/promise');
76
var ui = require('../ui');
87

98
program
109
.usage('<addonName>')
1110
.arguments('<addonName>')
1211
.action(function(addonName) {
1312
if (addonName) {
14-
require('../tasks/build')({ addonName: addonName }).catch(ui.error);
13+
require('../tasks/build')({ addonName: dasherize(addonName) }).catch(ui.error);
1514
}
1615
})
1716
.parse(process.argv);

lib/cli/component.js

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,19 @@
33
var program = require('commander');
44

55
var dasherize = require('../utils/string').dasherize;
6-
var Promise = require('../ext/promise');
76
var ui = require('../ui');
87

9-
function validateOptions(options) {
10-
return new Promise(function(resolve, reject) {
11-
if (!options.addonName) {
12-
reject('You must provide a name of the component you wisth to generate.');
13-
} else {
14-
resolve(options);
8+
program
9+
.arguments('<addonName>')
10+
.action(function(addonName) {
11+
if (addonName) {
12+
require('../tasks/component')({ addonName: dasherize(addonName) }).catch(ui.error);
1513
}
1614
});
17-
}
18-
19-
function run(options) {
20-
return require('../tasks/component')(options);
21-
}
2215

2316
program
24-
.arguments('<addonName>')
25-
.action(function(addonName) {
26-
program.addonName = addonName;
27-
})
2817
.parse(process.argv);
2918

30-
var options = {
31-
addonName: program.addonName ? dasherize(program.addonName) : null
32-
};
33-
34-
return validateOptions(options)
35-
.then(run)
36-
.catch(ui.error);
19+
if (process.argv.length < 3) {
20+
program.outputHelp();
21+
}

lib/cli/helper.js

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,19 @@
33
var program = require('commander');
44

55
var dasherize = require('../utils/string').dasherize;
6-
var Promise = require('../ext/promise');
76
var ui = require('../ui');
87

9-
function validateOptions(options) {
10-
return new Promise(function(resolve, reject) {
11-
if (!options.addonName) {
12-
reject('You must provide a name of the helper you wisth to generate.');
13-
} else {
14-
resolve(options);
8+
program
9+
.arguments('<addonName>')
10+
.action(function(addonName) {
11+
if (addonName) {
12+
require('../tasks/helper')({ addonName: dasherize(addonName) }).catch(ui.error);
1513
}
1614
});
17-
}
18-
19-
function run(options) {
20-
return require('../tasks/helper')(options);
21-
}
2215

2316
program
24-
.arguments('<addonName>')
25-
.action(function(addonName) {
26-
program.addonName = addonName;
27-
})
2817
.parse(process.argv);
2918

30-
var options = {
31-
addonName: program.addonName ? dasherize(program.addonName) : null
32-
};
33-
34-
return validateOptions(options)
35-
.then(run)
36-
.catch(ui.error);
19+
if (process.argv.length < 3) {
20+
program.outputHelp();
21+
}

lib/cli/library.js

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,19 @@
33
var program = require('commander');
44

55
var dasherize = require('../utils/string').dasherize;
6-
var Promise = require('../ext/promise');
76
var ui = require('../ui');
87

9-
function validateOptions(options) {
10-
return new Promise(function(resolve, reject) {
11-
if (!options.addonName) {
12-
reject('You must provide a name of the library you wisth to generate.');
13-
} else {
14-
resolve(options);
8+
program
9+
.arguments('<addonName>')
10+
.action(function(addonName) {
11+
if (addonName) {
12+
require('../tasks/library')({ addonName: dasherize(addonName) }).catch(ui.error);
1513
}
1614
});
17-
}
18-
19-
function run(options) {
20-
return require('../tasks/library')(options);
21-
}
2215

2316
program
24-
.arguments('<addonName>')
25-
.action(function(addonName) {
26-
program.addonName = addonName;
27-
})
2817
.parse(process.argv);
2918

30-
var options = {
31-
addonName: program.addonName ? dasherize(program.addonName) : null
32-
};
33-
34-
return validateOptions(options)
35-
.then(run)
36-
.catch(ui.error);
19+
if (process.argv.length < 3) {
20+
program.outputHelp();
21+
}

0 commit comments

Comments
 (0)