ump 3.5.2 → 3.5.7

package/README.md

@@ -21,6 +21,7 @@ For programmatic use (i.e. requiring it as a module in a node.js script), instal
   * `-m`, `--message`:      Message to be used for the commit and tag when `-r` or `-p` is set. Default: Release %s
   * `-r`, `--release`:      If set, runs `git add` and `git commit` for the bumped files and pushes a tagged release.
   * `-p`, `--publish`:      If set, automatically runs with the `--release` flag and then publishes the release to npm.
+  * `-o`, `--otp`:          One-time password for 2FA authentication when publishing to npm.
   * `-a`, `--autostash`:    Default: `true`. Whether to use the `--autostash` flag when running `git pull`
   * `-x`, `--skip-pull`:    If set, skips executing the initial git pull command during a release/publish task. USE WITH CAUTION.
   * `-t`, `--tag-prefix`:   Optional prefix for the version in git tag. (e.g. With `--message "Release %s" --tag-prefix version`, The tag might look like "version 1.2.3" and its commit message "Release version 1.2.3")

package/lib/1password.js

@@ -0,0 +1,27 @@
+import sdk from '@1password/sdk';
+
+
+export const has1PasswordVars = () => {
+  return process.env.OP_NPM_VAULT_ID && process.env.OP_NPM_ITEM_ID && process.env.OP_SERVICE_ACCOUNT_TOKEN;
+};
+
+// Creates an authenticated client.
+export const getTotp = async() => {
+  const vaultId = process.env.OP_NPM_VAULT_ID;
+  const itemId = process.env.OP_NPM_ITEM_ID;
+
+  const client = await sdk.createClient({
+    auth: process.env.OP_SERVICE_ACCOUNT_TOKEN,
+  // Set the following to your own integration name and version.
+    integrationName: 'ump',
+    integrationVersion: 'v1.0.0',
+  });
+
+  const item = await client.items.get(vaultId, itemId);
+
+  let field = item.fields.find((element) => {
+    return element.fieldType === sdk.ItemFieldType.Totp;
+  });
+
+  return field.details.content?.code;
+};

package/lib/commands.js

@@ -7,6 +7,7 @@ import childProcess from 'child_process';
 import {utils, peach} from './utils.js';
 import {config} from './config.js';
 import {log} from './log.js';
+import {has1PasswordVars, getTotp} from './1password.js';
 
 const exec = promisify(childProcess.exec);
 
@@ -19,7 +20,7 @@ const getFlags = (obj) => {
 
     return ` --${key} ${val}`;
   })
-  .filter((_) => !!_)
+  .filter(Boolean)
   .join('');
 };
 
@@ -163,18 +164,30 @@ const commands = {
           throw new Error('Skipping execution');
         }
 
-        if (lines.length) {
-          console.log(lines);
-          utils.error(`Git working directory not clean:\n\t${lines.join('\n\t')}`);
-        }
+        // if (lines.length) {
+        //   console.log(lines);
+        //   utils.error(`Git working directory not clean:\n\t${lines.join('\n\t')}`);
+        // }
 
         try {
-          const ret = await peach(releaseSteps, (command) => {
+          const ret = await peach(releaseSteps.slice(-1), (command) => {
             return exec(command)
             .then(() => {
               log.color(`Executed ${command}`, 'cyan');
             })
-            .catch(utils.error);
+            .catch(async(err) => {
+              console.log('npm publish?', command.includes('npm publish'));
+              console.log('npm error code EOTP?', err.message.includes('npm error code EOTP'));
+              console.log('has1PasswordVars?', has1PasswordVars());
+
+              if (command.includes('npm publish') && err.message.includes('npm error code EOTP') && has1PasswordVars()) {
+                const flags = getFlags(opts.publishFlags);
+                const oneTimePassword = await getTotp();
+
+                return exec(`npm publish${flags} --otp=${oneTimePassword}`);
+              }
+              utils.error(err);
+            });
           });
 
           return ret;

package/lib/config.js

@@ -86,6 +86,11 @@ Object.assign(config, {
       description: 'If set, automatically runs with the `--release` flag and then publishes the release to npm.',
       type: 'boolean',
     },
+    o: {
+      alias: 'otp',
+      description: 'One-time password for 2FA authentication when publishing to npm.',
+      type: 'string',
+    },
     a: {
       alias: 'autostash',
       description: 'Whether to use the --autostash flag when running `git pull`',

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "ump",
   "title": "ump",
-  "version": "3.5.2",
+  "version": "3.5.7",
   "description": "Bump without the B",
   "scripts": {
     "test": "npm run test:clean && npm run test:pre && npm run test:run",
     "test:clean": "rm -rf ./test/testarea",
     "test:pre": "npm run lint && mkdir -p \"./test/testarea\"",
-    "test:run": "node_modules/.bin/mocha --delay --reporter spec",
+    "test:run": "mocha --delay --reporter spec",
     "lint": "eslint *.js bin lib test"
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:kswedberg/ump.git"
+    "url": "git+ssh://git@github.com/kswedberg/ump.git"
   },
   "type": "module",
   "main": "ump.js",
@@ -28,23 +28,24 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@inquirer/confirm": "^5.1.16",
-    "@inquirer/select": "^4.3.2",
-    "chalk": "^5.6.0",
-    "fs-extra": "^11.3.1",
+    "@1password/sdk": "^0.3.1",
+    "@inquirer/confirm": "^6.0.3",
+    "@inquirer/select": "^5.0.3",
+    "chalk": "^5.6.2",
+    "fs-extra": "^11.3.2",
     "git-config": "^0.0.7",
-    "glob": "^11.0.3",
+    "glob": "^13.0.0",
     "rc": "^1.2.8",
-    "semver": "^7.7.2",
+    "semver": "^7.7.3",
     "update-notifier": "^7.3.1",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "chai": "^6.0.1",
-    "eslint": "^9.34.0",
-    "eslint-config-kswedberg": "^7.2.0",
-    "mocha": "^11.7.1"
+    "chai": "^6.2.1",
+    "eslint": "^9.39.2",
+    "eslint-config-kswedberg": "^7.2.2",
+    "mocha": "^11.7.5"
   },
   "license": "MIT"
 }

package/ump.js

@@ -39,9 +39,14 @@ const ump = async function(options) {
   }
 
 
+  opts.publishFlags = {};
+
+  if (opts.otp) {
+    opts.publishFlags.otp = opts.otp;
+  }
+
   // opts.inquire is set to true automatically for CLI usage
   if (opts.publish && opts.inquire && config.pkgName.startsWith('@')) {
-    opts.publishFlags = {};
     if (opts.access) {
       config.publishPrompt.default = opts.access;
     }