Merge pull request #2 from mediumroast/alpha-cleanup

Alpha cleanup
mediumroast · Sep 16, 2022 · bc9e131 · bc9e131
2 parents a15cdab + 1fb8bbb
commit bc9e131
Show file tree

Hide file tree

Showing 18 changed files with 803 additions and 1,390 deletions.
diff --git a/README.md b/README.md
diff --git a/cli/company.js b/cli/company.js
@@ -6,24 +6,29 @@
  * @file company.js
  * @copyright 2022 Mediumroast, Inc. All rights reserved.
  * @license Apache-2.0
+ * @version 2.0.0
  */
 
 // Import required modules
 import { Auth, Companies, Interactions } from '../src/api/mrServer.js'
-import { CLI } from '../src/helpers.js'
+import { Utilities } from '../src/helpers.js'
+import { CLIUtilities } from '../src/cli.js'
 import { CompanyStandalone } from '../src/report/companies.js'
 
 // Globals
 const objectType = 'Companies'
 
 // Construct the CLI object
-const myCLI = new CLI (
+const myCLI = new CLIUtilities (
    '2.0',
    'company',
    'Command line interface for mediumroast.io Company objects.',
    objectType
 )
 
+// Construct the Utilities object
+const utils = new Utilities(objectType)
+
 // Create the environmental settings
 const myArgs = myCLI.parseCLIArgs()
 const myConfig = myCLI.getConfig(myArgs.conf_file)
@@ -74,7 +79,7 @@ if (myArgs.report) {
 
    if(myArgs.package) {
       // Create the working directory
-      const [dir_success, dir_msg, dir_res] = myCLI.safeMakedir(baseDir + '/interactions')
+      const [dir_success, dir_msg, dir_res] = utils.safeMakedir(baseDir + '/interactions')
 
       // If the directory creations was successful download the interaction
       if(dir_success) {
@@ -88,7 +93,7 @@ if (myArgs.report) {
              access points, but the tradeoff would be that caffeine would need to run on a
              system with file system access to these objects.
          */
-         await myCLI.s3DownloadObjs(interactions, myEnv, baseDir + '/interactions')
+         await utils.s3DownloadObjs(interactions, myEnv, baseDir + '/interactions')
       // Else error out and exit
       } else {
          console.error('ERROR (%d): ' + dir_msg, -1)
@@ -97,7 +102,7 @@ if (myArgs.report) {
 
    }
    // Create the document
-   const [report_success, report_stat, report_result] = await docController.makeDocx(fileName, myArgs.package)
+   const [report_success, report_stat, report_result] = await docController.makeDOCX(fileName, myArgs.package)
 
    // Create the package and cleanup as needed
    if (myArgs.package) {

diff --git a/cli/doc_company.js b/cli/doc_company.js
diff --git a/cli/interaction.js b/cli/interaction.js
@@ -6,23 +6,26 @@
  * @file interactions.js
  * @copyright 2022 Mediumroast, Inc. All rights reserved.
  * @license Apache-2.0
+ * @version 2.0.0
  */
 
 // Import required modules
 import { Auth, Interactions, Companies } from '../src/api/mrServer.js'
-import { CLI } from '../src/helpers.js'
+import { CLIUtilities } from '../src/cli.js'
+import { Utilities } from '../src/helpers.js'
 import { InteractionStandalone } from '../src/report/interactions.js'
 
 // Globals
 const objectType = 'Interactions'
 
 // Construct the CLI object
-const myCLI = new CLI(
+const myCLI = new CLIUtilities(
    '2.0',
    'interaction',
    'Command line interface for mediumroast.io Interaction objects.',
    objectType
 )
+const utils = new Utilities(objectType)
 
 // Create the environmental settings
 const myArgs = myCLI.parseCLIArgs()
@@ -68,7 +71,7 @@ if (myArgs.report) {
 
    if(myArgs.package) {
       // Create the working directory
-      const [dir_success, dir_msg, dir_res] = myCLI.safeMakedir(baseDir + '/interactions')
+      const [dir_success, dir_msg, dir_res] = utils.safeMakedir(baseDir + '/interactions')
 
       // If the directory creations was successful download the interaction
       if(dir_success) {
@@ -82,7 +85,7 @@ if (myArgs.report) {
              access points, but the tradeoff would be that caffeine would need to run on a
              system with file system access to these objects.
          */
-         await myCLI.s3DownloadObjs(int_results, myEnv, baseDir + '/interactions')
+         await utils.s3DownloadObjs(int_results, myEnv, baseDir + '/interactions')
       // Else error out and exit
       } else {
          console.error('ERROR (%d): ' + dir_msg, -1)
@@ -91,17 +94,17 @@ if (myArgs.report) {
 
    }
    // Create the document
-   const [report_success, report_stat, report_result] = await docController.makeDocx(fileName, myArgs.package)
+   const [report_success, report_stat, report_result] = await docController.makeDOCX(fileName, myArgs.package)
 
    // Create the package and cleanup as needed
    if (myArgs.package) {
-      const [package_success, package_stat, package_result] = await myCLI.createZIPArchive(
+      const [package_success, package_stat, package_result] = await utils.createZIPArchive(
          myEnv.outputDir + '/' + baseName + '.zip',
          baseDir
       )
       if (package_success) {
          console.log(package_stat)
-         myCLI.rmDir(baseDir)
+         utils.rmDir(baseDir)
          process.exit(0)
       } else {
          console.error(package_stat, -1)