occam-verify-cli 0.0.540 → 0.0.542

package/bin/action/verify.js

@@ -4,7 +4,7 @@ const { Dependency } = require("occam-file-system"),
       { verifyRelease, releaseContextUtilities } = require("../../lib/index");  ///
 
 const { trimTrailingSlash } = require("../utilities/string"),
-      { releaseContextFromDependencyAndDependentNames } = require("../utilities/releaseContext");
+      { releaseContextFromDependency } = require("../utilities/releaseContext");
 
 const { createReleaseContext, initialiseReleaseContext } = releaseContextUtilities;
 
@@ -18,7 +18,7 @@ function verifyAction(argument, log) {
   Object.assign(context, {
     log,
     releaseContextMap,
-    releaseContextFromDependencyAndDependentNames
+    releaseContextFromDependency
   });
 
   createReleaseContext(dependency, dependentNames, context, (error) => {
@@ -41,13 +41,9 @@ function verifyAction(argument, log) {
       }
 
       delete context.releaseContextMap;
-      delete context.releaseContextFromDependencyAndDependentNames;
+      delete context.releaseContextFromDependency;
 
-      const releaseVerified = verifyRelease(releaseName, releaseContextMap);
-
-      if (releaseVerified) {
-        releaseContext.toJSON();
-      }
+      verifyRelease(releaseName, releaseContextMap);
     });
   });
 }

package/bin/utilities/releaseContext.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index"), ///
+const { ReleaseContext } = require("../../lib/index"), ///
       { Entries, fileSystemUtilities : occamFileSystemUtilities } = require("occam-file-system"),
       { pathUtilities, fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary");
 
@@ -8,7 +8,7 @@ const { loadProject } = occamFileSystemUtilities,
       { concatenatePaths } = pathUtilities,
       { readFile, isEntryFile, checkEntryExists } = necessaryFileSystemUtilities;
 
-function releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, callback) {
+function releaseContextFromDependency(dependency, dependentNames, context, callback) {
   const projectsDirectoryPath = process.cwd(), ///
         dependencyName = dependency.getName(),
         entryPath = concatenatePaths(projectsDirectoryPath, dependencyName),
@@ -25,15 +25,27 @@ function releaseContextFromDependencyAndDependentNames(dependency, dependentName
 
   const entryFile = isEntryFile(entryPath);
 
-  let releaseContext;
+  let releaseContext = null;
 
   try {
-    releaseContext = entryFile ?
-                       fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) :
-                         directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context);
+    const { log } = context;
+
+    if (entryFile) {
+      const filePath = entryPath, ///
+            content = readFile(filePath),
+            jsonString = content, ///
+            json = JSON.parse(jsonString);
+
+      releaseContext = releaseContextFromLogAndJSON(log, json);
+    } else {
+      const projectName = dependencyName, ///
+            project = loadProject(projectName, projectsDirectoryPath);
+
+      if (project !== null) {
+        releaseContext = releaseContextFromLogAndProject(log, project);
+      }
+    }
   } catch (error) {
-    const releaseContext = null;
-
     callback(error, releaseContext);
 
     return;
@@ -45,52 +57,30 @@ function releaseContextFromDependencyAndDependentNames(dependency, dependentName
 }
 
 module.exports = {
-  releaseContextFromDependencyAndDependentNames
+  releaseContextFromDependency
 };
 
-function fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
-  let releaseContext;
-
-  const { log } = context,
-        dependencyName = dependency.getName(),
-        filePath = concatenatePaths(projectsDirectoryPath, dependencyName),
-        content = readFile(filePath),
-        releaseJSONString = content,  ///
-        releaseJSON = JSON.parse(releaseJSONString);
-
-  ({ context } = releaseJSON);
-
-  const contextJSON = context;  ///
+function releaseContextFromLogAndJSON(log, json) {
+  const { name, context } = json;
 
-  let { entries } = releaseJSON;
+  let { entries } = json;
 
-  const json = entries; ///
+  json = entries; ///
 
   entries = Entries.fromJSON(json);
 
-  const name = dependencyName, ///
-        fileReleaseContext = FileReleaseContext.fromLogNameEntriesAndContextJSON(log, name, entries, contextJSON);
+  json = context; ///
 
-  releaseContext = fileReleaseContext;  ///
+  const releaseContext = ReleaseContext.fromLogJSONNameAndEntries(log, json, name, entries);
 
   return releaseContext;
 }
 
-function directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
-  let releaseContext = null;
-
-  const dependencyName = dependency.getName(),
-        projectName = dependencyName, ///
-        project = loadProject(projectName, projectsDirectoryPath);
-
-  if (project !== null) {
-    const { log } = context,
-          name = project.getName(),
-          entries = project.getEntries(),
-          directoryReleaseContext = DirectoryReleaseContext.fromLogNameAndEntries(log, name, entries);
-
-    releaseContext = directoryReleaseContext; ///
-  }
+function releaseContextFromLogAndProject(log, project) {
+  const json = null,
+        name = project.getName(),
+        entries = project.getEntries(),
+        releaseContext = ReleaseContext.fromLogJSONNameAndEntries(log, json, name, entries);
 
   return releaseContext;
 }