@breautek/storm 6.1.0-beta.0 → 6.1.0-beta.2

package/src/Application.ts

@@ -420,7 +420,7 @@ export abstract class Application
                 filePath = Path.resolve(this.$configDir, 'bt-local-config.json');
             }
 
-            this.$localConfigPath = filePath;
+            this.$localConfigPath = Path.resolve(filePath);
         }
 
         return this.$localConfigPath;
@@ -434,7 +434,7 @@ export abstract class Application
                 filePath = Path.resolve(this.$configDir, 'bt-config.json');
             }
 
-            this.$configPath = filePath;
+            this.$configPath = Path.resolve(filePath);
         }
 
         return this.$configPath;
@@ -501,12 +501,12 @@ export abstract class Application
         let program: Command = this.$program;
         let o: IStormCLIArgs = {};
 
-        let opts: any = program.opts();
-
         if (!program) {
             return o;
         }
 
+        let opts: any = program.opts();
+
         if (opts.bind !== undefined) {
             o.bind = opts.bind;
         }
@@ -519,11 +519,11 @@ export abstract class Application
             o.authentication_header = opts.authentication_header;
         }
 
-        if (opts.configFile !== undefined) {
+        if (opts.config !== undefined) {
             o.configFile = opts.config;
         }
 
-        if (opts.localConfigFile !== undefined) {
+        if (opts.localConfig !== undefined) {
             o.localConfigFile = opts.localConfig;
         }
 

package/src/ConfigLoader.ts

@@ -271,7 +271,23 @@ export class ConfigLoader<TConfig extends IConfig = IConfig> {
         }
     }
 
-    private $getCmdLineArgs(): IStormCLIArgs {
-        return this.$app.getCmdLineArgs();
+    private $getCmdLineArgs(): Partial<IConfig> {
+        let cliArgs: IStormCLIArgs = this.$app.getCmdLineArgs();
+
+        let out: Partial<IConfig> = {}
+
+        if (cliArgs.bind !== undefined) {
+            out.bind = cliArgs.bind;
+        }
+
+        if (cliArgs.port !== undefined) {
+            out.port = cliArgs.port;
+        }
+
+        if (cliArgs.authentication_header !== undefined) {
+            out.authentication_header = cliArgs.authentication_header;
+        }
+
+        return out;
     }
 }