Merge pull request #104 from czprz/103-cannot-run-as-hash-checker-req…

…uires-projectlocation-with-deverjson

#103 Cannot run as 'hash-checker' requires 'project.location' with 'dever.json'

bin/common/default-yargs-generator.js

@@ -89,7 +89,7 @@ export default new class {
         console.log(`Use 'dever validate -f [filePath]' to find out why they're unsupported`);
 
         for (const project of projects) {
-            console.log(`${chalk.green(project.location)}`);
+            console.log(`${chalk.green(project.location.full)}`);
         }
     }
 

bin/common/helper/hash-checker.js

@@ -14,7 +14,7 @@ export default new class {
             return true;
         }
 
-        return project.lastHash === this.#getHash(project.location);
+        return project.lastHash === this.#getHash(project.location.full);
     }
 
     /**
@@ -23,7 +23,7 @@ export default new class {
      */
     update(project) {
         projectConfigFacade.update(project.id, (local) => {
-            local.lastHash = this.#getHash(project.location);
+            local.lastHash = this.#getHash(project.location.full);
         });
     }
 

bin/common/models/internal.js

@@ -35,7 +35,7 @@ export class Project {
     install;
 
     /**
-     * @type {string}
+     * @type {Location}
      */
     location;
 
@@ -145,4 +145,16 @@ class ExecutionConfig extends ExecutionRunConfig {
      * @type {ExecutionRunConfig} @optional
      */
     stop;
+}
+
+export class Location {
+    /**
+     * @type {string} @required
+     */
+    full;
+
+    /**
+     * @type {string} @required
+     */
+    partial;
 }

bin/configuration/facades/project-config-facade.js

@@ -159,7 +159,10 @@ export default new class {
         return {
             ...projectConfig,
             id: id,
-            location: path.dirname(project.path),
+            location: {
+                full: project.path,
+                partial: path.dirname(project.path)
+            },
             lastHash: project.lastHash,
             skipHashCheck: config.skipAllHashChecks || project.skipHashCheck || false,
             supported: versionChecker.supportedVersion(projectConfig?.version ?? 0),

bin/configuration/handlers/project-config-handler.js

@@ -60,7 +60,7 @@ export default new class {
             return;
         }
 
-        console.log(project.location);
+        console.log(project.location.full);
     }
 
     /**

bin/environments/executions/docker-compose/index.js

@@ -18,10 +18,10 @@ export default new class {
     handle(project, execution, runtime) {
         switch (true) {
             case runtime.start:
-                this.#start(execution, project.location, runtime);
+                this.#start(execution, project.location.partial, runtime);
                 break;
             case runtime.stop:
-                this.#stop(execution, project.location);
+                this.#stop(execution, project.location.partial);
                 break;
         }
     }

bin/environments/executions/powershell-script/index.js

@@ -26,7 +26,7 @@ export default new class {
         }
 
         try {
-            const file = path.join(project.location, execution.file);
+            const file = path.join(project.location.partial, execution.file);
             const fileWithParameters = customOptions.addOptionsToFile(file, execution.options, runtime.args);
             await powershell.executeFileSync(fileWithParameters, execution.runAsElevated);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@czprz/dever",
-  "version": "0.11.4-beta",
+  "version": "0.11.5-beta",
   "description": "Development Helper (dev-er) to speed up and keep local development environment consistent",
   "author": "Casper Overholm Elkrog",
   "keywords": [