updated commander, open and markdown-pdf

Author: Andreas Müller

.gitignore

@@ -1,3 +1,4 @@
+/.vscode/
 /coverage
 /.idea/
 **/node_modules
@@ -6,3 +7,4 @@
 yarn-error.log
 **/._*
 out
+package-lock.json

package.json

@@ -39,17 +39,17 @@
     "cli-cursor": "^2.1.0",
     "cli-table": "^0.3.1",
     "colors": "^1.3.1",
-    "commander": "kriskbx/commander.js",
+    "commander": "^7.1.0",
     "csv-string": "^2.3.2",
     "find-in-files": "^0.4.0",
     "hash-sum": "^1.0.2",
     "hashids": "^1.1.1",
-    "markdown-pdf": "^9.0.0",
+    "markdown-pdf": "^10.0.0",
     "markdown-table": "^1.1.0",
     "moment": "^2.22.2",
     "moment-timezone": "^0.5.21",
     "node-spinner": "^0.0.4",
-    "open": "^0.0.5",
+    "open": "^7.0.4",
     "progress": "^2.0.0",
     "prompt": "^1.0.0",
     "read-yaml": "^1.1.0",

src/gtt-cancel.js

@@ -10,7 +10,7 @@ program
     .option('--verbose', 'show verbose output')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
+Cli.verbose = program.opts().verbose;
 
 let config = new Config(process.cwd());
 let tasks = new Tasks(config);

src/gtt-config.js

@@ -9,8 +9,8 @@ program
     .option('-l, --local', 'edit the local configuration file')
     .parse(process.argv);
 
-if (program.local) {
+if (program.opts().local) {
     config.assertLocalConfig();
 }
 
-Fs.open(program.local ? config.local : config.global);
+Fs.open(program.opts().local ? config.local : config.global);

src/gtt-create.js

@@ -12,11 +12,11 @@ program
     .option('--verbose', 'show verbose output')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
+Cli.verbose = program.opts().verbose;
 
 let config = new Config(process.cwd()),
     tasks = new Tasks(config),
-    type = program.type ? program.type : 'issue',
+    type = program.opts().type ? program.opts().type : 'issue',
     title = program.args.length === 1 ? program.args[0] : program.args[1],
     project = program.args.length === 2 ? program.args[0] : null;
 

src/gtt-log.js

@@ -14,11 +14,11 @@ program
     .option('--time_format <time_format>', 'time format')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
+Cli.verbose = program.opts().verbose;
 
-let config = new Config(__dirname).set('hoursPerDay', program.hours_per_day),
+let config = new Config(__dirname).set('hoursPerDay', program.opts().hours_per_day),
     tasks = new Tasks(config),
-    timeFormat = config.set('timeFormat', program.time_format).get('timeFormat', 'log');
+    timeFormat = config.set('timeFormat', program.opts().time_format).get('timeFormat', 'log');
 
 function toHumanReadable(input) {
     return Time.toHumanReadable(Math.ceil(input), config.get('hoursPerDay'), timeFormat);

src/gtt-report.js

@@ -71,8 +71,8 @@ let config = new Config(process.cwd());
 let cli = new Cli(program.args);
 
 // if using a dump, set the config accordingly
-if (program.from_dump && fs.existsSync(program.from_dump)) {
-    let data = JSON.parse(fs.readFileSync(program.from_dump));
+if (program.opts().from_dump && fs.existsSync(program.opts().from_dump)) {
+    let data = JSON.parse(fs.readFileSync(program.opts().from_dump));
 
     if (data.data) _.each(data.data, (v, i) => {
         config.set(i, v);
@@ -82,59 +82,59 @@ if (program.from_dump && fs.existsSync(program.from_dump)) {
 }
 
 // if writing a dump, set config accordingly
-if (program.output === "dump") {
+if (program.opts().output === "dump") {
     config.on("dump-updated", () => {
         new Output['dump'](config);
     });
 }
 
 // overwrite config with args and opts
 config
-    .set('url', program.url)
-    .set('token', program.token)
-    .set('insecure', program.insecure)
+    .set('url', program.opts().url)
+    .set('token', program.opts().token)
+    .set('insecure', program.opts().insecure)
     .set('project', cli.project())
     .set('iids', cli.iids())
-    .set('from', program.from)
-    .set('to', program.to)
-    .set('closed', program.closed)
-    .set('user', program.user)
-    .set('milestone', program.milestone)
-    .set('includeByLabels', program.include_by_labels)
-    .set('excludeByLabels', program.exclude_by_labels)
-    .set('includeLabels', program.include_labels)
-    .set('excludeLabels', program.exclude_labels)
-    .set('dateFormat', program.date_format)
-    .set('timeFormat', program.time_format)
-    .set('hoursPerDay', program.hours_per_day)
-    .set('output', program.output)
-    .set('file', program.file)
-    .set('query', program.query)
-    .set('report', program.report)
-    .set('recordColumns', program.record_columns)
-    .set('issueColumns', program.issue_columns)
-    .set('mergeRequestColumns', program.merge_request_columns)
-    .set('noHeadlines', program.no_headlines)
-    .set('noWarnings', program.no_warnings)
-    .set('quiet', program.quiet)
-    .set('showWithoutTimes', program.show_without_times)
-    .set('userColumns', program.user_columns)
-    .set('proxy', program.proxy)
-    .set('type', program.type)
-    .set('subgroups', program.subgroups)
-    .set('_verbose', program.verbose)
-    .set('_createDump', program.output === 'dump');
+    .set('from', program.opts().from)
+    .set('to', program.opts().to)
+    .set('closed', program.opts().closed)
+    .set('user', program.opts().user)
+    .set('milestone', program.opts().milestone)
+    .set('includeByLabels', program.opts().include_by_labels)
+    .set('excludeByLabels', program.opts().exclude_by_labels)
+    .set('includeLabels', program.opts().include_labels)
+    .set('excludeLabels', program.opts().exclude_labels)
+    .set('dateFormat', program.opts().date_format)
+    .set('timeFormat', program.opts().time_format)
+    .set('hoursPerDay', program.opts().hours_per_day)
+    .set('output', program.opts().output)
+    .set('file', program.opts().file)
+    .set('query', program.opts().query)
+    .set('report', program.opts().report)
+    .set('recordColumns', program.opts().record_columns)
+    .set('issueColumns', program.opts().issue_columns)
+    .set('mergeRequestColumns', program.opts().merge_request_columns)
+    .set('noHeadlines', program.opts().no_headlines)
+    .set('noWarnings', program.opts().no_warnings)
+    .set('quiet', program.opts().quiet)
+    .set('showWithoutTimes', program.opts().show_without_times)
+    .set('userColumns', program.opts().user_columns)
+    .set('proxy', program.opts().proxy)
+    .set('type', program.opts().type)
+    .set('subgroups', program.opts().subgroups)
+    .set('_verbose', program.opts().verbose)
+    .set('_createDump', program.opts().output === 'dump');
 
 // date shortcuts
-if (program.today)
+if (program.opts().today)
     config
         .set('from', moment().startOf('day'))
         .set('to', moment().endOf('day'));
-if (program.this_week)
+if (program.opts().this_week)
     config
         .set('from', moment().startOf('week'))
         .set('to', moment().endOf('week'));
-if (program.this_month)
+if (program.opts().this_month)
     config
         .set('from', moment().startOf('month'))
         .set('to', moment().endOf('month'));

src/gtt-resume.js

@@ -11,7 +11,7 @@ program
     .option('--verbose', 'show verbose output')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
+Cli.verbose = program.opts().verbose;
 
 let config = new Config(process.cwd()).set('project', program.args[0]),
     tasks = new Tasks(config);

src/gtt-start.js

@@ -14,17 +14,17 @@ program
     .option('--verbose', 'show verbose output')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
+Cli.verbose = program.opts().verbose;
 
 let config = new Config(process.cwd()),
     tasks = new Tasks(config),
-    type = program.type ? program.type : 'issue',
+    type = program.opts().type ? program.opts().type : 'issue',
     id = program.args.length === 1 ? parseInt(program.args[0]) : parseInt(program.args[1]),
     project = program.args.length === 2 ? program.args[0] : null;
 
-if (program.I) {
+if (program.opts().i) {
     type = 'issue';
-} else if (program.M) {
+} else if (program.opts().m) {
     type = 'merge_request';
 }
 

src/gtt-status.js

@@ -10,7 +10,7 @@ program
     .option('--verbose', 'show verbose output')
     .parse(process.argv);
 
-Cli.verbose = program.verbose;
+Cli.verbose = program.opts().verbose;
 
 let config = new Config(__dirname),
     tasks = new Tasks(config);