ump 3.0.0 → 3.1.1

package/bin/ump.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import('../lib/notifier.js');
-import yarg from 'yargs/yargs.js';
+import yarg from 'yargs';
 import ump from '../ump.js';
 import {config} from '../lib/config.js';
 

package/lib/commands.js

@@ -29,13 +29,13 @@ const commands = {
     // Need to pull before mucking with files, so we can stop it if git branch isn't clean.
     // Otherwise files will be bumped and committed but not pushed and things will get messed up.
     // **We can autostash on pull because we handle existence of uncommitted files later
-    const pullRebase = 'git pull --rebase --autostash';
+    const pullAutostash = 'git pull --autostash';
 
     return {
-      log: pullRebase,
+      log: pullAutostash,
       cmd: function() {
 
-        return exec(pullRebase)
+        return exec(pullAutostash)
         .then(({stdout, stderr}) => {
           console.log(stdout);
 
@@ -128,7 +128,7 @@ const commands = {
         let lines = [];
 
         try {
-          await fs.readFile(path.resolve('./', '.git/config'));
+          await utils.checkGitConfig(path.resolve('./', '.git'));
         } catch (err) {
           utils.error(err);
         }

package/lib/utils.js

@@ -3,7 +3,8 @@
 import path from 'path';
 import childProcess from 'child_process';
 import Promises from 'bluebird';
-import fs from 'fs-extra';
+import fs from 'fs';
+import util from 'util';
 import glob from 'glob';
 import chalk from 'chalk';
 import rc from 'rc';
@@ -11,7 +12,9 @@ import semver from 'semver';
 import {config} from './config.js';
 import {log} from './log.js';
 
-const exec = Promises.promisify(childProcess.exec);
+const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+const stat = util.promisify(fs.stat);
 
 const utils = {
   getDirName(url) {
@@ -27,6 +30,24 @@ const utils = {
     return str;
 
   },
+  async checkGitConfig(gitPath) {
+    const gitDirOrFile = await stat(gitPath);
+
+    if (gitDirOrFile.isDirectory()) {
+      await readFile(`${gitPath}/config`);
+
+      return;
+    }
+
+    // If we're in a submodule, the .git path will be a file that contains a 'gitdir: …' entry
+    const contents = await readFile(gitPath, 'utf8');
+    const content = contents.split(/\n/)[0];
+    const gitdir = content.replace(/^\s*gitdir:\s*(.+)$/, '$1');
+
+    const gitConfig = path.resolve(`${gitdir}/config`);
+
+    await readFile(gitConfig);
+  },
 
   getFiles(items) {
     const files = items ? [].concat(items) : ['package.json'];
@@ -49,12 +70,17 @@ const utils = {
   },
 
   async readJSON(file) {
+    const filePath = path.resolve(process.cwd(), file);
+
     try {
-      const json = await fs.readJson(path.resolve(process.cwd(), file));
+      const str = await readFile(filePath, 'utf8');
+      const json = JSON.parse(str);
 
       return json;
     } catch (err) {
-      return {};
+      console.log(err);
+
+      return {error: true};
     }
   },
 
@@ -115,7 +141,7 @@ const utils = {
     const debugOutput = JSON.stringify(obj, null, 2);
     const file = '.ump.debug.json';
 
-    return fs.writeFile(file, debugOutput)
+    return writeFile(file, debugOutput)
     .then(() => {
       log.color(`\n**DEBUG ONLY! Writing the following to ${file}:**`, 'cyan');
       console.log(debugOutput);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ump",
   "title": "ump",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "Bump without the B",
   "scripts": {
     "test": "npm run test:clean && npm run test:pre && npm run test:run",
@@ -39,8 +39,8 @@
     "rc": "^1.2.8",
     "semver": "^7.3.5",
     "snyk": "^1.812.0",
-    "update-notifier": "^5.1.0",
-    "yargs": "^13.3.2"
+    "update-notifier": "^6.0.2",
+    "yargs": "^17.3.1"
   },
   "devDependencies": {
     "chai": "^4.3.4",