Merge pull request #6 from Gusto/rc-fix-prerelease-version

fix(prepare): use correct version for prereleases
Gusto · Jul 22, 2020 · 80219d2 · 80219d2
2 parents db9aa06 + 039f996
commit 80219d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/__tests__/prepare.test.js b/src/__tests__/prepare.test.js
@@ -55,7 +55,7 @@ describe('when the version.rb contains a prerelease version', () => {
     expect(versionContents).toEqual(`# frozen_string_literal: true
 
 module TestGem
-  VERSION = '1.0.0-alpha.1'
+  VERSION = '1.0.0.alpha.1'
 end
 `);
   });

diff --git a/src/__tests__/verifyConditions.test.js b/src/__tests__/verifyConditions.test.js
@@ -48,7 +48,7 @@ describe('when the gemspec has no name defined', () => {
   });
 });
 
-it('finds the version file', async () => {
+it('verifies the version file', async () => {
   const { versionFile } = await verifyConditions(
     {},
     { cwd: validCwd, env: defaultEnv },
@@ -57,6 +57,18 @@ it('finds the version file', async () => {
   expect(versionFile).toEqual('lib/test-gem/version.rb');
 });
 
+describe('when the existing version file contains a prerelease version', () => {
+  it('verifies the version file', async () => {
+    const cwd = path.resolve(__dirname, './fixtures/prerelease');
+    const { versionFile } = await verifyConditions(
+      {},
+      { cwd, env: defaultEnv },
+      { credentialsFile },
+    );
+    expect(versionFile).toEqual('lib/test-gem/version.rb');
+  });
+});
+
 describe('when there is no version file', () => {
   it('throws an error', async () => {
     const cwd = path.resolve(__dirname, './fixtures/no-version-file');

diff --git a/src/prepare.js b/src/prepare.js
@@ -6,7 +6,12 @@ const { VERSION_REGEX } = require('./common');
 const writeVersion = async ({ versionFile, nextVersion, logger, cwd }) => {
   const fullVersionPath = path.resolve(cwd, versionFile);
   const versionContents = await readFile(fullVersionPath, 'utf8');
-  const newContents = versionContents.replace(VERSION_REGEX, `$1${nextVersion}$2`);
+  const newContents = versionContents.replace(
+    VERSION_REGEX,
+    // Rubygems replaces all `-` with `.pre.`, which causes odd version differences between tags/releases
+    // and the published gem version. Replacing `-` with `.` is a smaller difference.
+    `$1${nextVersion.replace('-', '.')}$2`,
+  );
   logger.log('Writing version %s to `%s`', nextVersion, versionFile);
   await writeFile(fullVersionPath, newContents, 'utf8');
 };