Remove check_token parameter. Rework dump mechanic to write the dump every time it's updated.

Author: kriskbx

src/gtt-report.js

@@ -57,7 +57,6 @@ program
     .option('--user_columns', 'include user columns in the report')
     .option('--quiet', 'only output report')
     .option('--verbose', 'show verbose output')
-    .option('--check_token', 'check the access token')
     .option('--show_without_times', 'show issues/merge requests without time records')
     .option('-p --proxy <proxy>', 'use a proxy server with the given url')
     .option('--from_dump <file>', 'instead of querying gitlab, use data from the given dump file')
@@ -78,6 +77,13 @@ if (program.from_dump && fs.existsSync(program.from_dump)) {
     if (data._dump) config.dump = data._dump;
 }
 
+// if writing a dump, set config accordingly
+if (program.output === "dump") {
+    config.on("dump-updated", () => {
+        new Output['dump'](config);
+    });
+}
+
 // overwrite config with args and opts
 config
     .set('project', cli.project())
@@ -110,22 +116,21 @@ config
     .set('type', program.type)
     .set('subgroups', program.subgroups)
     .set('_verbose', program.verbose)
-    .set('_checkToken', program.check_token)
     .set('_createDump', program.output === 'dump');
 
 // date shortcuts
-if(program.today)
+if (program.today)
     config
         .set('from', moment().startOf('day'))
         .set('to', moment().endOf('day'));
-if(program.this_week)
+if (program.this_week)
     config
         .set('from', moment().startOf('week'))
         .set('to', moment().endOf('week'));
-if(program.this_month)
+if (program.this_month)
     config
         .set('from', moment().startOf('month'))
-        .set('to', moment().endOf('month'));          
+        .set('to', moment().endOf('month'));
 
 Cli.quiet = config.get('quiet');
 Cli.verbose = config.get('_verbose');
@@ -193,7 +198,7 @@ new Promise(resolve => {
                         reports.push(report);
                         report.getProject()
                             .then(() => done())
-                            .catch(e => Cli.x(`Project not found or no access rights "${projectLabels}". Run again with --check_token to see if your access token is invalid!`, e));
+                            .catch(e => Cli.x(`Project not found or no access rights "${projectLabels}".`, e));
                         break;
 
                     case 'group':
@@ -222,7 +227,6 @@ new Promise(resolve => {
     // get members and user columns
     .then(() => new Promise(resolve => {
         if (!config.get('userColumns')) return resolve();
-
         reports
             .forEach((report, done) => {
                 report.project.members()

src/gtt-sync.js

@@ -9,14 +9,12 @@ const Owner = require('./models/owner');
 program
     .option('-p --proxy <proxy>', 'use a proxy server with the given url')
     .option('--verbose', 'show verbose output')
-    .option('--check_token', 'check the access token')
     .parse(process.argv);
 
 Cli.verbose = program.verbose;
 
 let config = new Config(process.cwd())
-        .set('proxy', program.proxy)
-        .set('_checkToken', program.check_token),
+        .set('proxy', program.proxy);
     tasks = new Tasks(config),
     owner = new Owner(config);
 

src/include/config.js

@@ -2,6 +2,7 @@ const moment = require('moment');
 const _ = require('underscore');
 
 const Time = require('./../models/time');
+const EventEmitter = require('events');
 
 const dates = ['from', 'to'];
 const objectsWithDefaults = ['timeFormat', 'columns'];
@@ -47,11 +48,13 @@ const defaults = {
 /**
  * basic config
  */
-class config {
+class config extends EventEmitter {
     /**
      * construct
      */
     constructor() {
+        super();
+
         this.data = _.extend({}, defaults);
     }
 

src/include/file-config.js

@@ -20,6 +20,7 @@ class fileConfig extends config {
         this.assertGlobalConfig();
         this.workDir = workDir;
         this.data = Object.assign(this.data, this.localExists() ? this.parseLocal() : this.parseGlobal());
+        this._dump = {};
         this.cache = {
             get: this._cacheGet,
             set: this._cacheSet,
@@ -132,6 +133,15 @@ class fileConfig extends config {
     get local() {
         return Fs.join(this.workDir, this.localConfigFile);
     }
+
+    setDump(key, value) {
+        this._dump[key] = value;
+        this.emit('dump-updated');
+    }
+
+    getDump(key) {
+        return this._dump[key];
+    }
 }
 
 module.exports = fileConfig;

src/models/base.js

@@ -147,12 +147,10 @@ class base {
      * @param key
      */
     setDump(response, key) {
-        if (!this.config._dump) this.config._dump = {};
-
-        this.config._dump[key] = {
+        this.config.setDump(key, {
             headers: response.headers,
             body: response.body
-        };
+        });
     }
 
     /**
@@ -161,7 +159,7 @@ class base {
      * @returns {Promise}
      */
     getDump(key) {
-        return new Promise(r => r(this.config.dump[key]));
+        return new Promise(r => r(this.config.getDump(key)));
     }
 
     /**

src/output/dump.js

@@ -1,29 +1,29 @@
-const Base = require('./base');
-const Report = require('../models/report');
+const fs = require('fs');
+const Config = require('../include/config');
 
-class dump extends Base {
+class dump {
     constructor(config, report) {
-        super(config, report);
+        let configCopy = new Config();
+        configCopy.data = Object.assign({}, config.data);
+        configCopy._dump = config._dump;
 
-        config.set('url', null, true);
-        config.set('token', null, true);
-        config.set('_createDump', false);
-        config.workDir = null;
-        config.cache = null;
+        configCopy.set('url', null, true);
+        configCopy.set('token', null, true);
+        configCopy.set('_createDump', false);
+        configCopy.workDir = null;
+        configCopy.cache = null;
 
-        this.write(JSON.stringify(config));
+        fs.writeFileSync(configCopy.get('file'), JSON.stringify(configCopy));
     }
 
-    makeStats() {
+    make() {
     }
 
-    makeIssues() {
+    toStdOut() {
     }
 
-    makeMergeRequests() {
-    }
-
-    makeRecords() {
+    toFile(file, resolve) {
+        if (resolve) resolve();
     }
 }