@kithinji/pod 1.0.18 → 1.0.20

package/src/docker/docker.ts

@@ -36,6 +36,9 @@ export async function dockerize(env: "dev" | "prod" = "prod") {
     await setupDevelopment(cwd, projectName, selectedServices);
   }
 
+  // Write environment variables to .env if they don't exist
+  await writeEnvVars(cwd, selectedServices, env);
+
   printNextSteps(projectName, env, selectedServices);
 }
 
@@ -67,7 +70,6 @@ async function selectServices(
     })),
   });
 
-  // Fixed: Handle empty response when user cancels
   if (!response.services || response.services.length === 0) return [];
   return detected.filter((s) => response.services.includes(s.name));
 }
@@ -99,8 +101,94 @@ async function restructureProject(cwd: string, projectName: string) {
   }
 }
 
+async function writeEnvVars(
+  cwd: string,
+  services: DockerService[],
+  env: string
+) {
+  const envPath = path.join(cwd, ".env");
+  let existingEnv: Record<string, string> = {};
+  let existingContent = "";
+
+  // Read existing .env file if it exists
+  if (fs.existsSync(envPath)) {
+    existingContent = await fs.readFile(envPath, "utf8");
+    existingEnv = parseEnvFile(existingContent);
+  }
+
+  const newVars: string[] = [];
+
+  // Add HOST variable for production
+  if (env === "prod" && !existingEnv.HOST) {
+    newVars.push("HOST=example.com");
+  }
+
+  // Add service-specific variables
+  for (const service of services) {
+    const serviceVars = getEnvVars(service.name);
+    for (const varLine of serviceVars) {
+      const [key] = varLine.split("=");
+      if (!existingEnv[key]) {
+        newVars.push(varLine);
+      }
+    }
+
+    // Add tunnel-specific variables for dev mode
+    if (env === "dev" && service.needsTunnel) {
+      const remoteHostKey = `${service.name.toUpperCase()}_REMOTE_HOST`;
+      const remotePortKey = `${service.name.toUpperCase()}_REMOTE_PORT`;
+
+      if (!existingEnv[remoteHostKey]) {
+        newVars.push(`${remoteHostKey}=user@remote-server.com`);
+      }
+      if (!existingEnv[remotePortKey]) {
+        newVars.push(`${remotePortKey}=${getDefaultPort(service.name)}`);
+      }
+    }
+  }
+
+  // Write new variables to .env file
+  if (newVars.length > 0) {
+    const separator =
+      existingContent && !existingContent.endsWith("\n") ? "\n" : "";
+    const newContent =
+      existingContent +
+      separator +
+      (existingContent ? "\n" : "") +
+      newVars.join("\n") +
+      "\n";
+    await fs.writeFile(envPath, newContent);
+    console.log(
+      `✅ Added ${newVars.length} new environment variable(s) to .env`
+    );
+  } else {
+    console.log("✅ All required environment variables already exist in .env");
+  }
+}
+
+function parseEnvFile(content: string): Record<string, string> {
+  const env: Record<string, string> = {};
+  const lines = content.split("\n");
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    // Skip empty lines and comments
+    if (!trimmed || trimmed.startsWith("#")) continue;
+
+    const equalIndex = trimmed.indexOf("=");
+    if (equalIndex > 0) {
+      const key = trimmed.substring(0, equalIndex).trim();
+      const value = trimmed.substring(equalIndex + 1).trim();
+      env[key] = value;
+    }
+  }
+
+  return env;
+}
+
 async function createDockerfile(cwd: string, projectName: string) {
   const dockerfilePath = path.join(cwd, projectName, "Dockerfile");
+  const dockerignorePath = path.join(cwd, projectName, ".dockerignore");
 
   const dockerfile = `FROM node:18-alpine
 
@@ -115,9 +203,67 @@ COPY . .
 EXPOSE 8080
 
 CMD ["npm", "run", "dev"]
+`;
+
+  const dockerignore = `# Dependencies
+node_modules
+npm-debug.log
+yarn-error.log
+package-lock.json
+yarn.lock
+
+# Environment files
+.env
+.env.*
+
+# Git
+.git
+.gitignore
+
+# IDE
+.vscode
+.idea
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Testing
+coverage
+.nyc_output
+*.test.js
+*.spec.js
+__tests__
+
+# Build files
+dist
+public
+
+# Logs
+logs
+*.log
+
+# Documentation
+README.md
+docs
+*.md
+
+# Docker
+Dockerfile
+.dockerignore
+docker-compose*.yml
+
+# Misc
+.cache
+tmp
+temp
 `;
 
   await fs.writeFile(dockerfilePath, dockerfile);
+  await fs.writeFile(dockerignorePath, dockerignore);
 }
 
 async function setupProduction(
@@ -152,7 +298,7 @@ async function setupProduction(
           "./letsencrypt:/letsencrypt",
         ],
         networks: ["web"],
-        env_file: [".env"], // Fixed: Added env_file to read HOST variable
+        env_file: [".env"],
       },
       [projectName]: {
         build: {
@@ -161,16 +307,16 @@ async function setupProduction(
         },
         labels: [
           "traefik.enable=true",
-          "traefik.http.routers.app.rule=Host(`${HOST}`)", // Fixed: Changed from app.${HOST} to ${HOST}
+          "traefik.http.routers.app.rule=Host(`app.${HOST}`)",
           "traefik.http.routers.app.entrypoints=websecure",
           "traefik.http.routers.app.tls.certresolver=myresolver",
           "traefik.http.services.app.loadbalancer.server.port=8080",
         ],
         env_file: [".env"],
         networks: ["web"],
-        volumes: [`./${projectName}:/app`], // Fixed: Changed from ./web to ./${projectName}
+        volumes: [`./${projectName}:/app`, `/app/node_modules`],
         command: "npm run dev",
-        depends_on: [], // Fixed: Added missing depends_on array
+        depends_on: [],
       },
     },
     networks: {
@@ -178,7 +324,7 @@ async function setupProduction(
         driver: "bridge",
       },
     },
-    volumes: {}, // Fixed: Added missing volumes object
+    volumes: {},
   };
 
   for (const service of services) {
@@ -260,7 +406,7 @@ async function setupDevelopment(
         },
         ports: ["8080:8080"],
         env_file: [".env"],
-        volumes: [`./${projectName}:/app`, `/app/node_modules`], // Fixed: Changed from . to ./${projectName}
+        volumes: [`./${projectName}:/app`, `/app/node_modules`],
         command: "npm run dev",
         depends_on: [],
       },
@@ -433,11 +579,11 @@ function printNextSteps(
   console.log(`\n✅ Done! Next steps:\n`);
 
   if (env === "prod") {
-    console.log(`  # Edit .env with your settings`);
+    console.log(`  # Review and edit .env with your settings`);
     console.log(`  docker-compose up -d`);
-    console.log(`  # Access at https://\${HOST}\n`);
+    console.log(`  # Access at https://app.\${HOST}\n`);
   } else {
-    console.log(`  # Edit .env with your settings`);
+    console.log(`  # Review and edit .env with your settings`);
     if (services.some((s) => s.needsTunnel)) {
       console.log(`  # Add SSH keys: {service}.pem`);
     }

package/src/main.ts

@@ -25,10 +25,12 @@ import { addFeature } from "./add/module";
 import path from "path";
 import { execSync } from "child_process";
 import { dockerize } from "./docker";
+import { deploy } from "./deploy";
+import chalk from "chalk";
 
 const program = new Command();
 
-program.name("pod").description("Pod cli tool").version("1.0.18");
+program.name("pod").description("Pod cli tool").version("1.0.20");
 
 program
   .command("new <name>")
@@ -88,12 +90,16 @@ program
   });
 
 program
-  .command("deploy <type> <options>")
-  .description("Deploy a Pod Project")
-  .action(async (type, name) => {
+  .command("deploy")
+  .description("Deploy to a target environment")
+  .argument("<target>", "Target environment (e.g., ec2)")
+  .option("--force-install", "Force reinstallation even if already installed")
+  .action(async (target: string, options: { forceEnsure?: boolean }) => {
     try {
-    } catch (err: any) {
-      console.error("❌ Error:", err.message);
+      await deploy(target, options);
+    } catch (error: any) {
+      console.error(chalk.red(error.message));
+      process.exit(1);
     }
   });