@rockcarver/frodo-cli 0.10.4 → 0.11.1-0

package/src/cli/script/script-export.js

@@ -1,13 +1,11 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Script, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
-  exportScriptByName,
-  exportScriptsToFile,
-  exportScriptsToFiles,
-} from '../../ops/ScriptOps.js';
+
+const { getTokens } = Authenticate;
+const { exportScriptByName } = Script;
+const { exportScriptsToFile } = Script;
+const { exportScriptsToFiles } = Script;
 
 const program = new Command('frodo script export');
 
@@ -37,13 +35,13 @@ program
   .addOption(
     new Option(
       '-a, --all',
-      'Export all cmds to a single file. Ignored with -i.'
+      'Export all scripts to a single file. Ignored with -i.'
     )
   )
   .addOption(
     new Option(
       '-A, --all-separate',
-      'Export all cmds to separate files (*.cmd.json) in the current directory. Ignored with -i or -a.'
+      'Export all scripts to separate files (*.script.json) in the current directory. Ignored with -i or -a.'
     )
   )
   // deprecated option
@@ -56,16 +54,16 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // export by name
         if (options.scriptName || options.script) {
-          printMessage('Exporting script...');
+          console.log('Exporting script...');
           exportScriptByName(
             options.scriptName || options.script,
             options.file
@@ -73,17 +71,17 @@ program
         }
         // -a / --all
         else if (options.all) {
-          printMessage('Exporting all scripts to a single file...');
+          console.log('Exporting all scripts to a single file...');
           exportScriptsToFile(options.file);
         }
         // -A / --all-separate
         else if (options.allSeparate) {
-          printMessage('Exporting all scripts to separate files...');
+          console.log('Exporting all scripts to separate files...');
           exportScriptsToFiles();
         }
         // unrecognized combination of options or no options
         else {
-          printMessage(
+          console.log(
             'Unrecognized combination of options or no options...',
             'error'
           );

package/src/cli/script/script-import.js

@@ -1,9 +1,10 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Script, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { importScriptsFromFile } from '../../ops/ScriptOps.js';
+
+const { getTokens } = Authenticate;
+
+const { importScriptsFromFile } = Script;
 
 const program = new Command('frodo script import');
 
@@ -40,15 +41,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Importing script(s) into realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Importing script(s) into realm "${state.default.session.getRealm()}"...`
         );
         importScriptsFromFile(
           options.scriptName || options.script,

package/src/cli/script/script-list.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Script, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { listScripts } from '../../ops/ScriptOps.js';
+
+const { getTokens } = Authenticate;
+const { listScripts } = Script;
 
 const program = new Command('frodo script list');
 
@@ -23,15 +23,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Listing scripts in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing scripts in realm "${state.default.session.getRealm()}"...`
         );
         await listScripts(options.long);
       }

package/src/cli/theme/theme-delete.js

@@ -1,13 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Theme, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
-  deleteThemeByNameCmd,
-  deleteThemeCmd,
-  deleteThemesCmd,
-} from '../../ops/ThemeOps.js';
+
+const { getTokens } = Authenticate;
+const { deleteThemeByNameCmd, deleteThemeCmd, deleteThemesCmd } = Theme;
 
 const program = new Command('frodo theme delete');
 
@@ -42,41 +38,41 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // delete by name
         if (options.themeName) {
-          printMessage(
+          console.log(
             `Deleting theme with name "${
               options.themeName
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           deleteThemeByNameCmd(options.themeName, options.file);
         }
         // delete by id
         else if (options.themeId) {
-          printMessage(
+          console.log(
             `Deleting theme with id "${
               options.themeId
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           deleteThemeCmd(options.themeId, options.file);
         }
         // --all -a
         else if (options.all) {
-          printMessage(
-            `Deleting all themes from realm "${storage.session.getRealm()}"...`
+          console.log(
+            `Deleting all themes from realm "${state.default.session.getRealm()}"...`
           );
           deleteThemesCmd(options.file);
         }
         // unrecognized combination of options or no options
         else {
-          printMessage('Unrecognized combination of options or no options...');
+          console.log('Unrecognized combination of options or no options...');
           program.help();
         }
       }

package/src/cli/theme/theme-export.js

@@ -1,14 +1,15 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Theme, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
+
+const { getTokens } = Authenticate;
+
+const {
   exportThemeById,
   exportThemeByName,
   exportThemesToFile,
   exportThemesToFiles,
-} from '../../ops/ThemeOps.js';
+} = Theme;
 
 const program = new Command('frodo theme export');
 
@@ -55,44 +56,44 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // export by name
         if (options.themeName) {
-          printMessage(
+          console.log(
             `Exporting theme "${
               options.themeName
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           exportThemeByName(options.themeName, options.file);
         }
         // export by id
         else if (options.themeId) {
-          printMessage(
+          console.log(
             `Exporting theme "${
               options.themeId
-            }" from realm "${storage.session.getRealm()}"...`
+            }" from realm "${state.default.session.getRealm()}"...`
           );
           exportThemeById(options.themeId, options.file);
         }
         // --all -a
         else if (options.all) {
-          printMessage('Exporting all themes to a single file...');
+          console.log('Exporting all themes to a single file...');
           exportThemesToFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate) {
-          printMessage('Exporting all themes to separate files...');
+          console.log('Exporting all themes to separate files...');
           exportThemesToFiles();
         }
         // unrecognized combination of options or no options
         else {
-          printMessage(
+          console.log(
             'Unrecognized combination of options or no options...',
             'error'
           );

package/src/cli/theme/theme-import.js

@@ -1,15 +1,16 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Theme, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import {
+
+const { getTokens } = Authenticate;
+
+const {
   importFirstThemeFromFile,
   importThemeById,
   importThemeByName,
   importThemesFromFile,
   importThemesFromFiles,
-} from '../../ops/ThemeOps.js';
+} = Theme;
 
 const program = new Command('frodo theme import');
 
@@ -56,57 +57,57 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
         // import by name
         if (options.file && options.themeName) {
-          printMessage(
+          console.log(
             `Importing theme with name "${
               options.themeName
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importThemeByName(options.themeName, options.file);
         }
         // import by id
         else if (options.file && options.themeId) {
-          printMessage(
+          console.log(
             `Importing theme with id "${
               options.themeId
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importThemeById(options.themeId, options.file);
         }
         // --all -a
         else if (options.all && options.file) {
-          printMessage(
+          console.log(
             `Importing all themes from a single file (${options.file})...`
           );
           importThemesFromFile(options.file);
         }
         // --all-separate -A
         else if (options.allSeparate && !options.file) {
-          printMessage(
+          console.log(
             'Importing all themes from separate files in current directory...'
           );
           importThemesFromFiles();
         }
         // import single theme from file
         else if (options.file) {
-          printMessage(
+          console.log(
             `Importing first theme from file "${
               options.file
-            }" into realm "${storage.session.getRealm()}"...`
+            }" into realm "${state.default.session.getRealm()}"...`
           );
           importFirstThemeFromFile(options.file);
         }
         // unrecognized combination of options or no options
         else {
-          printMessage('Unrecognized combination of options or no options...');
+          console.log('Unrecognized combination of options or no options...');
           program.help();
         }
       }

package/src/cli/theme/theme-list.js

@@ -1,9 +1,9 @@
 import { Command, Option } from 'commander';
+import { Authenticate, Theme, state } from '@rockcarver/frodo-lib';
 import * as common from '../cmd_common.js';
-import { getTokens } from '../../ops/AuthenticateOps.js';
-import storage from '../../storage/SessionStorage.js';
-import { printMessage } from '../../ops/utils/Console.js';
-import { listThemes } from '../../ops/ThemeOps.js';
+
+const { getTokens } = Authenticate;
+const { listThemes } = Theme;
 
 const program = new Command('frodo theme list');
 
@@ -23,15 +23,15 @@ program
   .action(
     // implement command logic inside action handler
     async (host, realm, user, password, options) => {
-      storage.session.setTenant(host);
-      storage.session.setRealm(realm);
-      storage.session.setUsername(user);
-      storage.session.setPassword(password);
-      storage.session.setDeploymentType(options.type);
-      storage.session.setAllowInsecureConnection(options.insecure);
+      state.default.session.setTenant(host);
+      state.default.session.setRealm(realm);
+      state.default.session.setUsername(user);
+      state.default.session.setPassword(password);
+      state.default.session.setDeploymentType(options.type);
+      state.default.session.setAllowInsecureConnection(options.insecure);
       if (await getTokens()) {
-        printMessage(
-          `Listing themes in realm "${storage.session.getRealm()}"...`
+        console.log(
+          `Listing themes in realm "${state.default.session.getRealm()}"...`
         );
         listThemes(options.long);
       }

package/test/client_cli/en/conn-add.test.js

@@ -0,0 +1,37 @@
+import cp from 'child_process';
+import { promisify } from 'util';
+import { node14Compatibility } from '../utils/utils.js';
+
+node14Compatibility();
+
+const exec = promisify(cp.exec);
+const CMD = 'frodo connections add --help';
+const { stdout } = await exec(CMD);
+
+test("CLI help interface for 'add' Usage should be expected english", async () => {
+  // Arrange
+  const expected = `
+  Usage: frodo conn add [options] <host> [user] [password] [key] [secret]
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .find((line) => line.trim().startsWith('Usage:'))
+    .trim();
+  // Assert
+  expect(testLine).toBe(expected);
+});
+
+test("CLI help interface 'connections add' description at line 2 should be expected english", async () => {
+  // Arrange
+  const expected = `
+  Add a new connection profiles. You have to specify a URL, username and password at a minimum.
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .map((line) => line.trim())
+    .at(2);
+  // Assert
+  expect(testLine).toBe(expected);
+});

package/test/client_cli/en/conn-delete.test.js

@@ -0,0 +1,37 @@
+import cp from 'child_process';
+import { promisify } from 'util';
+import { node14Compatibility } from '../utils/utils.js';
+
+node14Compatibility();
+
+const exec = promisify(cp.exec);
+const CMD = 'frodo connections delete --help';
+const { stdout } = await exec(CMD);
+
+test("CLI help interface for 'delete' Usage should be expected english", async () => {
+  // Arrange
+  const expected = `
+        Usage: frodo conn delete [options] <host>
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .find((line) => line.trim().startsWith('Usage:'))
+    .trim();
+  // Assert
+  expect(testLine).toBe(expected);
+});
+
+test("CLI help interface 'conn delete' description at line 2 should be expected english", async () => {
+  // Arrange
+  const expected = `
+  Delete connection profiles.
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .map((line) => line.trim())
+    .at(2);
+  // Assert
+  expect(testLine).toBe(expected);
+});

package/test/client_cli/en/conn-list.test.js

@@ -0,0 +1,37 @@
+import cp from 'child_process';
+import { promisify } from 'util';
+import { node14Compatibility } from '../utils/utils.js';
+
+node14Compatibility();
+
+const exec = promisify(cp.exec);
+const CMD = 'frodo connections list --help';
+const { stdout } = await exec(CMD);
+
+test("CLI help interface for 'list' Usage should be expected english", async () => {
+  // Arrange
+  const expected = `
+  Usage: frodo conn list [options]
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .find((line) => line.trim().startsWith('Usage:'))
+    .trim();
+  // Assert
+  expect(testLine).toBe(expected);
+});
+
+test("CLI help interface 'connections List' description at line 2 should be expected english", async () => {
+  // Arrange
+  const expected = `
+  List connection profiles.
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .map((line) => line.trim())
+    .at(2);
+  // Assert
+  expect(testLine).toBe(expected);
+});

package/test/client_cli/en/conn.test.js

@@ -0,0 +1,65 @@
+import cp from 'child_process';
+import { promisify } from 'util';
+import { node14Compatibility } from '../utils/utils.js';
+
+node14Compatibility();
+
+const exec = promisify(cp.exec);
+const CMD = 'frodo connections --help';
+const { stdout } = await exec(CMD);
+
+test("CLI help interface for 'connections' Usage should be expected english", async () => {
+  // Arrange
+  const expected = `
+  Usage: frodo conn|connection [options] [command]
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .find((line) => line.trim().startsWith('Usage:'))
+    .trim();
+  // Assert
+  expect(testLine).toBe(expected);
+});
+
+test('CLI help interface connections description at line 2 should be expected english', async () => {
+  // Arrange
+  const expected = `
+        Manage connection profiles.
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .map((line) => line.trim())
+    .at(2);
+  // Assert
+  expect(testLine).toBe(expected);
+});
+
+test("CLI help interface 'list' description should be expected english", async () => {
+  // Arrange
+  const expected = `
+  list            List connection profiles.
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .find((line) => line.trim().startsWith('list'))
+    .trim();
+  // Assert
+  expect(testLine).toBe(expected);
+});
+
+test("CLI help interface 'delete' description should be expected english", async () => {
+  // Arrange
+  const expected = `
+  delete          Delete connection profiles.
+    `.trim();
+  // Act
+  const testLine = stdout
+    .split(/\n/)
+    .find((line) => line.trim().startsWith('delete'))
+    .trim();
+  // Assert
+  expect(testLine).toBe(expected);
+});