Skip to content

Commit fdb109e

Browse files
authored
feat: cli interface support list (#79)
1 parent 72b98bc commit fdb109e

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $ npm i macaca-cli -g
3636

3737
## Common Usage
3838

39-
Live sample & docs: [link](//macacajs.github.io/quick-start)
39+
Live sample & docs: [link](//macacajs.github.io/guide/quick-start.html)
4040

4141
## License
4242

bin/macaca-cli-run

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
'use strict';
44

5-
var fs = require('fs');
6-
var path = require('path');
7-
var EOL = require('os').EOL;
8-
var program = require('commander');
9-
var Convert = require('ansi-to-html');
5+
const fs = require('fs');
6+
const path = require('path');
7+
const EOL = require('os').EOL;
8+
const program = require('commander');
9+
const Convert = require('ansi-to-html');
1010

11-
var _ = require('../lib/common/helper');
12-
var createRunner = require('../lib').Runner;
13-
var logger = require('../lib/common/logger');
14-
var format = require('../lib/common/logFormatter');
11+
const _ = require('../lib/common/helper');
12+
const createRunner = require('../lib').Runner;
13+
const logger = require('../lib/common/logger');
14+
const format = require('../lib/common/logFormatter');
1515

16-
var options = {
16+
const options = {
1717
verbose: false,
1818
framework: 'mocha',
1919
port: 3456,
@@ -23,19 +23,19 @@ var options = {
2323
};
2424

2525
program
26-
.option('-f, --framework <s>', 'Set test framework (defaults: ' + options.framework + ')')
27-
.option('-p, --port <d>', 'Set port for server (defaults: ' + options.port + ')')
28-
.option('-d, --directory <s>', 'Set directory for task runner (defaults: ' + options.directory + ')')
29-
.option('-o, --output [s]', 'Set output html file')
30-
.option('-r, --reporter <s>', 'Set reporter (default: Spec)')
31-
.option('-c, --colors <s>', 'Force enabling of colors (defaults: ' + options.colors + ')')
32-
.option('-C, --no-colors', 'Force disabling of colors')
33-
.option('--require <name>', 'Require the given module')
34-
.option('--f_options <s>', 'The options used for test framework itself')
35-
.option('--coverage-ignore <s>', 'Ignore RegExp used for macaca-coverage')
36-
.option('--no-window', 'Let Electron runs in silence')
37-
.option('--parallel', 'Let Electron run in parallel process')
38-
.option('--verbose', 'Displays more debugging information')
26+
.option('-f, --framework <s>', 'Set test framework (defaults: ' + options.framework + ')')
27+
.option('-p, --port <d>', 'Set port for server (defaults: ' + options.port + ')')
28+
.option('-d, --directory <items>', 'Set directory for task runner (defaults: ' + options.directory + ')', value => value.split(','))
29+
.option('-o, --output [s]', 'Set output html file')
30+
.option('-r, --reporter <s>', 'Set reporter (default: Spec)')
31+
.option('-c, --colors <s>', 'Force enabling of colors (defaults: ' + options.colors + ')')
32+
.option('-C, --no-colors', 'Force disabling of colors')
33+
.option('--require <name>', 'Require the given module')
34+
.option('--f_options <s>', 'The options used for test framework itself')
35+
.option('--coverage-ignore <s>', 'Ignore RegExp used for macaca-coverage')
36+
.option('--no-window', 'Let Electron runs in silence')
37+
.option('--parallel', 'Let Electron run in parallel process')
38+
.option('--verbose', 'Displays more debugging information')
3939
.parse(process.argv);
4040

4141
_.merge(options, _.getConfig(program));

lib/run/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,13 @@ Runner.prototype.initFramework = function() {
8080
}
8181
}
8282

83-
let args = [
84-
options.directory || defaultOpt.directory
85-
];
83+
let args = [];
84+
85+
if (options.directory) {
86+
args = args.concat(options.directory);
87+
} else {
88+
args.push(defaultOpt.directory);
89+
}
8690

8791
if (!_.platform.isWindows) {
8892
args.unshift(frameworkBin);

package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "macaca-cli",
3-
"version": "2.1.12",
3+
"version": "2.2.0",
44
"description": "Macaca command-line interface",
55
"keywords": [
66
"automation",
@@ -23,7 +23,7 @@
2323
"ansi-to-html": "~0.3.0",
2424
"cli-table": "~0.3.1",
2525
"co": "~4.6.0",
26-
"commander": "^2.9.0",
26+
"commander": "^2.20.0",
2727
"macaca-coverage": "^1.0.0",
2828
"macaca-doctor": "~2.0.3",
2929
"macaca-logo": "^1.0.0",
@@ -55,10 +55,7 @@
5555
"pre-commit": "npm run lint"
5656
}
5757
},
58-
"engines": {
59-
"node": ">=8"
60-
},
6158
"homepage": "https://macacajs.github.io",
62-
"changelog": "https://macacajs.github.io/guide/support.html",
59+
"changelog": "https://macacajs.github.io/guide/roadmap.html",
6360
"license": "MIT"
6461
}

0 commit comments

Comments
 (0)