@multiplatform.one/cli 1.0.31 → 1.0.33

package/lib/bin/multiplatformOne.mjs

@@ -14,7 +14,9 @@ program.command("init").argument("[remote]", "the remote to use", "https://gitla
   if ((await execa("git", [
     "rev-parse",
     "--is-inside-work-tree"
-  ])).stdout.trim() === "true") {
+  ], {
+    reject: false
+  })).exitCode === 0) {
     throw new Error("multiplatform.one cannot be initialized inside a git repository");
   }
   const cookieCutterConfig = {
@@ -26,7 +28,7 @@ program.command("init").argument("[remote]", "the remote to use", "https://gitla
       }
     ]))?.name
   };
-  const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), "multiplatform-"));
+  const cookieCutterConfigFile = path.join(await fs.mkdtemp(path.join(os.tmpdir(), "multiplatform-")), "config.json");
   await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
   await execa("sh", [
     path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/init.sh"),
@@ -42,14 +44,18 @@ program.command("update").argument("[remote]", "the remote to use", "https://git
   if ((await execa("git", [
     "rev-parse",
     "--is-inside-work-tree"
-  ])).stdout.trim() !== "true") {
+  ], {
+    reject: false
+  })).exitCode !== 0) {
     throw new Error("multiplatform.one cannot be updated outside of a git repository");
   }
   if ((await execa("git", [
     "diff",
     "--cached",
     "--quiet"
-  ])).stdout.trim() !== "true") {
+  ], {
+    reject: false
+  })).exitCode !== 0) {
     throw new Error("multiplatform.one cannot be updated with uncommitted changes");
   }
   const projectRoot = (await execa("git", [
@@ -64,7 +70,7 @@ program.command("update").argument("[remote]", "the remote to use", "https://git
     };
   }
   if (!cookieCutterConfig) throw new Error("not a multiplatform.one project");
-  const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), "multiplatform-"));
+  const cookieCutterConfigFile = path.join(await fs.mkdtemp(path.join(os.tmpdir(), "multiplatform-")), "config.json");
   await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
   await execa("sh", [
     path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/update.sh"),
@@ -73,8 +79,8 @@ program.command("update").argument("[remote]", "the remote to use", "https://git
     cookieCutterConfigFile,
     remote
   ], {
-    stdio: "inherit",
-    cwd: projectRoot
+    cwd: projectRoot,
+    stdio: "inherit"
   });
 });
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "author": "BitSpur <support@bitspur.com> (https://bitspur.com)",
   "contributors": [
     {
@@ -52,7 +52,7 @@
     "@types/node": "~20.12.13",
     "tsup": "^8.1.0",
     "typescript": "~5.3.3",
-    "@multiplatform.one/utils": "^0.0.16"
+    "@multiplatform.one/utils": "^0.0.18"
   },
   "dependencies": {
     "commander": "^9.5.0",

package/src/bin/multiplatformOne.ts

@@ -4,7 +4,7 @@
  * File Created: 22-06-2024 14:17:12
  * Author: Clay Risser
  * -----
- * BitSpur (c) Copyright 2021 - 2024
+ * BitSpur Copyright 2021 - 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ program
   .option('--name <name>', 'the name of the project')
   .description('init multiplatform.one')
   .action(async (remote) => {
-    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'])).stdout.trim() === 'true') {
+    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'], { reject: false })).exitCode === 0) {
       throw new Error('multiplatform.one cannot be initialized inside a git repository');
     }
     const cookieCutterConfig: CookieCutterConfig = {
@@ -59,7 +59,7 @@ program
           ])
         )?.name,
     };
-    const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), 'multiplatform-'));
+    const cookieCutterConfigFile = path.join(await fs.mkdtemp(path.join(os.tmpdir(), 'multiplatform-')), 'config.json');
     await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
     await execa(
       'sh',
@@ -81,10 +81,16 @@ program
   .argument('[remote]', 'the remote to use', 'https://gitlab.com/bitspur/multiplatform.one/cookiecutter')
   .description('update multiplatform.one')
   .action(async (remote) => {
-    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'])).stdout.trim() !== 'true') {
+    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'], { reject: false })).exitCode !== 0) {
       throw new Error('multiplatform.one cannot be updated outside of a git repository');
     }
-    if ((await execa('git', ['diff', '--cached', '--quiet'])).stdout.trim() !== 'true') {
+    if (
+      (
+        await execa('git', ['diff', '--cached', '--quiet'], {
+          reject: false,
+        })
+      ).exitCode !== 0
+    ) {
       throw new Error('multiplatform.one cannot be updated with uncommitted changes');
     }
     const projectRoot = (await execa('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
@@ -100,7 +106,7 @@ program
       if (name) cookieCutterConfig = { name };
     }
     if (!cookieCutterConfig) throw new Error('not a multiplatform.one project');
-    const cookieCutterConfigFile = await fs.mkdtemp(path.join(os.tmpdir(), 'multiplatform-'));
+    const cookieCutterConfigFile = path.join(await fs.mkdtemp(path.join(os.tmpdir(), 'multiplatform-')), 'config.json');
     await fs.writeFile(cookieCutterConfigFile, JSON.stringify(cookieCutterConfig, null, 2));
     await execa(
       'sh',
@@ -112,8 +118,8 @@ program
         remote,
       ],
       {
-        stdio: 'inherit',
         cwd: projectRoot,
+        stdio: 'inherit',
       },
     );
   });