@pitcher/cli-scripts 1.0.2 → 1.0.4

package/dist/publishApp.js

@@ -3,21 +3,21 @@ import archiver from "archiver";
 import axios from "axios";
 import fs from "fs";
 import path from "path";
-import FormData from "form-data"; // Ensure you have form-data installed
+import FormData from "form-data";
+import { fileURLToPath } from 'url';
 export function createPublishAppCommand() {
     const program = new Command("publish-app");
     program
-        .arguments("[folder]") // Make folder argument optional
-        .requiredOption("--api-key <apiKey>", "API Key for authentication") // Make API key a required option
+        .arguments("[folder]")
+        .requiredOption("--api-key <apiKey>", "API Key for authentication")
         .option("--org <organization>", "Organization subdomain", "dev")
-        .option("--increment-version", "Increment version in app.json") // Add increment-version option
-        .option("--dry-run", "Perform a dry run without publishing") // Add dry-run option
+        .option("--increment-version", "Increment version in app.json")
+        .option("--dry-run", "Perform a dry run without publishing")
+        .option("--publish-url <url>", "Explicit publish URL")
         .description('zip the contents of a folder and publish as an app to a pitcher org URL. for current folder: "p publish-app --api-key myapikey"')
-        // Set default folder to current directory
         .action(async (folder = ".", options) => {
         try {
-            const folderPath = path.resolve(folder); // Resolve the folder path
-            // Increment version if --increment-version is provided
+            const folderPath = path.resolve(folder);
             if (options.incrementVersion) {
                 const appJsonPath = path.join(folderPath, "app.json");
                 if (fs.existsSync(appJsonPath)) {
@@ -37,7 +37,8 @@ export function createPublishAppCommand() {
                     return;
                 }
             }
-            const zipFilePath = path.join(__dirname, "app.zip");
+            const currentDir = path.dirname(fileURLToPath(import.meta.url));
+            const zipFilePath = path.join(currentDir, "app.zip");
             const output = fs.createWriteStream(zipFilePath);
             const archive = archiver("zip", {
                 zlib: { level: 9 },
@@ -46,7 +47,7 @@ export function createPublishAppCommand() {
                 console.log(`Zipped ${archive.pointer()} total bytes`);
                 const formData = new FormData();
                 formData.append("file", fs.createReadStream(zipFilePath));
-                const publishUrl = `https://${options.org}.my.pitcher.com/api/v1/apps/publish/`; // Construct the publish URL
+                const publishUrl = options.publishUrl || `https://${options.org}.my.pitcher.com/api/v1/apps/publish/`;
                 if (options.dryRun) {
                     console.log("Dry run mode enabled. The following data would be published:");
                     console.log("Publish URL:", publishUrl);
@@ -55,14 +56,14 @@ export function createPublishAppCommand() {
                         "x-api-key": options.apiKey,
                     });
                     console.log("app.json content:", fs.readFileSync(path.join(folderPath, "app.json"), "utf-8"));
-                    fs.unlinkSync(zipFilePath); // Clean up the zip file
+                    fs.unlinkSync(zipFilePath);
                 }
                 else {
                     try {
                         const response = await axios.post(publishUrl, formData, {
                             headers: {
                                 ...formData.getHeaders(),
-                                "x-api-key": options.apiKey, // Add API key to headers
+                                "x-api-key": options.apiKey,
                             },
                         });
                         console.log("Publish response:", response.data);
@@ -73,7 +74,7 @@ export function createPublishAppCommand() {
                         console.error("Error publishing:", errData?.detail ?? errData);
                     }
                     finally {
-                        fs.unlinkSync(zipFilePath); // Clean up the zip file
+                        fs.unlinkSync(zipFilePath);
                     }
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pitcher/cli-scripts",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "The Pitcher CLI for various tasks in its ecosystem.",
   "author": "Pitcher AG",
   "license": "MIT",