release-it 14.11.4 → 14.11.7

package/README.md

@@ -321,7 +321,7 @@ While mostly used as a CLI tool, release-it can be used as a dependency to integ
 - [blockchain/blockchain-wallet-v4-frontend](https://github.com/blockchain/blockchain-wallet-v4-frontend)
 - [callstack/linaria](https://github.com/callstack/linaria)
 - [ember-cli/ember-cli](https://github.com/ember-cli/ember-cli)
-  [react-native-paper](https://github.com/callstack/react-native-paper)
+- [react-native-paper](https://github.com/callstack/react-native-paper)
 - [js-cookie/js-cookie](https://github.com/js-cookie/js-cookie)
 - [mirumee/saleor](https://github.com/mirumee/saleor)
 - [mozilla/readability](https://github.com/mozilla/readability)

package/lib/plugin/GitBase.js

@@ -99,7 +99,7 @@ class GitBase extends Plugin {
     const sha = await this.exec(`git rev-list ${latestTag || '--skip=1'} --tags --max-count=1`, {
       options
     });
-    return this.exec(`git describe --tags --abbrev=0 ${sha}^`, { options }).catch(() => null);
+    return this.exec(`git describe --tags --abbrev=0 "${sha}^"`, { options }).catch(() => null);
   }
 }
 

package/lib/plugin/git/Git.js

@@ -1,6 +1,6 @@
 const { EOL } = require('os');
 const _ = require('lodash');
-const findUp = require('find-up');
+const execa = require('execa');
 const { format, e } = require('../../util');
 const GitBase = require('../GitBase');
 const prompts = require('./prompts');
@@ -12,6 +12,12 @@ const fixArgs = args => (args ? (typeof args === 'string' ? args.split(' ') : ar
 
 const docs = 'https://git.io/release-it-git';
 
+const isGitRepo = () =>
+  execa('git', ['rev-parse', '--git-dir']).then(
+    () => true,
+    () => false
+  );
+
 class Git extends GitBase {
   constructor(...args) {
     super(...args);
@@ -19,7 +25,7 @@ class Git extends GitBase {
   }
 
   static async isEnabled(options) {
-    return options !== false && (await findUp('.git', { type: 'directory' }));
+    return options !== false && (await isGitRepo());
   }
 
   async init() {

package/lib/plugin/github/GitHub.js

@@ -22,7 +22,7 @@ const parseErrormsg = err => {
   let msg = err;
   if (err instanceof Error) {
     const { status, message } = err;
-    const { headers } = err.response;
+    const headers = err.response ? err.response.headers : {};
     msg = `${_.get(headers, 'status', status)} (${message})`;
   }
   return msg;
@@ -308,7 +308,7 @@ class GitHub extends Release {
 
   async createWebRelease() {
     const { isCI } = this.config;
-    const { tagName } = this.getContext();
+    const { tagName } = this.config.getContext();
     const url = this.generateWebUrl();
     if (isCI) {
       this.setContext({ isReleased: true, releaseUrl: url });

package/lib/tasks.js

@@ -65,7 +65,7 @@ const runTasks = async (opts, di) => {
 
     const name = await reduceUntil(plugins, plugin => plugin.getName());
     const latestVersion = (await reduceUntil(plugins, plugin => plugin.getLatestVersion())) || '0.0.0';
-    const changelog = await reduceUntil(plugins, plugin => plugin.getChangelog(latestVersion));
+    const changelog = await reduceUntil(plugins, plugin => plugin.getChangelog());
 
     const incrementBase = { latestVersion, increment, isPreRelease, preReleaseId };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "14.11.4",
+  "version": "14.11.7",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -58,20 +58,19 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@octokit/rest": "18.9.0",
-    "async-retry": "1.3.1",
+    "@octokit/rest": "18.10.0",
+    "async-retry": "1.3.3",
     "chalk": "4.1.2",
-    "cosmiconfig": "7.0.0",
+    "cosmiconfig": "7.0.1",
     "debug": "4.3.2",
     "deprecated-obj": "2.0.0",
     "execa": "5.1.1",
-    "find-up": "5.0.0",
     "form-data": "4.0.0",
-    "git-url-parse": "11.5.0",
+    "git-url-parse": "11.6.0",
     "globby": "11.0.4",
     "got": "11.8.2",
     "import-cwd": "3.0.0",
-    "inquirer": "8.1.2",
+    "inquirer": "8.1.5",
     "is-ci": "3.0.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.32",
@@ -95,14 +94,14 @@
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-ava": "12.0.0",
-    "eslint-plugin-import": "2.24.0",
+    "eslint-plugin-import": "2.24.2",
     "eslint-plugin-prettier": "3.4.0",
     "markdown-toc": "1.2.0",
-    "mock-fs": "5.0.0",
+    "mock-fs": "5.1.0",
     "mock-stdio": "1.0.3",
-    "nock": "13.1.1",
+    "nock": "13.1.3",
     "nyc": "15.1.0",
-    "prettier": "2.3.2",
+    "prettier": "2.4.1",
     "proxyquire": "2.1.3",
     "sinon": "11.1.2",
     "strip-ansi": "6.0.0"

package/test/github.js

@@ -117,8 +117,8 @@ test('should update release and upload assets', async t => {
   const github = factory(GitHub, { options });
   const exec = sinon.stub(github.shell, 'exec').callThrough();
   exec.withArgs('git describe --tags --match=* --abbrev=0').resolves('2.0.1');
-  exec.withArgs('git rev-list 2.0.1 --tags --max-count=1').resolves('71f1812');
-  exec.withArgs('git describe --tags --match=* --abbrev=0 71f1812').resolves('2.0.1');
+  exec.withArgs('git rev-list 2.0.1 --tags --max-count=1').resolves('a123456');
+  exec.withArgs('git describe --tags --abbrev=0 "a123456^"').resolves('2.0.1');
 
   interceptAuthentication();
   interceptCollaborator();
@@ -150,8 +150,8 @@ test('should create new release for unreleased tag', async t => {
   const github = factory(GitHub, { options });
   const exec = sinon.stub(github.shell, 'exec').callThrough();
   exec.withArgs('git describe --tags --match=* --abbrev=0').resolves('2.0.1');
-  exec.withArgs('git rev-list 2.0.1 --tags --max-count=1').resolves('71f1812');
-  exec.withArgs('git describe --tags --match=* --abbrev=0 71f1812').resolves('2.0.1');
+  exec.withArgs('git rev-list 2.0.1 --tags --max-count=1').resolves('b123456');
+  exec.withArgs('git describe --tags --abbrev=0 "b123456^"').resolves('2.0.1');
 
   interceptAuthentication();
   interceptCollaborator();

package/test/tasks.js

@@ -397,6 +397,47 @@ test.serial('should propagate errors', async t => {
   t.is(log.error.callCount, 1);
 });
 
+test.serial('should use custom changelog command with context', async t => {
+  const { bare } = t.context;
+  const project = path.basename(bare);
+  const owner = path.basename(path.dirname(bare));
+  sh.exec('git tag v1.0.0');
+  gitAdd('line', 'file', 'More file');
+
+  interceptGitHubAuthentication();
+  interceptGitHubCollaborator({ owner, project });
+  interceptGitHubCreate({
+    owner,
+    project,
+    body: {
+      tag_name: 'v1.1.0',
+      name: 'Release 1.1.0',
+      body: 'custom-changelog-generator --from=v1.0.0 --to=v1.1.0',
+      draft: false,
+      prerelease: false
+    }
+  });
+
+  const container = getContainer({
+    increment: 'minor',
+    github: {
+      release: true,
+      releaseNotes: 'echo custom-changelog-generator --from=${latestTag} --to=${tagName}',
+      pushRepo: `https://github.com/${owner}/${project}`
+    }
+  });
+
+  const exec = sinon.spy(container.shell, 'execStringCommand');
+
+  await runTasks({}, container);
+
+  const command = exec.args.find(([command]) => command.includes('custom-changelog-generator'));
+
+  t.is(command[0], 'echo custom-changelog-generator --from=v1.0.0 --to=v1.1.0');
+
+  exec.restore();
+});
+
 {
   class MyPlugin extends Plugin {}
   const statics = { isEnabled: () => true, disablePlugin: () => null };

package/test/util/index.js

@@ -56,7 +56,7 @@ module.exports.runTasks = async plugin => {
 
   const name = (await plugin.getName()) || '__test__';
   const latestVersion = (await plugin.getLatestVersion()) || '1.0.0';
-  const changelog = (await plugin.getChangelog(latestVersion)) || null;
+  const changelog = (await plugin.getChangelog()) || null;
   const increment = getIncrement(plugin, { latestVersion });
 
   plugin.config.setContext({ name, latestVersion, latestTag: latestVersion, changelog });