feat(dependency-manifest.ts): add support for Dependabot commit messages (#2584)

* feat(dependency-manifest.ts): add support for Dependabot commit messages

Refactor regex matching to handle both Renovate and Dependabot commit
messages for dependency updates. This change allows the versioning
strategy to recognize and process dependency update commits from both
tools, enhancing compatibility and automation in dependency management.

* fix(dependency-manifest.ts): correct typo in DEPENDABOT_DEPENDENCY_UPDATE_REGEX

test(dependency-manifest.ts): add tests for dependabot dependency updates

Add tests to ensure correct version bumping for patch, minor, and major
updates. Include tests for both 'chore(deps)' and 'build(deps)' commit
messages.

* style(test): reformat object initialization for better readability in dependency-manifest tests

* refactor(dependency-manifest.ts): rename RENOVATE_DEPENDENCY_UPDATE_REGEX to DEPENDENCY_UPDATE_REGEX for clarity and reuse

Author: guidev

src/versioning-strategies/dependency-manifest.ts

@@ -26,6 +26,9 @@ import {
 const DEPENDENCY_UPDATE_REGEX =
   /^deps: update dependency (.*) to (v[^\s]*)(\s\(#\d+\))?$/m;
 
+const DEPENDABOT_DEPENDENCY_UPDATE_REGEX =
+  /^(?:chore|build)\(deps\): bump (.*) from [^\s]* to ([^\s]*)(\s\(#\d+\))?$/m;
+
 /**
  * This VersioningStrategy looks at `deps` type commits and tries to
  * mirror the semantic version bump for that dependency update. For
@@ -85,12 +88,19 @@ export class DependencyManifest extends DefaultVersioningStrategy {
   }
 }
 
+function matchCommit(commit: ConventionalCommit): RegExpMatchArray | null {
+  return (
+    commit.message.match(DEPENDENCY_UPDATE_REGEX) ||
+    commit.message.match(DEPENDABOT_DEPENDENCY_UPDATE_REGEX)
+  );
+}
+
 function buildDependencyUpdates(
   commits: ConventionalCommit[]
 ): Record<string, Version> {
   const versionsMap: Record<string, Version> = {};
   for (const commit of commits) {
-    const match = commit.message.match(DEPENDENCY_UPDATE_REGEX);
+    const match = matchCommit(commit);
     if (!match) continue;
 
     const versionString = match[2];

test/versioning-strategies/dependency-manifest.ts

@@ -271,4 +271,130 @@ describe('DependencyManifest', () => {
       expect(newVersion.toString()).to.equal('2.0.0');
     });
   });
+
+  describe('with a dependabot dependency update', () => {
+    it('can bump a patch (chore)', async () => {
+      const commits = [
+        {
+          sha: 'sha2',
+          message: 'chore(deps): bump foo from 4.5.5 to 4.5.6',
+          files: ['path1/file1.rb'],
+          type: 'fix',
+          scope: null,
+          bareMessage: 'some bugfix',
+          notes: [],
+          references: [],
+          breaking: false,
+        },
+      ];
+      const strategy = new DependencyManifest({});
+      const oldVersion = Version.parse('1.2.3');
+      const newVersion = await strategy.bump(oldVersion, commits);
+      expect(newVersion.toString()).to.equal('1.2.4');
+    });
+
+    it('can bump a minor (chore)', async () => {
+      const commits = [
+        {
+          sha: 'sha2',
+          message: 'chore(deps): bump foo from 4.4.9 to 4.5.0',
+          files: ['path1/file1.rb'],
+          type: 'fix',
+          scope: null,
+          bareMessage: 'some bugfix',
+          notes: [],
+          references: [],
+          breaking: false,
+        },
+      ];
+      const strategy = new DependencyManifest({});
+      const oldVersion = Version.parse('1.2.3');
+      const newVersion = await strategy.bump(oldVersion, commits);
+      expect(newVersion.toString()).to.equal('1.3.0');
+    });
+
+    it('can bump a minor as a patch pre-major (chore)', async () => {
+      const commits = [
+        {
+          sha: 'sha2',
+          message: 'chore(deps): bump foo from 0.1.2 to 0.1.3',
+          files: ['path1/file1.rb'],
+          type: 'fix',
+          scope: null,
+          bareMessage: 'some bugfix',
+          notes: [],
+          references: [],
+          breaking: false,
+        },
+      ];
+      const strategy = new DependencyManifest({
+        bumpPatchForMinorPreMajor: true,
+      });
+      const oldVersion = Version.parse('0.1.2');
+      const newVersion = await strategy.bump(oldVersion, commits);
+      expect(newVersion.toString()).to.equal('0.1.3');
+    });
+
+    it('can bump a major as a minor pre-major (chore)', async () => {
+      const commits = [
+        {
+          sha: 'sha2',
+          message: 'chore(deps): bump foo from 0.1.2 to 1.0.0',
+          files: ['path1/file1.rb'],
+          type: 'fix',
+          scope: null,
+          bareMessage: 'some bugfix',
+          notes: [],
+          references: [],
+          breaking: false,
+        },
+      ];
+      const strategy = new DependencyManifest({
+        bumpMinorPreMajor: true,
+      });
+      const oldVersion = Version.parse('0.1.2');
+      const newVersion = await strategy.bump(oldVersion, commits);
+      expect(newVersion.toString()).to.equal('0.2.0');
+    });
+
+    it('can bump a major (with PR number, chore)', async () => {
+      const commits = [
+        {
+          sha: 'sha2',
+          message: 'chore(deps): bump foo from 3 to 4 (#1234)',
+          files: ['path1/file1.rb'],
+          type: 'fix',
+          scope: null,
+          bareMessage: 'some bugfix',
+          notes: [],
+          references: [],
+          breaking: false,
+        },
+      ];
+      const strategy = new DependencyManifest({});
+      const oldVersion = Version.parse('1.2.3');
+      const newVersion = await strategy.bump(oldVersion, commits);
+      expect(newVersion.toString()).to.equal('2.0.0');
+    });
+
+    it('also matches build(deps) variant', async () => {
+      const commits = [
+        {
+          sha: 'sha2',
+          message: 'build(deps): bump bar from v1.2.3 to v1.2.4',
+          files: ['path1/file1.rb'],
+          type: 'fix',
+          scope: null,
+          bareMessage: 'some bugfix',
+          notes: [],
+          references: [],
+          breaking: false,
+        },
+      ];
+      const strategy = new DependencyManifest({});
+      const oldVersion = Version.parse('1.2.3');
+      const newVersion = await strategy.bump(oldVersion, commits);
+      expect(newVersion.toString()).to.equal('1.2.4');
+    });
+  });
 });