@pitcher/cli-scripts 1.0.3 → 1.0.5

package/README.internal.md

@@ -0,0 +1,12 @@
+## To install dependencies:
+
+```bash
+yarn install
+```
+
+## To work on it
+
+```bash
+# at the root folder: 
+yarn link
+```

package/README.md

@@ -1,17 +1,14 @@
-# ng-scripts
-<img width="1576" alt="Screenshot 2024-06-27 at 1 55 41 PM" src="https://github.com/PitcherAG/ng-scripts/assets/11925511/9c5bfc2b-1b24-4482-8afe-35eb5e0a3f8e">
+# @pitcher/cli-scripts
+Pitcher CLI Tools
 
 
-## To install dependencies:
-
+## Help
 ```bash
-bun install
+p --help
+# or for specific command help:
+p command --help 
 ```
 
-## To install as a term package (until we publish)
-```bash
-bun link
-```
 
 ## To run the `copy-instance-files` command:
 

package/dist/index.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import { Command } from "commander";
-import { createCopyInstanceFilesCommand } from "./copyInstanceFiles.js";
-import { createPublishAppCommand } from "./publishApp.js";
+import { createCopyInstanceFilesCommand } from "./src/copyInstanceFiles.js";
+import { createPublishAppCommand } from "./src/publishApp.js";
+import pkg from "./package.json";
 const program = new Command();
 program
     .name("p")
     .description("The Pitcher CLI for various tasks in its ecosystem.")
-    .version("1.0.0");
+    .version(pkg.version);
 // Add subcommands
 program.addCommand(createCopyInstanceFilesCommand());
 program.addCommand(createPublishAppCommand());

package/dist/package.json

@@ -0,0 +1,36 @@
+{
+    "name": "@pitcher/cli-scripts",
+    "version": "1.0.5",
+    "description": "The Pitcher CLI for various tasks in its ecosystem.",
+    "author": "Pitcher AG",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/PitcherAG/ng-scripts.git"
+    },
+    "keywords": ["pitcher", "cli", "ng-scripts"],
+    "type": "module",
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "scripts": {
+        "build": "tsc",
+        "prepublishOnly": "npm run build"
+    },
+    "bin": {
+        "p": "./dist/index.js"
+    },
+    "files": [
+        "dist"
+    ],
+    "devDependencies": {
+        "@types/archiver": "^6.0.2",
+        "@types/node": "^20.0.0",
+        "typescript": "^5.4.5"
+    },
+    "dependencies": {
+        "archiver": "^7.0.1",
+        "axios": "^1.7.2",
+        "commander": "^12.1.0",
+        "form-data": "^4.0.0"
+    }
+}

package/dist/publishApp.js

@@ -3,22 +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("--publish-url <url>", "Explicit publish URL") // Add publish-url 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)) {
@@ -38,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 },
@@ -47,7 +47,6 @@ export function createPublishAppCommand() {
                 console.log(`Zipped ${archive.pointer()} total bytes`);
                 const formData = new FormData();
                 formData.append("file", fs.createReadStream(zipFilePath));
-                // Use explicit publish URL if provided, otherwise construct from org
                 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:");
@@ -57,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);
@@ -75,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/dist/src/copyInstanceFiles.d.ts

@@ -0,0 +1,2 @@
+import { Command } from "commander";
+export declare function createCopyInstanceFilesCommand(): Command;

package/dist/src/copyInstanceFiles.js

@@ -0,0 +1,17 @@
+import { Command } from "commander";
+export function createCopyInstanceFilesCommand() {
+    const program = new Command("copy-instance-files");
+    program
+        .arguments("<fromInstance> <toInstance>")
+        .requiredOption("--api-key <apiKey>", "API Key", process.env.PITCHER_API_KEY)
+        .requiredOption("--org <orgName>", "Organization Name", process.env.PITCHER_ORG)
+        .description('clone instance files into another one e.g. "p copy-instance-files <fromInstanceId> <toInstanceId> --org mondelez --api-key myapikey"')
+        .action((sourceInstanceId, destinationInstanceId, options) => {
+        console.log("clone instance files command called", {
+            sourceInstanceId,
+            destinationInstanceId,
+            options,
+        });
+    });
+    return program;
+}

package/dist/src/publishApp.d.ts

@@ -0,0 +1,2 @@
+import { Command } from "commander";
+export declare function createPublishAppCommand(): Command;

package/dist/src/publishApp.js

@@ -0,0 +1,93 @@
+import { Command } from "commander";
+import archiver from "archiver";
+import axios from "axios";
+import fs from "fs";
+import path from "path";
+import FormData from "form-data";
+import { fileURLToPath } from 'url';
+export function createPublishAppCommand() {
+    const program = new Command("publish-app");
+    program
+        .arguments("[folder]")
+        .requiredOption("--api-key <apiKey>", "API Key for authentication")
+        .option("--org <organization>", "Organization subdomain", "dev")
+        .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"')
+        .action(async (folder = ".", options) => {
+        try {
+            const folderPath = path.resolve(folder);
+            if (options.incrementVersion) {
+                const appJsonPath = path.join(folderPath, "app.json");
+                if (fs.existsSync(appJsonPath)) {
+                    const appJson = JSON.parse(fs.readFileSync(appJsonPath, "utf-8"));
+                    const now = new Date();
+                    const year = now.getFullYear();
+                    const month = String(now.getMonth() + 1).padStart(2, "0");
+                    const day = String(now.getDate()).padStart(2, "0");
+                    const timestamp = now.getTime();
+                    const version = `${year}.${month}.${day}.${timestamp}`;
+                    appJson.version = version;
+                    fs.writeFileSync(appJsonPath, JSON.stringify(appJson, null, 2));
+                    console.log(`Updated app.json version to ${version}`);
+                }
+                else {
+                    console.error("app.json not found in the specified folder.");
+                    return;
+                }
+            }
+            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 },
+            });
+            output.on("close", async () => {
+                console.log(`Zipped ${archive.pointer()} total bytes`);
+                const formData = new FormData();
+                formData.append("file", fs.createReadStream(zipFilePath));
+                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);
+                    console.log("Headers:", {
+                        ...formData.getHeaders(),
+                        "x-api-key": options.apiKey,
+                    });
+                    console.log("app.json content:", fs.readFileSync(path.join(folderPath, "app.json"), "utf-8"));
+                    fs.unlinkSync(zipFilePath);
+                }
+                else {
+                    try {
+                        const response = await axios.post(publishUrl, formData, {
+                            headers: {
+                                ...formData.getHeaders(),
+                                "x-api-key": options.apiKey,
+                            },
+                        });
+                        console.log("Publish response:", response.data);
+                    }
+                    catch (e) {
+                        const error = e;
+                        const errData = error?.response?.data;
+                        console.error("Error publishing:", errData?.detail ?? errData);
+                    }
+                    finally {
+                        fs.unlinkSync(zipFilePath);
+                    }
+                }
+            });
+            archive.on("error", (err) => {
+                throw err;
+            });
+            archive.pipe(output);
+            archive.directory(folderPath, false);
+            await archive.finalize();
+        }
+        catch (error) {
+            console.error("Error zipping or publishing:", error);
+        }
+    });
+    return program;
+}

package/package.json

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