node-power-user 1.0.11 → 1.0.12

package/TODO.md

@@ -0,0 +1 @@
+Use "keychain" for something?

package/dist/commands/sync.js

@@ -18,23 +18,50 @@ module.exports = async function (options) {
     return false;
   }
 
-  // Collect answers using the new @inquirer/prompts methods
-  const message = await ask({
-    message: 'Enter a commit message',
-    default: 'Update',
-    value: options.message,
-    multiline: false,
-  });
-
-  // Define cleanup command
-  const command = `git pull && git add . && git commit -m "${message}" && git push origin`;
-
   // Log initial state
   logger.log(`Syncing repo...`);
 
   try {
-    // Run cleanup commands with the repository root as the working directory
-    await execute(command, {
+    // First, pull changes from remote
+    logger.log('Pulling changes from remote...');
+    const pullResult = await execute('git pull', {
+      log: false,
+      config: {cwd: repoRoot},
+    });
+
+    // Check if there were any changes pulled
+    const pullOutput = pullResult.stdout || '';
+    if (pullOutput.includes('Already up to date') || pullOutput.includes('Already up-to-date')) {
+      logger.log('Already up to date - no changes pulled');
+    } else {
+      // Try to extract the number of files changed
+      const filesChangedMatch = pullOutput.match(/(\d+) file[s]? changed/);
+      const insertionsMatch = pullOutput.match(/(\d+) insertion[s]?/);
+      const deletionsMatch = pullOutput.match(/(\d+) deletion[s]?/);
+
+      if (filesChangedMatch) {
+        const filesChanged = filesChangedMatch[1];
+        const insertions = insertionsMatch ? insertionsMatch[1] : '0';
+        const deletions = deletionsMatch ? deletionsMatch[1] : '0';
+        logger.log(logger.format.green(`Pulled changes: ${filesChanged} file(s) changed, ${insertions} insertion(s), ${deletions} deletion(s)`));
+      } else {
+        logger.log(logger.format.green('Changes pulled successfully'));
+      }
+    }
+
+    // Collect answers using the new @inquirer/prompts methods
+    const message = await ask({
+      message: 'Enter a commit message',
+      default: 'Update',
+      value: options.message,
+      multiline: false,
+    });
+
+    // Then, add, commit, and push changes
+    logger.log('Committing and pushing changes...');
+    const pushCommand = `git add . && git commit -m "${message}" && git push origin`;
+
+    await execute(pushCommand, {
       log: true,
       config: {cwd: repoRoot},
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-power-user",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Easy tools for every Node.js developer!",
   "main": "dist/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "start": "npm run prepare && ./bin/node-power-user",
     "help": "echo 'npm start -- -v'",
     "prepare": "node -e \"require('prepare-package')()\"",
-    "prepare:watch": "nodemon -w ./src -e '*' --exec 'npm run prepare'"
+    "prepare:watch": "node -e \"require('prepare-package/watch')()\""
   },
   "bin": {
     "npu": "bin/node-power-user",
@@ -36,16 +36,12 @@
     "replace": {}
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.4.1",
+    "@inquirer/prompts": "^7.9.0",
     "chalk": "^4.1.2",
     "cli-progress": "^3.12.0",
-    "fs-jetpack": "^4.3.1",
-    "inquirer": "^8.2.6",
+    "fs-jetpack": "^5.1.0",
     "itwcw-package-analytics": "^1.0.6",
-    "json5": "^2.2.3",
-    "keychain": "^1.5.0",
-    "lodash": "^4.17.21",
-    "node-powertools": "^2.2.0",
+    "node-powertools": "^2.3.1",
     "npm-api": "^1.0.1",
     "table": "^6.9.0",
     "wonderful-version": "^1.3.2",
@@ -53,6 +49,6 @@
   },
   "devDependencies": {
     "mocha": "^8.4.0",
-    "prepare-package": "^1.1.14"
+    "prepare-package": "^1.2.5"
   }
 }