occam-verify-cli 0.0.324 → 0.0.325

package/bin/abbreviations.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const options = require("./options");
+const { LOG_LEVEL_OPTIONS, RELEASE_NAME_OPTIONS } = require("./options");
 
-const { RELEASE_NAME_OPTIONS } = options;
-
-const p = RELEASE_NAME_OPTIONS;
+const l = LOG_LEVEL_OPTIONS,
+      p = RELEASE_NAME_OPTIONS;
 
 module.exports = {
+  l,
   p
 };

package/bin/callbacks.js

@@ -0,0 +1,36 @@
+"use strict";
+
+const { levels } = require("necessary"),
+      { Callbacks } = require("../lib/index"),
+      { loggingUtilities } = require("necessary");
+
+const { HALT_MESSAGE, BEGIN_MESSAGE, COMPLETED_MESSAGE } = require("./messages");
+
+const { log } = loggingUtilities,
+      { TRACE_LEVEL } = levels;
+
+function halt(filePath, leastLineIndex, greatestLineIndex) { logMessage(HALT_MESSAGE, filePath, leastLineIndex, greatestLineIndex); } ///
+
+function begin(filePath, leastLineIndex, greatestLineIndex) { logMessage(BEGIN_MESSAGE, filePath, leastLineIndex, greatestLineIndex); } ///
+
+function complete(filePath, leastLineIndex, greatestLineIndex) { logMessage(COMPLETED_MESSAGE, filePath, leastLineIndex, greatestLineIndex); }  ///
+
+const callbacks = Callbacks.fromHaltBeginAndComplete(halt, begin, complete);
+
+module.exports = callbacks;
+
+function logMessage(message, filePath, leastLineIndex, greatestLineIndex) {
+  if (leastLineIndex === greatestLineIndex) {
+    const lineIndex = leastLineIndex; ///
+
+    message = `'${filePath}' : [${lineIndex}] - ${message}`;
+  } else {
+    message = `'${filePath}' : [${leastLineIndex}-${greatestLineIndex}] - ${message}`;
+  }
+
+  const level = TRACE_LEVEL;
+
+  log(message, level);
+
+  return message;
+}

package/bin/defaults.js

@@ -0,0 +1,11 @@
+"use strict";
+
+const { levels } = require("necessary");
+
+const { INFO_LEVEL } = levels;
+
+const DEFAULT_LOG_LEVEL = INFO_LEVEL;
+
+module.exports = {
+  DEFAULT_LOG_LEVEL
+};

package/bin/main.js

@@ -1,24 +1,26 @@
 "use strict";
 
-const { arrayUtilities } = require("necessary"),
-      { fileSystemUtilities } = require("occam-file-system"),
+const { fileSystemUtilities } = require("occam-file-system"),
+      { arrayUtilities, loggingUtilities } = require("necessary"),
       { verifyRelease, releaseContextUtilities } = require("../lib/index");
 
-const { log } = require("./utilities/logging"),
-      { PERIOD } = require("./constants"),
-      { callbacksFromLog } = require("./utilities/callbacks");
+const callbacks = require("./callbacks");
 
-const { first } = arrayUtilities,
+const { PERIOD } = require("./constants"),
+      { DEFAULT_LOG_LEVEL } = require("./defaults");
+
+const { log } = loggingUtilities,
+      { first } = arrayUtilities,
+      { setLogLevel } = log,
       { loadRelease } = fileSystemUtilities,
       { createReleaseContext } = releaseContextUtilities;
 
 function main(commands, options) {
   const firstCommand = first(commands),
-        { releaseName = firstCommand } = options, ///
+        { logLevel = DEFAULT_LOG_LEVEL, releaseName = firstCommand } = options, ///
         releaseContextMap = {},
         shortenedVersion = null,
         dependentNames = [],
-        callbacks = callbacksFromLog(log),
         context = {
           log,
           callbacks,
@@ -26,6 +28,8 @@ function main(commands, options) {
           releaseContextMap
         };
 
+  setLogLevel(logLevel);
+
   createReleaseContext(releaseName, dependentNames, shortenedVersion, context, (error) => {
     if (error) {
       ///

package/bin/options.js

@@ -1,7 +1,9 @@
 "use strict";
 
-const RELEASE_NAME_OPTIONS = "package-name";
+const LOG_LEVEL_OPTIONS = "log-level",
+      RELEASE_NAME_OPTIONS = "package-name";
 
 module.exports = {
+  LOG_LEVEL_OPTIONS,
   RELEASE_NAME_OPTIONS
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.324",
+  "version": "0.0.325",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/bin/utilities/callbacks.js

@@ -1,57 +0,0 @@
-"use strict";
-
-const { levels } = require("necessary"),
-      { Callbacks } = require("../../lib/index");
-
-const { HALT_MESSAGE, BEGIN_MESSAGE, COMPLETED_MESSAGE } = require("../messages");
-
-const { TRACE_LEVEL } = levels;
-
-function callbacksFromLog(log) {
-  const level = TRACE_LEVEL;
-
-  function halt(filePath, leastLineIndex, greatestLineIndex) {
-    let message = HALT_MESSAGE;
-
-    message = messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex);
-
-    log(level, message);
-  }
-
-  function begin(filePath, leastLineIndex, greatestLineIndex) {
-    let message = BEGIN_MESSAGE;
-
-    message = messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex);
-
-    log(level, message);
-  }
-
-  function complete(filePath, leastLineIndex, greatestLineIndex) {
-    let message = COMPLETED_MESSAGE;
-
-    message = messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex);
-
-    log(level, message);
-  }
-
-  const callbacks = Callbacks.fromHaltBeginAndComplete(halt, begin, complete);
-
-  return callbacks;
-}
-
-
-module.exports = {
-  callbacksFromLog
-};
-
-function messageFromMessageFilePathLeastLineIndexAndGreatestLineIndex(message, filePath, leastLineIndex, greatestLineIndex) {
-  if (leastLineIndex === greatestLineIndex) {
-    const lineIndex = leastLineIndex; ///
-
-    message = `'${filePath}' : [${lineIndex}] - ${message}`;
-  } else {
-    message = `'${filePath}' : [${leastLineIndex}-${greatestLineIndex}] - ${message}`;
-  }
-
-  return message;
-}

package/bin/utilities/logging.js

@@ -1,34 +0,0 @@
-"use strict";
-
-const { levels } = require("necessary");
-
-const { TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL, FATAL_LEVEL } = levels;
-
-function log(level, message) {
-  console.log(`(${level}) ${message}`)
-}
-
-function trace(message) { log(TRACE_LEVEL, message); }
-
-function debug(message) { log(DEBUG_LEVEL, message); }
-
-function info(message) { log(INFO_LEVEL, message); }
-
-function warning(message) { log(WARNING_LEVEL, message); }
-
-function error(message) { log(ERROR_LEVEL, message); }
-
-function fatal(message) { log(FATAL_LEVEL, message); }
-
-Object.assign(log, {
-  trace,
-  debug,
-  info,
-  warning,
-  error,
-  fatal
-});
-
-module.exports = {
-  log
-};