gent-cli 1.5.0 → 1.7.0

package/src/commands/pull.js

@@ -0,0 +1,123 @@
+/**
+ * Pull Command - Pull commits from cloud to local repository
+ * Downloads commits, trees, and blobs from the cloud
+ */
+
+const chalk = require('chalk');
+const path = require('path');
+const ora = require('ora');
+const { pathExists, readJSON, writeJSON } = require('../utils/fileSystem');
+const { GENT_DIR, COMMITS_FILE } = require('../utils/constants');
+const { getRemote, syncCommitsFromCloud } = require('../utils/cloud-sync');
+const authStorage = require('../utils/auth-storage');
+const repoService = require('../services/repo-service');
+
+/**
+ * Pull commits from cloud to local
+ * @param {string} remoteName - Remote name (default: origin)
+ * @param {string} branchName - Branch name (optional)
+ * @param {Object} options - Command options
+ */
+async function pull(remoteName, branchName, options) {
+    try {
+        const cwd = process.cwd();
+        const gentPath = path.join(cwd, GENT_DIR);
+
+        // Check if in a gent repository
+        if (!(await pathExists(gentPath))) {
+            console.error(chalk.red('Error: Not a gent repository'));
+            console.log(chalk.yellow('Run'), chalk.cyan('gent init'), chalk.yellow('to initialize a repository'));
+            process.exit(1);
+        }
+
+        // Check authentication
+        const user = await authStorage.getUser();
+        if (!user) {
+            console.error(chalk.red('Error: You must be logged in to pull'));
+            console.log(chalk.yellow('Run'), chalk.cyan('gent login'), chalk.yellow('to authenticate'));
+            process.exit(1);
+        }
+
+        // Default to 'origin' if no remote specified
+        remoteName = remoteName || 'origin';
+
+        // Get remote configuration
+        const remote = await getRemote(remoteName, cwd);
+        if (!remote) {
+            console.error(chalk.red(`Error: Remote '${remoteName}' not found`));
+            console.log(chalk.yellow('Add a remote with:'), chalk.cyan('gent remote add origin <owner_id>/<repo_name>'));
+            console.log(chalk.yellow('Or list remotes with:'), chalk.cyan('gent remote'));
+            process.exit(1);
+        }
+
+        // Get current branch if not specified
+        const commitsData = await readJSON(path.join(gentPath, COMMITS_FILE));
+        branchName = branchName || commitsData.currentBranch;
+
+        if (!branchName) {
+            console.error(chalk.red('Error: No branch specified and no current branch found'));
+            process.exit(1);
+        }
+
+        console.log(chalk.cyan(`Pulling from ${remoteName}/${branchName}...\n`));
+
+        // Verify repository exists
+        const spinner = ora('Verifying remote repository...').start();
+        try {
+            await repoService.getRepository(remote.owner_id, remote.repo_name);
+            spinner.succeed('Remote repository verified');
+        } catch (error) {
+            spinner.fail('Remote repository not found or access denied');
+            throw error;
+        }
+
+        // Pull commits
+        const cloudCommits = await syncCommitsFromCloud(remote.owner_id, remote.repo_name, cwd);
+
+        // Update local commits file with cloud commits
+        const localCommits = commitsData.commits || [];
+        const mergedCommits = [...localCommits];
+
+        // Add cloud commits that don't exist locally
+        for (const cloudCommit of cloudCommits) {
+            const exists = localCommits.find(c => c.sha === cloudCommit.sha);
+            if (!exists) {
+                // Convert cloud commit format to local format
+                mergedCommits.push({
+                    sha: cloudCommit.sha,
+                    message: cloudCommit.message,
+                    author: {
+                        name: cloudCommit.author_name,
+                        email: cloudCommit.author_email
+                    },
+                    timestamp: cloudCommit.committed_at,
+                    parent: cloudCommit.parent_shas || [],
+                    files: {} // Files are stored in objects directory
+                });
+            }
+        }
+
+        // Update branch pointer if we have cloud commits
+        if (cloudCommits.length > 0) {
+            const latestCloudCommit = cloudCommits[cloudCommits.length - 1];
+            commitsData.branches[branchName] = latestCloudCommit.sha;
+        }
+
+        commitsData.commits = mergedCommits;
+
+        await writeJSON(path.join(gentPath, COMMITS_FILE), commitsData);
+
+        if (cloudCommits.length > 0) {
+            console.log(chalk.green(`\n✓ Successfully pulled ${cloudCommits.length} commit(s) from ${remoteName}/${branchName}`));
+        } else {
+            console.log(chalk.yellow('Already up to date'));
+        }
+
+    } catch (error) {
+        console.error(chalk.red('Failed to pull'));
+        console.error(chalk.red('Error:'), error.message);
+        process.exit(1);
+    }
+}
+
+module.exports = pull;

package/src/commands/push.js

@@ -0,0 +1,112 @@
+/**
+ * Push Command - Push local commits to cloud repository
+ * Uploads commits, trees, and blobs to the cloud
+ */
+
+const chalk = require('chalk');
+const path = require('path');
+const ora = require('ora');
+const { pathExists, readJSON } = require('../utils/fileSystem');
+const { GENT_DIR, COMMITS_FILE } = require('../utils/constants');
+const { getRemote, syncCommitsToCloud } = require('../utils/cloud-sync');
+const authStorage = require('../utils/auth-storage');
+const repoService = require('../services/repo-service');
+
+/**
+ * Push local commits to cloud
+ * @param {string} remoteName - Remote name (default: origin)
+ * @param {string} branchName - Branch name (optional)
+ * @param {Object} options - Command options
+ */
+async function push(remoteName, branchName, options) {
+    try {
+        const cwd = process.cwd();
+        const gentPath = path.join(cwd, GENT_DIR);
+
+        // Check if in a gent repository
+        if (!(await pathExists(gentPath))) {
+            console.error(chalk.red('Error: Not a gent repository'));
+            console.log(chalk.yellow('Run'), chalk.cyan('gent init'), chalk.yellow('to initialize a repository'));
+            process.exit(1);
+        }
+
+        // Check authentication
+        const user = await authStorage.getUser();
+        if (!user) {
+            console.error(chalk.red('Error: You must be logged in to push'));
+            console.log(chalk.yellow('Run'), chalk.cyan('gent login'), chalk.yellow('to authenticate'));
+            process.exit(1);
+        }
+
+        // Default to 'origin' if no remote specified
+        remoteName = remoteName || 'origin';
+
+        // Get remote configuration
+        const remote = await getRemote(remoteName, cwd);
+        if (!remote) {
+            console.error(chalk.red(`Error: Remote '${remoteName}' not found`));
+            console.log(chalk.yellow('Add a remote with:'), chalk.cyan('gent remote add origin <owner_id>/<repo_name>'));
+            console.log(chalk.yellow('Or list remotes with:'), chalk.cyan('gent remote'));
+            process.exit(1);
+        }
+
+        // Get current branch if not specified
+        const commitsData = await readJSON(path.join(gentPath, COMMITS_FILE));
+        branchName = branchName || commitsData.currentBranch;
+
+        if (!branchName) {
+            console.error(chalk.red('Error: No branch specified and no current branch found'));
+            process.exit(1);
+        }
+
+        // Get commits for the branch
+        const commits = commitsData.commits || [];
+        const branchCommitSha = commitsData.branches[branchName];
+
+        if (!branchCommitSha) {
+            console.error(chalk.red(`Error: Branch '${branchName}' not found`));
+            process.exit(1);
+        }
+
+        // Get commits to push (find all commits in the branch)
+        const commitsToPush = [];
+        let currentSha = branchCommitSha;
+
+        while (currentSha) {
+            const commit = commits.find(c => c.sha === currentSha);
+            if (!commit) break;
+
+            commitsToPush.unshift(commit); // Add to beginning to maintain order
+            currentSha = commit.parent ? commit.parent[0] : null;
+        }
+
+        if (commitsToPush.length === 0) {
+            console.log(chalk.yellow('Nothing to push'));
+            return;
+        }
+
+        console.log(chalk.cyan(`Pushing ${commitsToPush.length} commit(s) to ${remoteName}/${branchName}...`));
+
+        // Verify repository exists
+        const spinner = ora('Verifying remote repository...').start();
+        try {
+            await repoService.getRepository(remote.owner_id, remote.repo_name);
+            spinner.succeed('Remote repository verified');
+        } catch (error) {
+            spinner.fail('Remote repository not found or access denied');
+            throw error;
+        }
+
+        // Push commits
+        await syncCommitsToCloud(commitsToPush, remote.owner_id, remote.repo_name, branchName, cwd);
+
+        console.log(chalk.green(`\n✓ Successfully pushed to ${remoteName}/${branchName}`));
+
+    } catch (error) {
+        console.error(chalk.red('Failed to push'));
+        console.error(chalk.red('Error:'), error.message);
+        process.exit(1);
+    }
+}
+
+module.exports = push;

package/src/commands/remote.js

@@ -0,0 +1,133 @@
+/**
+ * Remote Command - Manage remote repositories
+ * Add, remove, and list remote repository configurations
+ */
+
+const chalk = require('chalk');
+const path = require('path');
+const ora = require('ora');
+const { getRemoteConfig, addRemote, removeRemote } = require('../utils/cloud-sync');
+const { GENT_DIR } = require('../utils/constants');
+const { pathExists } = require('../utils/fileSystem');
+const repoService = require('../services/repo-service');
+const authStorage = require('../utils/auth-storage');
+
+/**
+ * Manage remote repositories
+ * @param {string} action - Action to perform (add, remove, or list)
+ * @param {string} name - Remote name
+ * @param {string} url - Remote URL (owner_id/repo_name)
+ * @param {Object} options - Command options
+ */
+async function remote(action, name, url, options) {
+    try {
+        const cwd = process.cwd();
+        const gentPath = path.join(cwd, GENT_DIR);
+
+        // Check if in a gent repository
+        if (!(await pathExists(gentPath))) {
+            console.error(chalk.red('Error: Not a gent repository'));
+            console.log(chalk.yellow('Run'), chalk.cyan('gent init'), chalk.yellow('to initialize a repository'));
+            process.exit(1);
+        }
+
+        // List remotes (default action)
+        if (!action || action === 'list' || options.verbose) {
+            const config = await getRemoteConfig(cwd);
+            const remotes = Object.keys(config.remotes || {});
+
+            if (remotes.length === 0) {
+                console.log(chalk.yellow('No remotes configured'));
+                console.log(chalk.gray('Add a remote with:'), chalk.cyan('gent remote add <name> <owner_id>/<repo_name>'));
+                return;
+            }
+
+            console.log(chalk.cyan('Configured remotes:\n'));
+            for (const remoteName of remotes) {
+                const remote = config.remotes[remoteName];
+                if (options.verbose) {
+                    console.log(chalk.bold(remoteName));
+                    console.log(chalk.gray(`  Owner ID: ${remote.owner_id}`));
+                    console.log(chalk.gray(`  Repository: ${remote.repo_name}`));
+                    console.log(chalk.gray(`  URL: ${remote.owner_id}/${remote.repo_name}\n`));
+                } else {
+                    console.log(`${remoteName}\t${remote.owner_id}/${remote.repo_name}`);
+                }
+            }
+            return;
+        }
+
+        // Add remote
+        if (action === 'add') {
+            if (!name || !url) {
+                console.error(chalk.red('Error: Remote name and URL are required'));
+                console.log(chalk.yellow('Usage:'), chalk.cyan('gent remote add <name> <owner_id>/<repo_name>'));
+                process.exit(1);
+            }
+
+            // Parse owner_id/repo_name
+            const parts = url.split('/');
+            if (parts.length !== 2) {
+                console.error(chalk.red('Error: Invalid remote URL format'));
+                console.log(chalk.yellow('Expected:'), chalk.cyan('<owner_id>/<repo_name>'));
+                process.exit(1);
+            }
+
+            const ownerId = parseInt(parts[0]);
+            const repoName = parts[1];
+
+            if (isNaN(ownerId)) {
+                console.error(chalk.red('Error: Owner ID must be a number'));
+                process.exit(1);
+            }
+
+            // Check authentication
+            const user = await authStorage.getUser();
+            if (!user) {
+                console.error(chalk.red('Error: You must be logged in to add a remote'));
+                console.log(chalk.yellow('Run'), chalk.cyan('gent login'), chalk.yellow('to authenticate'));
+                process.exit(1);
+            }
+
+            // Verify repository exists
+            const spinner = ora('Verifying repository...').start();
+            try {
+                await repoService.getRepository(ownerId, repoName);
+                spinner.succeed('Repository verified');
+            } catch (error) {
+                spinner.fail('Repository not found or access denied');
+                throw error;
+            }
+
+            // Add remote
+            await addRemote(name, ownerId, repoName, cwd);
+            console.log(chalk.green(`✓ Remote '${name}' added: ${ownerId}/${repoName}`));
+            return;
+        }
+
+        // Remove remote
+        if (action === 'remove' || action === 'rm') {
+            if (!name) {
+                console.error(chalk.red('Error: Remote name is required'));
+                console.log(chalk.yellow('Usage:'), chalk.cyan('gent remote remove <name>'));
+                process.exit(1);
+            }
+
+            await removeRemote(name, cwd);
+            console.log(chalk.green(`✓ Remote '${name}' removed`));
+            return;
+        }
+
+        // Unknown action
+        console.error(chalk.red(`Error: Unknown action '${action}'`));
+        console.log(chalk.yellow('Available actions:'), chalk.cyan('add, remove, list'));
+        process.exit(1);
+
+    } catch (error) {
+        console.error(chalk.red('Failed to manage remote'));
+        console.error(chalk.red('Error:'), error.message);
+        process.exit(1);
+    }
+}
+
+module.exports = remote;

package/src/index.js

@@ -27,6 +27,14 @@ const loginCommand = require('./commands/login');
 const logoutCommand = require('./commands/logout');
 const whoamiCommand = require('./commands/whoami');
 
+// Import cloud repository commands
+const createCommand = require('./commands/create');
+const listCommand = require('./commands/list');
+const cloneCommand = require('./commands/clone');
+const pushCommand = require('./commands/push');
+const pullCommand = require('./commands/pull');
+const remoteCommand = require('./commands/remote');
+
 // Configure CLI
 program
     .name('gent')
@@ -38,6 +46,9 @@ program
     .command('init')
     .description('Initialize a new gent repository')
     .option('-y, --yes', 'Skip prompts and use defaults')
+    .option('--cloud', 'Create a corresponding cloud repository')
+    .option('-d, --description <description>', 'Repository description (for cloud)')
+    .option('-p, --private', 'Make cloud repository private')
     .action(initCommand);
 
 program
@@ -57,6 +68,7 @@ program
     .description('Record changes to the repository')
     .option('-m, --message <message>', 'Commit message')
     .option('-a, --all', 'Automatically stage all modified files')
+    .option('--push', 'Push to remote after commit')
     .action(commitCommand);
 
 program
@@ -103,6 +115,43 @@ program
     .description('Display current user information')
     .action(whoamiCommand);
 
+// Cloud repository commands
+program
+    .command('create <repo-name>')
+    .description('Create a new cloud repository')
+    .option('-d, --description <description>', 'Repository description')
+    .option('-p, --private', 'Make repository private')
+    .option('-y, --yes', 'Skip prompts and use defaults')
+    .option('--init-local', 'Initialize local repository and link remote')
+    .action(createCommand);
+
+program
+    .command('list')
+    .alias('ls')
+    .description('List all your cloud repositories')
+    .action(listCommand);
+
+program
+    .command('clone <repo-url> [directory]')
+    .description('Clone a cloud repository (format: owner_id/repo_name)')
+    .action(cloneCommand);
+
+program
+    .command('push [remote] [branch]')
+    .description('Push local commits to cloud')
+    .action(pushCommand);
+
+program
+    .command('pull [remote] [branch]')
+    .description('Pull commits from cloud to local')
+    .action(pullCommand);
+
+program
+    .command('remote [action] [name] [url]')
+    .description('Manage remote repositories')
+    .option('-v, --verbose', 'Show verbose output')
+    .action(remoteCommand);
+
 // Help command
 program
     .command('help [command]')