Add options from json ability to each command to each command

rokucommunity · Mar 5, 2024 · 48d07d9 · 48d07d9
1 parent 1d75b10
commit 48d07d9
Show file tree

Hide file tree

Showing 18 changed files with 111 additions and 753 deletions.
diff --git a/src/commands/ConvertToSquashfsCommand.ts b/src/commands/ConvertToSquashfsCommand.ts
@@ -1,10 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class ConvertToSquashfsCommand {
     async run(args) {
-        await rokuDeploy.convertToSquashfs({
-            host: args.host,
-            password: args.password
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.convertToSquashfs(options);
     }
 }
diff --git a/src/commands/CreateSignedPackageCommand.ts b/src/commands/CreateSignedPackageCommand.ts
@@ -1,12 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class CreateSignedPackageCommand {
     async run(args) {
-        await rokuDeploy.createSignedPackage({
-            host: args.host,
-            password: args.password,
-            signingPassword: args.signingPassword,
-            stagingDir: args.stagingDir
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.createSignedPackage(options);
     }
 }
diff --git a/src/commands/DeleteDevChannelCommand.ts b/src/commands/DeleteDevChannelCommand.ts
@@ -1,10 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class DeleteDevChannelCommand {
     async run(args) {
-        await rokuDeploy.deleteDevChannel({
-            host: args.host,
-            password: args.password
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.deleteDevChannel(options);
     }
 }
diff --git a/src/commands/ExecCommand.ts b/src/commands/ExecCommand.ts
@@ -21,11 +21,6 @@ export class ExecCommand {
             ...this.options
         };
 
-        // Possibilities:
-        // 'stage|zip'
-        // 'stage|zip|delete|close|sideload'
-        // 'close|rekey|stage|zip|delete|close|sideload|squash|sign'
-
         if (this.actions.includes('stage')) {
             await rokuDeploy.stage(this.options);
         }

diff --git a/src/commands/GetDevIdCommand.ts b/src/commands/GetDevIdCommand.ts
@@ -1,9 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class GetDevIdCommand {
     async run(args) {
-        await rokuDeploy.getDevId({
-            host: args.host
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.getDevId(options);
     }
 }
diff --git a/src/commands/GetDeviceInfoCommand.ts b/src/commands/GetDeviceInfoCommand.ts
@@ -3,9 +3,11 @@ import { util } from '../util';
 
 export class GetDeviceInfoCommand {
     async run(args) {
-        const outputPath = await rokuDeploy.getDeviceInfo({
-            host: args.host
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        const outputPath = await rokuDeploy.getDeviceInfo(options);
         console.log(util.objectToTableString(outputPath));
     }
 }
diff --git a/src/commands/GetOutputPkgFilePathCommand.ts b/src/commands/GetOutputPkgFilePathCommand.ts
@@ -1,12 +1,13 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class GetOutputPkgFilePathCommand {
     run(args) {
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
         // eslint-disable-next-line @typescript-eslint/dot-notation
-        const outputPath = rokuDeploy['getOutputPkgPath']({
-            outFile: args.outFile,
-            outDir: args.outDir
-        });
+        const outputPath = rokuDeploy['getOutputPkgPath'](options); //TODO fix this?
         console.log(outputPath);
     }
 }
diff --git a/src/commands/GetOutputZipFilePathCommand.ts b/src/commands/GetOutputZipFilePathCommand.ts
@@ -1,12 +1,13 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class GetOutputZipFilePathCommand {
     run(args) {
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
         // eslint-disable-next-line @typescript-eslint/dot-notation
-        const outputPath = rokuDeploy['getOutputZipFilePath']({
-            outFile: args.outFile,
-            outDir: args.outDir
-        });
+        const outputPath = rokuDeploy['getOutputZipFilePath'](options);
         console.log(outputPath);
     }
 }
diff --git a/src/commands/KeyDownCommand.ts b/src/commands/KeyDownCommand.ts
@@ -1,7 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class KeyDownCommand {
     async run(args) {
-        await rokuDeploy.keyDown(args.text);
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.keyDown(options);
     }
 }
diff --git a/src/commands/KeyPressCommand.ts b/src/commands/KeyPressCommand.ts
@@ -1,7 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class KeyPressCommand {
     async run(args) {
-        await rokuDeploy.keyPress(args.text);
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.keyPress(options);
     }
 }
diff --git a/src/commands/KeyUpCommand.ts b/src/commands/KeyUpCommand.ts
@@ -1,7 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class KeyUpCommand {
     async run(args) {
-        await rokuDeploy.keyUp(args.text);
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.keyUp(options);
     }
 }
diff --git a/src/commands/PrepublishCommand.ts b/src/commands/PrepublishCommand.ts
@@ -1,10 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class PrepublishCommand {
     async run(args) {
-        await rokuDeploy.stage({
-            stagingDir: args.stagingDir,
-            rootDir: args.rootDir
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.stage(options);
     }
 }
diff --git a/src/commands/PublishCommand.ts b/src/commands/PublishCommand.ts
@@ -1,12 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class PublishCommand {
     async run(args) {
-        await rokuDeploy.sideload({
-            host: args.host,
-            password: args.password,
-            outDir: args.outDir,
-            outFile: args.outFile
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.sideload(options);
     }
 }
diff --git a/src/commands/RekeyDeviceCommand.ts b/src/commands/RekeyDeviceCommand.ts
@@ -1,14 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class RekeyDeviceCommand {
     async run(args) {
-        await rokuDeploy.rekeyDevice({
-            host: args.host,
-            password: args.password,
-            rekeySignedPackage: args.rekeySignedPackage,
-            signingPassword: args.signingPassword,
-            rootDir: args.rootDir,
-            devId: args.devId
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.rekeyDevice(options);
     }
 }
diff --git a/src/commands/SendTextCommand.ts b/src/commands/SendTextCommand.ts
@@ -1,8 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class SendTextCommand {
-    // this.options = getDefaultArgsFromJson(this.configPath ?? `${cwd}/rokudeploy.json`);TODO
     async run(args) {
-        await rokuDeploy.sendText(args.text);
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.sendText(options);
     }
 }
diff --git a/src/commands/TakeScreenshotCommand.ts b/src/commands/TakeScreenshotCommand.ts
@@ -1,10 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class TakeScreenshotCommand {
     async run(args) {
-        await rokuDeploy.captureScreenshot({
-            host: args.host,
-            password: args.password
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.captureScreenshot(options);
     }
 }
diff --git a/src/commands/ZipCommand.ts b/src/commands/ZipCommand.ts
@@ -1,10 +1,11 @@
-import { rokuDeploy } from '../index';
+import { rokuDeploy, util } from '../index';
 
 export class ZipCommand {
     async run(args) {
-        await rokuDeploy.zip({
-            stagingDir: args.stagingDir,
-            outDir: args.outDir
-        });
+        let options = {
+            ...util.getOptionsFromJson(args),
+            ...args
+        };
+        await rokuDeploy.zip(options);
     }
 }