release-it 15.2.0 → 15.4.1

package/README.md

@@ -110,6 +110,8 @@ Use `--dry-run` to show the interactivity and the commands it _would_ execute.
 
 To print the next version without releasing anything, add the `--release-version` flag.
 
+To print the changelog without releasing anything, add the `--changelog` flag.
+
 ## Configuration
 
 Out of the box, release-it has sane defaults, and [plenty of options](./config/release-it.json) to configure it. Most
@@ -275,6 +277,7 @@ latestVersion
 changelog
 name
 repo.remote, repo.protocol, repo.host, repo.owner, repo.repository, repo.project
+branchName
 ```
 
 All variables are available in all hooks. The only exception is that the additional variables listed above are not yet

package/lib/cli.js

@@ -20,6 +20,7 @@ const helpText = `Release It! v${pkg.version}
      --only-version      Prompt only for version, no further interaction
   -v --version           Print release-it version number
      --release-version   Print version number to be released
+     --changelog         Print changelog for the version to be released
   -V --verbose           Verbose output (user hooks output)
   -VV                    Extra verbose output (also internal commands output)
 

package/lib/config.js

@@ -109,7 +109,7 @@ class Config {
   }
 
   get isCI() {
-    return Boolean(this.options.ci) || this.isReleaseVersion;
+    return Boolean(this.options.ci) || this.isReleaseVersion || this.isChangelog;
   }
 
   get isPromptOnlyVersion() {
@@ -119,6 +119,10 @@ class Config {
   get isReleaseVersion() {
     return Boolean(this.options['release-version']);
   }
+
+  get isChangelog() {
+    return Boolean(this.options['changelog']);
+  }
 }
 
 export default Config;

package/lib/index.js

@@ -78,7 +78,7 @@ const runTasks = async (opts, di) => {
     const action = config.isIncrement ? 'release' : 'update';
     const suffix = version && config.isIncrement ? `${latestVersion}...${version}` : `currently at ${latestVersion}`;
 
-    if (!config.isReleaseVersion) {
+    if (!config.isReleaseVersion && !config.isChangelog) {
       log.obtrusive(`🚀 Let's ${action} ${name} (${suffix})`);
 
       log.preview({ title: 'changelog', text: changelog });
@@ -93,6 +93,11 @@ const runTasks = async (opts, di) => {
       process.exit(0);
     }
 
+    if (config.isChangelog) {
+      console.log(changelog);
+      process.exit(0);
+    }
+
     if (version) {
       config.setContext(parseVersion(version));
 

package/lib/plugin/GitBase.js

@@ -7,14 +7,18 @@ const changelogFallback = 'git log --pretty=format:"* %s (%h)"';
 
 class GitBase extends Plugin {
   async init() {
-    this.remoteUrl = await this.getRemoteUrl();
-    await this.fetch();
-    const repo = parseGitUrl(this.remoteUrl);
-    const latestTag = await this.getLatestTagName(repo);
+    const remoteUrl = await this.getRemoteUrl();
+    await this.fetch(remoteUrl);
+
+    const branchName = await this.getBranchName();
+    const repo = parseGitUrl(remoteUrl);
+    this.setContext({ remoteUrl, branchName, repo });
+    this.config.setContext({ remoteUrl, branchName, repo });
+
+    const latestTag = await this.getLatestTagName();
     const secondLatestTag = !this.config.isIncrement ? await this.getSecondLatestTagName(latestTag) : null;
     const tagTemplate = this.options.tagName || ((latestTag || '').match(/^v/) ? 'v${version}' : '${version}');
-    this.setContext({ repo });
-    this.config.setContext({ tagTemplate, latestTag, secondLatestTag });
+    this.config.setContext({ latestTag, secondLatestTag, tagTemplate });
   }
 
   getName() {
@@ -79,15 +83,15 @@ class GitBase extends Plugin {
     return this.exec(`git config --get branch.${branch}.remote`, { options }).catch(() => null);
   }
 
-  fetch() {
+  fetch(remoteUrl) {
     return this.exec('git fetch').catch(err => {
       this.debug(err);
-      throw new Error(`Unable to fetch from ${this.remoteUrl}${EOL}${err.message}`);
+      throw new Error(`Unable to fetch from ${remoteUrl}${EOL}${err.message}`);
     });
   }
 
-  getLatestTagName(repo) {
-    const context = Object.assign({ repo }, this.getContext(), { version: '*' });
+  getLatestTagName() {
+    const context = Object.assign({}, this.config.getContext(), { version: '*' });
     const match = format(this.options.tagMatch || this.options.tagName || '${version}', context);
     return this.exec(`git describe --tags --match=${match} --abbrev=0`, { options }).then(
       stdout => stdout || null,

package/lib/plugin/git/Git.js

@@ -39,7 +39,8 @@ class Git extends GitBase {
 
     await super.init();
 
-    if (this.options.push && !this.remoteUrl) {
+    const remoteUrl = this.getContext('remoteUrl');
+    if (this.options.push && !remoteUrl) {
       throw e(`Could not get remote Git url.${EOL}Please add a remote repository.`, docs);
     }
     if (this.options.requireUpstream && !(await this.hasUpstreamBranch())) {
@@ -48,7 +49,6 @@ class Git extends GitBase {
     if (this.options.requireCommits && (await this.getCommitsSinceLatestTag()) === 0) {
       throw e(`There are no commits since the latest tag.`, docs);
     }
-    this.config.setContext({ repo: this.getContext('repo') });
   }
 
   rollback() {

package/lib/plugin/npm/npm.js

@@ -29,6 +29,7 @@ class npm extends Plugin {
   async init() {
     const { name, version: latestVersion, private: isPrivate, publishConfig } = readJSON(path.resolve(MANIFEST_PATH));
     this.setContext({ name, latestVersion, private: isPrivate, publishConfig });
+    this.config.setContext({ npm: { name } });
 
     const { publish, skipChecks } = this.options;
 

package/lib/util.js

@@ -48,7 +48,10 @@ const rejectAfter = (ms, error) =>
 
 const parseGitUrl = remoteUrl => {
   if (!remoteUrl) return { host: null, owner: null, project: null, protocol: null, remote: null, repository: null };
-  const normalizedUrl = (remoteUrl || '').replace(/^[A-Z]:/, '').replace(/\\/g, '/'); // Hacky workaround for file protocol in Windows
+  const normalizedUrl = (remoteUrl || '')
+    .replace(/^[A-Z]:\\\\/, 'file://') // Assume file protocol for Windows drive letters
+    .replace(/^\//, 'file://') // Assume file protocol if only /path is given
+    .replace(/\\+/g, '/'); // Replace forward with backslashes
   const parsedUrl = gitUrlParse(normalizedUrl);
   const { resource: host, name: project, protocol, href: remote } = parsedUrl;
   const owner = protocol === 'file' ? _.last(parsedUrl.owner.split('/')) : parsedUrl.owner; // Fix owner for file protocol

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "15.2.0",
+  "version": "15.4.1",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -60,21 +60,21 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@octokit/rest": "19.0.3",
+    "@octokit/rest": "19.0.4",
     "async-retry": "1.3.3",
     "chalk": "5.0.1",
     "cosmiconfig": "7.0.1",
     "execa": "6.1.0",
     "form-data": "4.0.0",
-    "git-url-parse": "12.0.0",
+    "git-url-parse": "13.0.0",
     "globby": "13.1.2",
-    "got": "12.2.0",
-    "inquirer": "9.0.2",
+    "got": "12.3.1",
+    "inquirer": "9.1.0",
     "is-ci": "3.0.1",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "new-github-release-url": "2.0.0",
-    "node-fetch": "3.2.9",
+    "node-fetch": "3.2.10",
     "open": "8.4.0",
     "ora": "6.1.2",
     "os-name": "5.0.1",
@@ -85,17 +85,17 @@
     "update-notifier": "6.0.2",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.2",
-    "yargs-parser": "21.0.1"
+    "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@octokit/request-error": "3.0.0",
-    "ava": "4.3.1",
-    "eslint": "8.20.0",
+    "@octokit/request-error": "3.0.1",
+    "ava": "4.3.3",
+    "eslint": "8.23.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-ava": "13.2.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-prettier": "4.2.1",
-    "mock-fs": "5.1.2",
+    "mock-fs": "5.1.4",
     "mock-stdio": "1.0.3",
     "nock": "13.2.9",
     "nyc": "15.1.0",

package/test/git.js

@@ -274,7 +274,7 @@ test.serial('should reset files', async t => {
 
 test.serial('should roll back when cancelled', async t => {
   sh.exec('git init');
-  sh.exec(`git remote add origin foo`);
+  sh.exec(`git remote add origin file://foo`);
   const version = '1.2.3';
   gitAdd(`{"version":"${version}"}`, 'package.json', 'Add package.json');
   const options = { git: { requireCleanWorkingDir: true, commit: true, tag: true, tagName: 'v${version}' } };
@@ -294,8 +294,8 @@ test.serial('should roll back when cancelled', async t => {
   await gitClient.tag();
   await gitClient.rollbackOnce();
 
-  t.is(exec.args[10][0], 'git tag --delete v1.2.4');
-  t.is(exec.args[11][0], 'git reset --hard HEAD~1');
+  t.is(exec.args[11][0], 'git tag --delete v1.2.4');
+  t.is(exec.args[12][0], 'git reset --hard HEAD~1');
 });
 
 test.serial('should not touch existing history when rolling back', async t => {

package/test/github.js

@@ -357,7 +357,7 @@ test('should not call octokit client in dry run', async t => {
   await runTasks(github);
 
   t.is(spy.get.callCount, 0);
-  t.is(github.log.exec.args[0][0], 'octokit repos.createRelease "R 1.0.1" (v1.0.1)');
+  t.is(github.log.exec.args[1][0], 'octokit repos.createRelease "R 1.0.1" (v1.0.1)');
   t.is(github.log.exec.lastCall.args[0], 'octokit repos.uploadReleaseAssets');
   const { isReleased, releaseUrl } = github.getContext();
   t.true(isReleased);

package/test/gitlab.js

@@ -231,8 +231,8 @@ test('should not make requests in dry run', async t => {
 
   const { isReleased, releaseUrl } = gitlab.getContext();
   t.is(spy.get.callCount, 0);
-  t.is(gitlab.log.exec.args[1][0], 'gitlab releases#uploadAssets');
-  t.is(gitlab.log.exec.args[2][0], 'gitlab releases#createRelease "R" (1.0.1)');
+  t.is(gitlab.log.exec.args[2][0], 'gitlab releases#uploadAssets');
+  t.is(gitlab.log.exec.args[3][0], 'gitlab releases#createRelease "R" (1.0.1)');
   t.true(isReleased);
   t.is(releaseUrl, `${pushRepo}/-/releases`);
   spy.get.restore();

package/test/tasks.js

@@ -186,6 +186,49 @@ test.serial('should release all the things (basic)', async t => {
   exec.restore();
 });
 
+test.serial('should release with correct tag name', async t => {
+  const { bare, target } = t.context;
+  const project = path.basename(bare);
+  const pkgName = path.basename(target);
+  const owner = path.basename(path.dirname(bare));
+  const { stdout } = sh.exec('git rev-parse --abbrev-ref HEAD');
+  const branchName = stdout.trim();
+  gitAdd(`{"name":"${pkgName}","version":"1.0.0"}`, 'package.json', 'Add package.json');
+  sh.exec(`git tag ${pkgName}-${branchName}-1.0.0`);
+  const sha = gitAdd('line', 'file', 'More file');
+
+  interceptGitHubCreate({
+    owner,
+    project,
+    body: {
+      tag_name: `${pkgName}-${branchName}-1.0.1`,
+      name: 'Release 1.0.1',
+      body: `* More file (${sha})`,
+      prerelease: false
+    }
+  });
+
+  const container = getContainer({
+    git: { tagName: '${npm.name}-${branchName}-${version}' },
+    github: { release: true, skipChecks: true, pushRepo: `https://github.com/${owner}/${project}` }
+  });
+
+  const exec = sinon.spy(container.shell, 'exec');
+
+  await runTasks({}, container);
+
+  const gitArgs = getArgs(container.shell.exec.args, 'git');
+
+  t.true(gitArgs.includes(`git tag --annotate --message Release 1.0.1 ${pkgName}-${branchName}-1.0.1`));
+  t.true(
+    log.log.secondCall.args[0].endsWith(
+      `https://github.com/${owner}/${project}/releases/tag/${pkgName}-${branchName}-1.0.1`
+    )
+  );
+
+  exec.restore();
+});
+
 test.serial('should release all the things (pre-release, github, gitlab)', async t => {
   const { bare, target } = t.context;
   const project = path.basename(bare);

package/test/util/helpers.js

@@ -19,6 +19,9 @@ const gitAdd = (content, file, message) => {
 };
 
 const getArgs = (args, prefix) =>
-  args.filter(args => typeof args[0] === 'string' && args[0].startsWith(prefix)).map(args => args[0].trim());
+  args
+    .map(args => (typeof args[0] !== 'string' ? args[0].join(' ') : args[0]))
+    .filter(cmd => cmd.startsWith(prefix))
+    .map(cmd => cmd.trim());
 
 export { mkTmpDir, readFile, gitAdd, getArgs };

package/test/utils.js

@@ -47,12 +47,39 @@ test('parseGitUrl', t => {
     repository: 'org/sub-group/repo-in-sub-group'
   });
 
+  t.deepEqual(parseGitUrl('git@github.com:org/example.com.git'), {
+    host: 'github.com',
+    owner: 'org',
+    project: 'example.com',
+    protocol: 'ssh',
+    remote: 'git@github.com:org/example.com.git',
+    repository: 'org/example.com'
+  });
+
+  t.deepEqual(parseGitUrl('file://Users/john/doe/owner/project'), {
+    host: 'users',
+    owner: 'owner',
+    project: 'project',
+    protocol: 'file',
+    remote: 'file://users/john/doe/owner/project',
+    repository: 'owner/project'
+  });
+
   t.deepEqual(parseGitUrl('/Users/john/doe/owner/project'), {
-    host: '',
+    host: 'users',
+    owner: 'owner',
+    project: 'project',
+    protocol: 'file',
+    remote: 'file://users/john/doe/owner/project',
+    repository: 'owner/project'
+  });
+
+  t.deepEqual(parseGitUrl('C:\\\\Users\\john\\doe\\owner\\project'), {
+    host: 'users',
     owner: 'owner',
     project: 'project',
     protocol: 'file',
-    remote: '/Users/john/doe/owner/project',
+    remote: 'file://users/john/doe/owner/project',
     repository: 'owner/project'
   });
 });