jvcs 1.0.1 → 1.0.3

package/controllers/push.js

@@ -1,135 +1,145 @@
-const fs = require("fs");
-const fsPromises = require("fs").promises;
-const path = require("path");
-const chalk = require("chalk");
-const { drive } = require("../config/drive-config");
-const saveData = require("../controllers/saveData");
-const { checkInitialization, checkRepoExists, getCLIConfig } = require("./utils");
-
-async function pushCmd(reponame) {
-    try {
-        if (!checkInitialization()) return;
-        if (!checkRepoExists(reponame)) return;
+const fs = require("fs")
+const path = require("path")
+const chalk = require("chalk")
+const { drive } = require("../config/drive-config")
+const { getGlobalConfig, checkGlobalConfig, checkforjvcs } = require("./utility")
+const getDirectoryStructure = require("./driveUtility")
 
-        const repoPath = path.join(process.cwd(), `.${reponame}`);
-        const commitFolder = path.join(repoPath, "commits");
+async function uploadFile(localFile, parentId) {
 
-        const config = await getCLIConfig();
-        if (!config) return console.log(chalk.red("Could not read CLI configuration."));
+    try {
 
-        console.log(chalk.blue("Pushing commits for user:"), chalk.green(config.username));
+        const fileName = path.basename(localFile)
+        const fileMetaData = {
+            name: fileName,
+            parents: [parentId]
+        }
 
-        // Check commits locally
-        const commitDirs = await fsPromises.readdir(commitFolder);
-        if (!commitDirs.length) {
-            console.log(chalk.yellow("⚠ No commits to push."));
-            return;
+        const media = {
+            mimeType: "application/octet-stream",
+            body: fs.createReadStream(localFile),
         }
 
-        // Ensure user folder exists in Google Drive
-        let userFolderId;
-        const userFolderRes = await drive.files.list({
-            q: `name='${config.username}' and '1ahuoMCN_Ls5kGF2KPUGLbRZb9kGVMe0V' in parents and mimeType='application/vnd.google-apps.folder' and trashed=false`,
-            fields: "files(id, name)"
-        });
+        const res = await drive.files.create({
+            resource: fileMetaData,
+            media,
+            fields: "id"
+        })
+
+        console.log(chalk.gray(`   ↳ Uploaded: ${fileName}`));
+        return res.data.id;
+    }
+    catch(error) {
+        console.log(chalk.red(`Failed to upload ${filePath}: ${err.message}`));
+    }
+}
+
+async function uploadDirectory(localDir, parentId) {
+
+    const entries = fs.readdirSync(localDir, {withFileTypes: true})
+
+    for(const entry of entries) {
+
+        const entryPath = path.join(localDir,entry.name)
+
+        if(entry.isDirectory()) {
+            const folderMeta = {
+                name: entry.name,
+                mimeType: "application/vnd.google-apps.folder",
+                parents: [parentId],
+            }
 
-        if (userFolderRes.data.files.length) {
-            userFolderId = userFolderRes.data.files[0].id;
-        } else {
             const folder = await drive.files.create({
-                requestBody: {
-                    name: config.username,
-                    mimeType: "application/vnd.google-apps.folder",
-                    parents: ["1ahuoMCN_Ls5kGF2KPUGLbRZb9kGVMe0V"]
-                },
-                fields: "id, name"
-            });
-            userFolderId = folder.data.id;
-            console.log(chalk.green(`Created user folder in Drive.`));
+                resource: folderMeta,
+                fields: "id"
+            })
+
+            await uploadDirectory(entryPath,folder.data.id)
+        }
+        else {
+            await uploadFile(entryPath,parentId)
         }
+    }
+}
 
-        // Ensure repo folder exists
-        let repoFolderId;
-        const repoFolderRes = await drive.files.list({
-            q: `name='${reponame}' and '${userFolderId}' in parents and mimeType='application/vnd.google-apps.folder' and trashed=false`,
-            fields: "files(id, name)"
-        });
+async function pushCmd() {
 
-        if (repoFolderRes.data.files.length) {
-            repoFolderId = repoFolderRes.data.files[0].id;
-        } else {
-            const folder = await drive.files.create({
-                requestBody: {
-                    name: reponame,
-                    mimeType: "application/vnd.google-apps.folder",
-                    parents: [userFolderId]
-                },
-                fields: "id, name"
-            });
-            repoFolderId = folder.data.id;
-            console.log(chalk.green(`Created repo folder '${reponame}' in Drive.`));
+    try {
+
+        if(!checkGlobalConfig()) {
+            console.log(chalk.red("No existing session found. Please login or signup."))
+            console.log(chalk.green("jvcs --help for help"))
+            return
+        }
+
+        let configData = getGlobalConfig()
+
+        if(!configData) {
+            console.log(chalk.red("No existing session found. Please login or signup."))
+            console.log(chalk.green("jvcs --help for help"))
+            return
+        }
+        
+        if(!checkforjvcs()) {
+            console.log(chalk.red("Repository is not initialized or is deleted. Please create it."))
+            return
         }
+        
+        const cwd = process.cwd()
+        const jvcsDir = path.join(cwd,".jvcs")
+        const commitDir = path.join(jvcsDir,"commits")
+        const reponame = path.basename(process.cwd())
+
+        if(!fs.existsSync(commitDir)) {
+            console.log(chalk.yellow("No commits to push"))
+            return
+        }
+
+        // storing the name of commit folders
+        const commitFolders = fs.readdirSync(commitDir, {withFileTypes: true}).filter((e)=> e.isDirectory()).map((e)=> e.name)
+        if(commitFolders.length === 0) {
+            console.log(chalk.yellow('No commits to push'))
+            return
+        }
+
+        console.log(chalk.blue("Pushing commits of ",reponame," to cloud storage..."))
 
-        // List existing commits in Drive
-        const driveCommitsRes = await drive.files.list({
-            q: `'${repoFolderId}' in parents and mimeType='application/vnd.google-apps.folder' and trashed=false`,
-            fields: "files(name, id)"
-        });
-        const driveCommitNames = driveCommitsRes.data.files.map(f => f.name);
-
-        // Upload commits
-        for (const commitDir of commitDirs) {
-            if (driveCommitNames.includes(commitDir)) {
-                console.log(chalk.yellow(`Commit '${commitDir}' already exists on Drive, skipping.`));
+        for(const commitId of commitFolders) {
+
+            const commitFolder = path.join(commitDir,commitId)
+            const metaPath = path.join(commitFolder,"meta.json")
+
+            if(!fs.existsSync(metaPath)) {
+                console.log(chalk.yellow(`Skipping ${commitId} (no meta.json found)`));
                 continue;
             }
 
-            const folderPath = path.join(commitFolder, commitDir);
+            const metaData = JSON.parse(fs.readFileSync(metaPath,"utf-8"))
+            const { author, message, timeStamp } = metaData;
 
-            const commitFolderRes = await drive.files.create({
-                requestBody: {
-                    name: commitDir,
-                    mimeType: "application/vnd.google-apps.folder",
-                    parents: [repoFolderId]
-                },
-                fields: "id, name"
-            });
-            const commitFolderId = commitFolderRes.data.id;
+            console.log(chalk.green(`\n Uploading commit:`));
+            console.log(chalk.gray(`   id: ${commitId}`));
+            console.log(chalk.gray(`   message: ${message}`));
+            console.log(chalk.gray(`   author: ${author}`));
+            console.log(chalk.gray(`   time: ${timeStamp}`));
 
-            await uploadFolder(folderPath, commitFolderId);
+            const { commitFolderId : driveCommitId , commitAlreadyExists } = await getDirectoryStructure(configData.username,reponame,commitId)
+            
+            if (commitAlreadyExists) {
+                console.log(chalk.yellow(`Skipping ${commitId} (already uploaded)`));
+                continue;
+            }
 
-            console.log(chalk.green(`Commit '${commitDir}' pushed successfully.`));
+            await uploadDirectory(commitFolder,driveCommitId)
+            console.log(chalk.green(`Commit ${commitId} uploaded successfully!`));
         }
-
-    } catch(error) {
-        console.log(chalk.red("Error in pushCmd:"), error.message);
+        
+        console.log(chalk.bold.green("\nAll commits pushed successfully!"));
     }
-}
-
-// Helper to recursively upload folder to Drive
-async function uploadFolder(folderPath, parentId) {
-    const items = await fsPromises.readdir(folderPath);
-    for (const item of items) {
-        const fullPath = path.join(folderPath, item);
-        const stats = await fsPromises.stat(fullPath);
-        if (stats.isDirectory()) {
-            const folder = await drive.files.create({
-                requestBody: {
-                    name: item,
-                    mimeType: "application/vnd.google-apps.folder",
-                    parents: [parentId]
-                },
-                fields: "id, name"
-            });
-            await uploadFolder(fullPath, folder.data.id);
-        } else {
-            await drive.files.create({
-                requestBody: { name: item, parents: [parentId] },
-                media: { body: fs.createReadStream(fullPath) },
-                fields: "id, name"
-            });
-        }
+    catch(error) {
+        console.log(chalk.red.bold("\nPush Failed"));
+        console.error(chalk.red(error.stack || error.message || error));
     }
 }
 
-module.exports = pushCmd;
+module.exports = pushCmd

package/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const yargs = require("yargs");
 const { hideBin } = require("yargs/helpers");
@@ -11,7 +11,9 @@ const initCmd = require("./controllers/init")
 const addCmd = require("./controllers/add")
 const commitCmd = require("./controllers/commit")
 const unstageCmd = require("./controllers/unstage")
-const logCmd = require("./controllers/log")
+const logCmd = require("./controllers/log");
+const pushCmd = require("./controllers/push");
+
 
 yargs(hideBin(process.argv))
 .scriptName("jvcs")
@@ -126,6 +128,19 @@ yargs(hideBin(process.argv))
         }
     }
 )
+.command(
+    "push",
+    "Push all the commits to remote",
+    {},
+    async ()=> {
+        try {
+            await pushCmd()
+        }
+        catch(error) {
+            console.log(chalk.red(error))
+        }
+    }
+)
 .demandCommand(1, chalk.yellow("You need at least one command"))
 .help()
 .parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jvcs",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "bin": {
     "jvcs": "./index.js"
   },

package/.jvcs/commits/292abee1-42ea-4ddf-b590-be7c98abaf45/jvcs_hashcode.json

@@ -1 +0,0 @@
-{}

package/.jvcs/commits/292abee1-42ea-4ddf-b590-be7c98abaf45/meta.json

@@ -1,7 +0,0 @@
-{
-  "author": "jagdish",
-  "id": "292abee1-42ea-4ddf-b590-be7c98abaf45",
-  "message": "commit 4",
-  "timeStamp": "2025-10-27T15:14:00.695Z",
-  "parentId": "302af5ea-5789-4ee9-98fe-eab9308b2e27"
-}

package/.jvcs/commits/302af5ea-5789-4ee9-98fe-eab9308b2e27/jvcs_hashcode.json

@@ -1 +0,0 @@
-{}

package/.jvcs/commits/302af5ea-5789-4ee9-98fe-eab9308b2e27/meta.json

@@ -1,7 +0,0 @@
-{
-  "author": "jagdish",
-  "id": "302af5ea-5789-4ee9-98fe-eab9308b2e27",
-  "message": "commit 3",
-  "timeStamp": "2025-10-27T15:13:40.822Z",
-  "parentId": "484ac37d-c1a9-4ddd-8796-6e3facda1e11"
-}

package/.jvcs/commits/376d44d4-c595-429e-b711-ae6ec7c9ef74/jvcs_hashcode.json

@@ -1 +0,0 @@
-{}

package/.jvcs/commits/376d44d4-c595-429e-b711-ae6ec7c9ef74/meta.json

@@ -1,7 +0,0 @@
-{
-  "author": "jagdish",
-  "id": "376d44d4-c595-429e-b711-ae6ec7c9ef74",
-  "message": "commit 5",
-  "timeStamp": "2025-10-27T15:14:03.635Z",
-  "parentId": "292abee1-42ea-4ddf-b590-be7c98abaf45"
-}

package/.jvcs/commits/484ac37d-c1a9-4ddd-8796-6e3facda1e11/controllers/add.js

@@ -1,122 +0,0 @@
-const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility")
-const path = require("path")
-const fssync = require("fs")
-const chalk = require("chalk")
-const fs = require("fs").promises
-const crypto = require("crypto")
-
-async function getFileHash(filepath) {
-    const buffer = await fs.readFile(filepath)
-    return crypto.createHash("sha256").update(buffer).digest("hex")
-}
-
-async function hashDirectoryRecursive(dir,hashData) {
-
-    const entries = await fs.readdir(dir, {withFileTypes: true})
-    console.log(entries)
-
-    for(const entry of entries) {
-
-        const fullPath = path.join(dir,entry.name)
-        const relativePath = path.relative(process.cwd(),fullPath)
-
-        if(entry.isFile()) {
-            const hash = await getFileHash(fullPath)
-            hashData[relativePath] = {
-                hash,
-                time: new Date().toISOString(),
-            }
-        }
-        else if(entry.isDirectory()) {
-            await hashDirectoryRecursive(fullPath,hashData)
-        }
-    }
-}
-
-async function addCmd(paths) {
-    
-    if(!paths || paths.length === 0) {
-        console.log(chalk.yellow("Please specify files or folders to add."));
-        return
-    }  
-
-    if(!checkGlobalConfig()) {
-        console.log(chalk.red("No existing session found. Please login or signup."))
-        console.log(chalk.green("jvcs --help for help"))
-        return
-    }
-        
-    let configData = getGlobalConfig()
-        
-    if(!configData) {
-        console.log(chalk.red("No existing session found. Please login or signup."))
-        console.log(chalk.green("jvcs --help for help"))
-        return
-    }
-
-    if(!checkforjvcs()) {
-        console.log(chalk.red("Repository is not initialized or is deleted. Please create it."))
-        return
-    }
-
-    const repoPath = path.join(process.cwd(),".jvcs")
-    const staging = path.join(repoPath,"staging")
-
-    if(!fssync.existsSync(staging)) 
-    fssync.mkdirSync(staging, {recursive: true})
-
-    const hashPath = path.join(staging,"jvcs_hashcode.json")
-    let hashData = {}
-
-    if(fssync.existsSync(hashPath)) {
-        hashData = JSON.parse(await fs.readFile(hashPath,"utf-8"))
-    }
-
-    let targets = []
-    if(paths.length === 1 && paths[0] === ".") {
-        targets = await fs.readdir(process.cwd(),{withFileTypes: true})
-        targets = targets.filter((target)=> target.name !== ".jvcs").map((item)=> path.resolve(process.cwd(),item.name))
-    }
-    else {
-        targets = paths.map((p)=> path.resolve(process.cwd(),p))
-    }
-
-    // copying the files and folders to staging area
-    for(const target of targets) {
-
-        try {
-
-            if(!fssync.existsSync(target)) {
-                console.log(chalk.red(`Path not found: ${target}`))
-                continue
-            }
-    
-            const destination = path.join(staging,path.relative(process.cwd(),target))
-            await fs.mkdir(path.dirname(destination), {recursive: true})
-    
-            const stats = await fs.stat(target)
-    
-            if(stats.isFile()) {
-                await fs.copyFile(target,destination)
-                const hash = await getFileHash(target)
-                hashData[path.relative(process.cwd(),target)] = {
-                    hash,
-                    time: new Date().toISOString(),
-                }
-                console.log(chalk.green(`Added file: ${path.relative(process.cwd(), target)}`));
-            }
-            else if(stats.isDirectory()) {
-                await fs.cp(target,destination,{recursive: true})
-                await hashDirectoryRecursive(target,hashData)
-                console.log(chalk.cyan(`Added folder: ${path.relative(process.cwd(), target)}`));
-            }
-        }
-        catch(error) {
-            console.log(chalk.red(`Unexpected error: ${error.message}`));
-        }
-    }
-
-    await fs.writeFile(hashPath, JSON.stringify(hashData, null, 2));
-}
-
-module.exports = addCmd

package/.jvcs/commits/484ac37d-c1a9-4ddd-8796-6e3facda1e11/controllers/begin.js

@@ -1,201 +0,0 @@
-const inquirer = require("inquirer");
-const chalk = require("chalk");
-const validator = require("validator");
-const signup = require("./signup")
-const login = require("./login")
-const path = require("path")
-const fs = require("fs")
-
-
-
-async function beginCmd() {
-
-    const config = path.join(require("os").homedir(),".jvcs","config.json")
-    let isInitialized = false
-    let configData = null
-    if(fs.existsSync(config)) {
-        isInitialized = true
-        configData = JSON.parse(fs.readFileSync(config,"utf-8"))
-    }
-    
-    if (isInitialized) {
-        console.log(chalk.green(`You are already logged in as ${configData.username} (${configData.email})`))
-        console.log(chalk.yellow(`[1] Continue \n[2] Logout \nChoose an option (1/2) : `))
-
-        const answer = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'choice',
-                validate: function (input) {
-                    if (input === "1" || input === "2")
-                        return true
-
-                    return "Please enter 1 or 2"
-                },
-                filter: function (input) {
-                    return input.trim()
-                }
-            }
-        ])
-
-        console.log(`Your choice was ${answer.choice}`)
-        if (answer.choice === "1") {
-            console.log(chalk.green("Continuing as current user..."))
-            console.log(chalk.green("jvcs --help for help"))
-        }
-        else {
-            console.log(chalk.green("logging out..."))
-            fs.unlinkSync(config)
-            console.log(chalk.green("Logged out Successfully"))
-            console.log(chalk.green("Please login or signup again (jvcs begin) to use version control system"))
-            console.log(chalk.green("jvcs --help for help"))
-        }
-
-        return
-    }
-
-    console.log(chalk.red("No existing session found. Please login or signup."))
-    console.log(chalk.yellow(`[1] Signup \n[2] login \nChoose an option (1/2) : `))
-
-    const answer = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'choice',
-            validate: function (input) {
-
-                if (input === "1" || input === "2")
-                    return true
-
-                return "Please enter 1 or 2"
-            },
-            filter: function (input) {
-                return input.trim(); // optional: remove whitespace
-            }
-        }
-    ])
-
-    if (answer.choice === "1") {
-
-        const signupData = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'username',
-                filter: function (input) {
-                    return input.trim()
-                }
-            },
-            {
-                type: 'input',
-                name: 'email',
-                validate: function (input) {
-                    // validate email
-                    if (validator.isEmail(input))
-                        return true
-
-                    return "Please enter an valid email"
-                },
-                filter: function (input) {
-                    return input.trim()
-                }
-            },
-            {
-                type: 'password',
-                name: 'password',
-                validate: function (input) {
-                    // validate password
-                    if (validator.isStrongPassword(input, {
-                        minLength: 8,
-                        maxLength: 20,
-                        minLowercase: 1,
-                        minUppercase: 1,
-                        minNumbers: 1,
-                        minSymbols: 1,
-                    }))
-                        return true
-
-                    return "Please enter a strong password"
-                },
-                filter: function (input) {
-                    return input.trim()
-                }
-            },
-            {
-                type: 'password',
-                name: 'confirmPassword',
-                validate: function (input, answers) {
-                    if (answers.password !== input)
-                        return "password must be same as above"
-
-                    return true
-                },
-                filter: function (input) {
-                    return input.trim()
-                }
-            }
-        ])
-
-        try {
-            await signup(signupData)
-        }
-        catch (error) {
-            console.log(chalk.red(error))
-        }
-    }
-    else {
-
-        const loginData = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'username',
-                filter: function (input) {
-                    return input.trim()
-                },
-                validate: function (input) {
-                    if (input === "")
-                        return "email cannot be empty"
-
-                    return true
-                }
-            },
-            {
-                type: 'input',
-                name: 'email',
-                filter: function (input) {
-                    return input.trim()
-                },
-                validate: function (input) {
-                    if (!validator.isEmail(input))
-                        return "email is not valid"
-
-                    if (input === "")
-                        return "email cannot be empty"
-
-                    return true
-                }
-            },
-            {
-                type: 'password',
-                name: 'password',
-                filter: function (input) {
-                    return input.trim()
-                },
-                validate: function (input) {
-
-                    if (input === "")
-                        return "password cannot be empty"
-
-                    return true
-                }
-            }
-        ])
-
-        try {
-            await login(loginData)
-        }
-        catch (error) {
-            console.log(chalk.red(error))
-        }
-    }
-}
-
-module.exports = beginCmd