release-please 15.0.0 → 15.1.0

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [15.1.0](https://github.com/googleapis/release-please/compare/v15.0.0...v15.1.0) (2023-01-05)
+
+
+### Features
+
+* **ruby:** Add Gemfile.Lock updater ([#1790](https://github.com/googleapis/release-please/issues/1790)) ([9baf736](https://github.com/googleapis/release-please/commit/9baf736aa424bf3dcf0f05009e5cf8c9ef05fd69))
+
+
+### Bug Fixes
+
+* **java-yoshi:** Throw MissingRequiredFile error if no versions.txt found ([#1794](https://github.com/googleapis/release-please/issues/1794)) ([542d412](https://github.com/googleapis/release-please/commit/542d412307ea8d6350908aeb7efaf9db9e3d03f9))
+
 ## [15.0.0](https://github.com/googleapis/release-please/compare/v14.17.5...v15.0.0) (2022-12-12)
 
 

package/build/src/strategies/java-yoshi.js

@@ -57,7 +57,7 @@ class JavaYoshi extends java_1.Java {
                 this.versionsContent = await this.github.getFileContentsOnBranch(this.addPath('versions.txt'), this.targetBranch);
             }
             catch (err) {
-                if (err instanceof errors_1.GitHubAPIError) {
+                if (err instanceof errors_1.FileNotFoundError) {
                     throw new errors_1.MissingRequiredFileError(this.addPath('versions.txt'), JavaYoshi.name, `${this.repository.owner}/${this.repository.repo}`);
                 }
                 throw err;

package/build/src/strategies/ruby.js

@@ -19,6 +19,7 @@ const indent_commit_1 = require("../util/indent-commit");
 const changelog_1 = require("../updaters/changelog");
 // Ruby
 const version_rb_1 = require("../updaters/ruby/version-rb");
+const gemfile_lock_1 = require("../updaters/ruby/gemfile-lock");
 const base_1 = require("./base");
 class Ruby extends base_1.BaseStrategy {
     constructor(options) {
@@ -48,6 +49,14 @@ class Ruby extends base_1.BaseStrategy {
                 version,
             }),
         });
+        updates.push({
+            path: this.addPath('Gemfile.lock'),
+            createIfMissing: false,
+            updater: new gemfile_lock_1.GemfileLock({
+                version,
+                gemName: this.component || '',
+            }),
+        });
         return updates;
     }
     async postProcessCommits(commits) {

package/build/src/updaters/ruby/common.d.ts

@@ -0,0 +1,17 @@
+import { Version } from '../../version';
+export declare const RUBY_VERSION_REGEX: RegExp;
+/**
+ * Stringify a version to a ruby compatible version string
+ *
+ * @param version The version to stringify
+ * @param useDotPrePreleaseSeperator Use a `.` seperator for prereleases rather then `-`
+ * @returns a ruby compatible version string
+ */
+export declare function stringifyRubyVersion(version: Version, useDotPrePreleaseSeperator?: boolean): string;
+/**
+ * This function mimics Gem::Version parsing of version semver strings
+ *
+ * @param versionString The version string to resolve
+ * @returns A Gem::Version compatible version string
+ */
+export declare function resolveRubyGemfileLockVersion(versionString: string): string;

package/build/src/updaters/ruby/common.js

@@ -0,0 +1,46 @@
+"use strict";
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRubyGemfileLockVersion = exports.stringifyRubyVersion = exports.RUBY_VERSION_REGEX = void 0;
+// Ruby gem semver strings using `.` seperator for prereleases rather then `-`
+// See https://guides.rubygems.org/patterns/
+exports.RUBY_VERSION_REGEX = /((\d+).(\d)+.(\d+)(.\w+.*)?)/g;
+/**
+ * Stringify a version to a ruby compatible version string
+ *
+ * @param version The version to stringify
+ * @param useDotPrePreleaseSeperator Use a `.` seperator for prereleases rather then `-`
+ * @returns a ruby compatible version string
+ */
+function stringifyRubyVersion(version, useDotPrePreleaseSeperator = false) {
+    if (!useDotPrePreleaseSeperator) {
+        return version.toString();
+    }
+    return `${version.major}.${version.minor}.${version.patch}${version.preRelease ? `.${version.preRelease}` : ''}`;
+}
+exports.stringifyRubyVersion = stringifyRubyVersion;
+/**
+ * This function mimics Gem::Version parsing of version semver strings
+ *
+ * @param versionString The version string to resolve
+ * @returns A Gem::Version compatible version string
+ */
+function resolveRubyGemfileLockVersion(versionString) {
+    // Replace `-` with `.pre.` as per ruby gem parsing
+    // See https://github.com/rubygems/rubygems/blob/master/lib/rubygems/version.rb#L229
+    return versionString.replace(/-/g, '.pre.');
+}
+exports.resolveRubyGemfileLockVersion = resolveRubyGemfileLockVersion;
+//# sourceMappingURL=common.js.map

package/build/src/updaters/ruby/gemfile-lock.d.ts

@@ -0,0 +1,24 @@
+import { DefaultUpdater, UpdateOptions } from '../default';
+export interface GemfileLockOptions extends UpdateOptions {
+    gemName: string;
+}
+/**
+ * Builds a regex matching a gem version in a Gemfile.lock file.
+ * @example
+ *    rails (7.0.1)
+ *    rails (7.0.1.alpha1)
+ */
+export declare function buildGemfileLockVersionRegex(gemName: string): RegExp;
+/**
+ * Updates a Gemfile.lock files which is expected to have a local path version string.
+ */
+export declare class GemfileLock extends DefaultUpdater {
+    gemName: string;
+    constructor(options: GemfileLockOptions);
+    /**
+     * Given initial file contents, return updated contents.
+     * @param {string} content The initial content
+     * @returns {string} The updated content
+     */
+    updateContent(content: string): string;
+}

package/build/src/updaters/ruby/gemfile-lock.js

@@ -0,0 +1,50 @@
+"use strict";
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GemfileLock = exports.buildGemfileLockVersionRegex = void 0;
+const default_1 = require("../default");
+const common_1 = require("./common");
+/**
+ * Builds a regex matching a gem version in a Gemfile.lock file.
+ * @example
+ *    rails (7.0.1)
+ *    rails (7.0.1.alpha1)
+ */
+function buildGemfileLockVersionRegex(gemName) {
+    return new RegExp(`s*${gemName} \\(${common_1.RUBY_VERSION_REGEX.source}\\)`);
+}
+exports.buildGemfileLockVersionRegex = buildGemfileLockVersionRegex;
+/**
+ * Updates a Gemfile.lock files which is expected to have a local path version string.
+ */
+class GemfileLock extends default_1.DefaultUpdater {
+    constructor(options) {
+        super(options);
+        this.gemName = options.gemName;
+    }
+    /**
+     * Given initial file contents, return updated contents.
+     * @param {string} content The initial content
+     * @returns {string} The updated content
+     */
+    updateContent(content) {
+        // Bundler will convert 1.0.0-alpha1 to 1.0.0.pre.alpha1, so we need to
+        // do the same here.
+        const versionString = (0, common_1.resolveRubyGemfileLockVersion)(this.version.toString());
+        return content.replace(buildGemfileLockVersionRegex(this.gemName), `${this.gemName} (${versionString})`);
+    }
+}
+exports.GemfileLock = GemfileLock;
+//# sourceMappingURL=gemfile-lock.js.map

package/build/src/updaters/ruby/version-rb.js

@@ -15,6 +15,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionRB = void 0;
 const default_1 = require("../default");
+const common_1 = require("./common");
+const RUBY_VERSION_RB_REGEX = new RegExp(`(["'])(${common_1.RUBY_VERSION_REGEX.source})(["'])`);
 /**
  * Updates a versions.rb file which is expected to have a version string.
  */
@@ -25,7 +27,7 @@ class VersionRB extends default_1.DefaultUpdater {
      * @returns {string} The updated content
      */
     updateContent(content) {
-        return content.replace(/(["'])[0-9]+\.[0-9]+\.[0-9]+(-\w+)?["']/, `$1${this.version}$1`);
+        return content.replace(RUBY_VERSION_RB_REGEX, `$1${(0, common_1.stringifyRubyVersion)(this.version)}$1`);
     }
 }
 exports.VersionRB = VersionRB;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -63,7 +63,7 @@
     "gts": "^3.1.0",
     "mocha": "^9.2.2",
     "nock": "^13.0.0",
-    "sinon": "15.0.0",
+    "sinon": "15.0.1",
     "snap-shot-it": "^7.0.0"
   },
   "dependencies": {