saturn-core-cli 0.0.7 → 0.0.9

package/commands/publish.js

@@ -16,29 +16,32 @@ var exec = require("child-process-promise").exec;
 var spawn = require("child-process-promise").spawn;
 const semverInc = require("semver/functions/inc");
 
-try {
-  exemptions = require(saturnignore);
-} catch (e) {
-  exemptions = [];
-}
-
-async function action(options) {
+async function action(release = "patch", options) {
   try {
-    let version_raw = options["version"];
+    try {
+      exemptions = (await import(saturnignore)).default;
+    } catch (e) {
+      console.log(e.message, e);
+      exemptions = [];
+    }
     let message = options["message"];
     const packageObj = await fs.readJson(`package.json`);
     //if (version == undefined) {
     //let version = packageObj.version;
     //}
-    let version = semverInc(packageObj.version, version_raw);
+    console.log("Exemptions", exemptions);
+    let version = semverInc(packageObj.version, release);
     packageObj.version = version;
     await fs.writeJson(`package.json`, packageObj, { spaces: 2 });
     let map = await new mapper({ exemptions: exemptions }).createMap("./");
+    console.log("MAP", map);
     if (options.dry) {
       return;
     }
+
     let core = await getCoreId(packageObj.saturn.core);
     await createInstance(map, core.id, version, message);
+    console.log("DONE");
     await doGitAdd();
     await doGitCommit("SC Publish");
     await doGitPush();
@@ -207,7 +210,7 @@ async function createInstance(map, core, version, message) {
     );
     return response.data.data;
   } catch (e) {
-    console.log("ERROR", e.message);
+    console.log("ERROR", e.message, e);
   }
 }
 
@@ -217,12 +220,7 @@ function command(prog) {
   program
     .command("publish [release]", { isDefault: true })
     .option("-d, --dry <template>", "Dry Run", false)
-    .option(
-      "-v, --version",
-      "Version, options are major, minor, patch",
-      "patch"
-    )
-    .option("-m, --description", "Description of the update", "")
+    .option("-m, --message", "Description of the update", "")
     .description("Publish Saturn Version")
     .action(action);
 }

package/mapper.js

@@ -2,23 +2,54 @@ let klawSync = require("klaw-sync");
 let _ = require("lodash");
 let path = require("path");
 let crypto = require("crypto");
-let fs = require("fs");
+let fs = require("graceful-fs");
 
 let exemptions = [];
 let dir_path = ".";
 
+/* function generateChecksum(file) {
+  return new Promise(function (resolve, reject) {
+    try {
+      var hash = crypto.createHash("md5");
+      var stream = fs.createReadStream(file);
+      stream.on("data", function (data) {
+        hash.update(data);
+      });
+      stream.on("end", function () {
+        var sha = hash.digest("hex");
+        resolve(sha);
+      });
+    } catch (e) {
+      reject(e);
+    }
+  });
+} */
 function generateChecksum(file) {
   return new Promise(function (resolve, reject) {
     try {
       var hash = crypto.createHash("md5");
       var stream = fs.createReadStream(file);
+
       stream.on("data", function (data) {
         hash.update(data);
       });
+
+      // Listen for the 'end' event to finish the hash calculation
       stream.on("end", function () {
         var sha = hash.digest("hex");
+        stream.close(); // Manually close the stream (if necessary)
         resolve(sha);
       });
+
+      // Listen for the 'close' event to ensure resources are released
+      stream.on("close", function () {
+        // console.log(`Stream for ${file} closed`);
+      });
+
+      // Handle errors
+      stream.on("error", function (error) {
+        reject(error);
+      });
     } catch (e) {
       reject(e);
     }
@@ -28,7 +59,9 @@ function generateChecksum(file) {
 function isExemptedDirectory(item) {
   let file = _.last(item.path.split(dir_path + "/"));
   let included = _.includes(
-    _.map(exemptions, (exem) => _.startsWith(file, exem)),
+    _.map(exemptions, (exem) => {
+      return _.startsWith(file, exem);
+    }),
     true
   );
   return !included;
@@ -49,10 +82,10 @@ module.exports = class Mapper {
       return _.groupBy(
         await Promise.all(
           files.map(async function (file) {
+            //console.log("Mapping::", file.path);
             return {
               file: _.last(file.path.split(dir_path + "/")),
               size: file.stats.size,
-
               checksum: await generateChecksum(file.path),
               creation_date: file.stats.birthtime,
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saturn-core-cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Saturn Core CLI",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,7 @@
     "colors": "^1.4.0",
     "commander": "^11.1.0",
     "fs-extra": "^11.1.1",
+    "graceful-fs": "^4.2.11",
     "klaw-sync": "^6.0.0",
     "lodash": "^4.17.21",
     "pluralize": "^8.0.0",