Merge pull request #30 from reynaldichernando/puter-site-deploy

Add non interactive puter site deploy

Author: bitsnaps

bin/index.js

@@ -7,6 +7,7 @@ import { startShell } from '../src/commands/shell.js';
 import { PROJECT_NAME, getLatestVersion } from '../src/commons.js';
 import { createApp } from '../src/commands/apps.js';
 import { deploy } from '../src/commands/deploy.js';
+import inquirer from 'inquirer';
 
 async function main() {
   const version = await getLatestVersion(PROJECT_NAME);
@@ -63,21 +64,42 @@ async function main() {
       process.exit(0);
     });
 
-  /*/ Deploy command
-  program
-    .command('site:deploy')
+  const site = program
+  .command('site')
+  .description('Site management commands');
+
+  site
+    .command('deploy')
     .description('Deploy a local web project to Puter')
-    .argument('[remoteDir]', 'Remote directory path')
-    .option('--subdomain <subdomain>', 'Subdomain for the site')
-    .action(async (name, remoteDir, options) => {
-        try {
-            await deploy([name, remoteDir, `--subdomain=${options.subdomain}`].filter(Boolean));
-        } catch (error) {
-            console.error(chalk.red(error.message));
-        }
-        process.exit(0);
+    .argument('[local_dir]', 'Local directory path')
+    .argument('[subdomain]', 'Deployment subdomain (<subdomain>.puter.site)')
+    .action(async (local_dir, subdomain) => {
+      if (!local_dir) {
+        const answer = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'local_dir',
+            message: 'Local directory path:',
+            default: '.'
+          }
+        ]);
+        local_dir = answer.local_dir;
+      }
+
+      if (!subdomain) {
+        const answer = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'subdomain',
+            message: 'Deployment subdomain (leave empty for random):',
+          }
+        ]);
+        subdomain = answer.subdomain;
+      }
+
+      await startShell(`site:deploy ${local_dir}${subdomain ? ` --subdomain=${subdomain}`: ''}`)
+      process.exit(0);
     });
-    */
 
   if (process.argv.length === 2) {
     startShell();

src/commands/deploy.js

@@ -25,28 +25,20 @@ export async function deploy(args = []) {
 
   const remoteDir = `deployments/site-${crypto.randomUUID()}`;
 
-  console.log(chalk.cyan(`Deploying '${appName}' from local '${sourceDir}' to remote '${remoteDir}' at '${subdomain}.puter.site'...`));
+  console.log(chalk.cyan(`Deploying '${sourceDir}' to '${subdomain}.puter.site'...`));
 
   try {
     // 1. Upload files
-    console.log(chalk.cyan(`Uploading files from '${sourceDir}' to '${remoteDir}'...`));
     await syncDirectory([sourceDir, remoteDir, '--delete', '-r', '--overwrite']);
 
     // 2. Create the site
-    console.log(chalk.cyan(`Creating site...`));
     const site = await createSite([appName, remoteDir, `--subdomain=${subdomain}`]);
 
     if (site) {
       console.log(chalk.green('Deployment successful!'));      
     } else {
       console.log(chalk.yellow('Deployment successfuly updated!'));
     }
-    if (subdomain){
-      console.log(chalk.cyan('Your site is live at:'));
-      console.log(chalk.green(`https://${subdomain}.puter.site`));
-    } else {
-      console.log(chalk.red('Deployment failed. Subdomain cannot be reserved!'));
-    }
   } catch (error) {
     console.error(chalk.red(`Deployment failed: ${error.message}`));
   }

src/commands/sites.js

@@ -176,14 +176,14 @@ export async function infoSite(args = []) {
         console.log(chalk.cyan(`New generated subdomain: "${subdomain}" will be used if its not already in use.`));
 
         // Step 3: Host the current directory under the subdomain
-        console.log(chalk.cyan(`Hosting app "${appName}" under subdomain "${subdomain}"...`));
+        console.log(chalk.cyan(`Hosting site "${appName}" under subdomain "${subdomain}"...`));
         const site = await createSubdomain(subdomain, remoteDir);
         if (!site){
             console.error(chalk.red(`Failed to create subdomain: "${chalk.red(subdomain)}"`));
             return;
         }
 
-        console.log(chalk.green(`App ${chalk.dim(appName)} created successfully and accessible at:`));
+        console.log(chalk.green(`Site ${chalk.dim(appName)} created successfully and accessible at:`));
         console.log(chalk.cyan(`https://${site.subdomain}.puter.site`));
         return site;
     } catch (error) {

src/commons.js

@@ -45,7 +45,7 @@ export function getHeaders(contentType = 'application/json') {
  * @see: [randName](https://github.com/HeyPuter/puter/blob/06a67a3b223a6cbd7ec2e16853b6d2304f621a88/src/puter-js/src/index.js#L389)
  */
 export function generateAppName(separateWith = '-'){
-  console.log(chalk.cyan('Generating random app name...'));
+  console.log(chalk.cyan('Generating random name...'));
   try {        
       const first_adj = ['helpful','sensible', 'loyal', 'honest', 'clever', 'capable','calm', 'smart', 'genius', 'bright', 'charming', 'creative', 'diligent', 'elegant', 'fancy', 
       'colorful', 'avid', 'active', 'gentle', 'happy', 'intelligent', 'jolly', 'kind', 'lively', 'merry', 'nice', 'optimistic', 'polite', 
@@ -63,7 +63,7 @@ export function generateAppName(separateWith = '-'){
       // return a random combination of first_adj + noun + number (between 0 and 9999)
       // e.g. clever-idea-123
       const appName = first_adj[Math.floor(Math.random() * first_adj.length)] + separateWith + nouns[Math.floor(Math.random() * nouns.length)] + separateWith + Math.floor(Math.random() * 10000);
-      console.log(chalk.green(`AppName: "${appName}"`));
+      console.log(chalk.green(`Name: "${appName}"`));
       return appName;
   } catch (error) {
       console.error(`Error: ${error.message}`);