Run new Ruby version check workflow more frequently

Run it hourly instead of daily to ensure we catch new releases faster.

Author: rafaelfranca

.github/workflows/check-ruby-versions.yaml

@@ -2,7 +2,7 @@ name: Check for New Ruby Versions
 
 on:
   schedule:
-    - cron: '0 2 * * *'  # Daily at 2 AM UTC
+    - cron: '17 * * * *'  # Hourly at minute 17
   workflow_dispatch:  # Allow manual triggers
 
 permissions:

Gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "base64"
 gem "minitest"
 gem "mocha"
 gem "octokit"

Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     addressable (2.8.8)
       public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
     bigdecimal (4.0.1)
     crack (1.0.1)
       bigdecimal
@@ -44,6 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  base64
   minitest
   mocha
   octokit
@@ -52,6 +54,7 @@ DEPENDENCIES
 
 CHECKSUMS
   addressable (2.8.8) sha256=7c13b8f9536cf6364c03b9d417c19986019e28f7c00ac8132da4eb0fe393b057
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
   crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
   faraday (2.14.0) sha256=8699cfe5d97e55268f2596f9a9d5a43736808a943714e3d9a53e6110593941cd

lib/ruby_version_pr_creator.rb

@@ -3,6 +3,8 @@
 require "octokit"
 require "open3"
 require "time"
+require "base64"
+require "json"
 require_relative "console"
 
 # Ruby Version PR Creator
@@ -48,7 +50,15 @@ def initialize(new_versions, files_modified:, working_dir:, github_token: nil, o
   def call
     validate_prerequisites!
 
-    close_existing_automation_prs
+    existing_pr = close_existing_automation_prs
+
+    if existing_pr
+      log("", :blue)
+      log("Reusing existing automation PR ##{existing_pr.number}", :blue, emoji: :info)
+      log("URL: #{existing_pr.html_url}", emoji: :info)
+
+      return { success: true, pr_number: existing_pr.number, pr_url: existing_pr.html_url }
+    end
 
     branch_name = create_branch
     commit_changes
@@ -148,7 +158,15 @@ def close_existing_automation_prs
         labels.include?("automation") && labels.include?("ruby-versions")
       end
 
-      automation_prs.each do |pr|
+      matching_pr = automation_prs.find { |pr| automation_pr_matches_versions?(pr) }
+
+      if matching_pr
+        log("Found matching automation PR ##{matching_pr.number}; keeping it open.", :blue, emoji: :info)
+      end
+
+      prs_to_close = matching_pr ? (automation_prs - [matching_pr]) : automation_prs
+
+      prs_to_close.each do |pr|
         log("Closing existing PR ##{pr.number}...", :yellow, emoji: :close)
         github_client.add_comment(
           repository,
@@ -157,9 +175,38 @@ def close_existing_automation_prs
         )
         github_client.close_pull_request(repository, pr.number)
       end
+
+      matching_pr
     rescue Octokit::Error => e
       # Non-fatal, just log and continue
       log("Could not check for existing PRs: #{e.message}", :yellow, emoji: :info)
+      nil
+    end
+  end
+
+  def automation_pr_matches_versions?(pr)
+    versions = ruby_versions_from_pr(pr)
+    new_versions.all? { |version| versions.include?(version) }
+  rescue Octokit::Error => e
+    log("Could not inspect PR ##{pr.number} versions: #{e.message}", :yellow, emoji: :info)
+    false
+  rescue ArgumentError, JSON::ParserError => e
+    log("Invalid versions file in PR ##{pr.number}: #{e.message}", :yellow, emoji: :info)
+    false
+  end
+
+  def ruby_versions_from_pr(pr)
+    file = github_client.contents(repository, path: ".github/ruby-versions.json", ref: pr.head.ref)
+    encoded_content = file.content.to_s.strip
+
+    return [] if encoded_content.empty?
+
+    parsed = JSON.parse(Base64.decode64(encoded_content))
+
+    if parsed.is_a?(Array)
+      return parsed
+    else
+      raise ArgumentError, "Expected .github/ruby-versions.json to contain an array"
     end
   end
 

test/ruby_version_pr_creator_test.rb

@@ -6,6 +6,7 @@
 require "json"
 require "stringio"
 require "webmock/minitest"
+require "base64"
 require_relative "../lib/ruby_version_pr_creator"
 
 # Test suite for the RubyVersionPRCreator module
@@ -79,6 +80,34 @@ def test_closes_existing_automation_prs
     assert_match(/closing existing pr/i, @output.string)
   end
 
+  def test_reuses_existing_matching_automation_pr
+    stub_github_api_with_matching_existing_pr
+    creator = create_creator(["3.4.0"], [".github/ruby-versions.json"])
+    stub_git_operations(creator)
+
+    result = creator.call
+
+    assert result[:success]
+    assert_equal 100, result[:pr_number]
+    assert_equal "https://github.com/rails/devcontainer/pull/100", result[:pr_url]
+    assert_match(/reusing existing automation pr/i, @output.string)
+    assert_not_requested(:post, "https://api.github.com/repos/rails/devcontainer/pulls")
+    assert_not_requested(:patch, "https://api.github.com/repos/rails/devcontainer/pulls/100")
+  end
+
+  def test_handles_empty_versions_file_content_as_non_matching
+    stub_github_api_with_empty_versions_file_pr
+    creator = create_creator(["3.4.0"], [".github/ruby-versions.json"])
+    stub_git_operations(creator)
+
+    result = creator.call
+
+    assert result[:success]
+    assert_equal 123, result[:pr_number]
+    assert_requested(:patch, "https://api.github.com/repos/rails/devcontainer/pulls/100")
+    assert_requested(:post, "https://api.github.com/repos/rails/devcontainer/pulls")
+  end
+
   def test_generates_correct_pr_title_single_version
     stub_github_api_success
     creator = create_creator(["3.4.0"], [".github/ruby-versions.json"])
@@ -190,7 +219,91 @@ def stub_github_api_with_existing_pr
     stub_request(:get, "https://api.github.com/repos/rails/devcontainer/pulls?state=open")
       .to_return(
         status: 200,
-        body: JSON.generate([{ number: 100, labels: [{ name: "automation" }, { name: "ruby-versions" }] }]),
+        body: JSON.generate([
+          {
+            number: 100,
+            title: "Add Ruby version: 3.3.9",
+            head: { ref: "automated/ruby-versions-old" },
+            labels: [{ name: "automation" }, { name: "ruby-versions" }]
+          }
+        ]),
+        headers: json_headers
+      )
+
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer/contents/.github/ruby-versions.json?ref=automated/ruby-versions-old")
+      .to_return(
+        status: 200,
+        body: JSON.generate({ content: Base64.strict_encode64(JSON.generate(["3.3.9", "3.3.8"])) }),
+        headers: json_headers
+      )
+
+    stub_request(:post, "https://api.github.com/repos/rails/devcontainer/issues/100/comments")
+      .to_return(status: 201, body: JSON.generate({ id: 1 }), headers: json_headers)
+
+    stub_request(:patch, "https://api.github.com/repos/rails/devcontainer/pulls/100")
+      .to_return(status: 200, body: JSON.generate({ number: 100, state: "closed" }), headers: json_headers)
+
+    stub_request(:post, "https://api.github.com/repos/rails/devcontainer/pulls")
+      .to_return(
+        status: 201,
+        body: JSON.generate({ number: 123, html_url: "https://github.com/rails/devcontainer/pull/123" }),
+        headers: json_headers
+      )
+
+    stub_request(:post, "https://api.github.com/repos/rails/devcontainer/issues/123/labels")
+      .to_return(status: 200, body: JSON.generate([]), headers: json_headers)
+  end
+
+  def stub_github_api_with_matching_existing_pr
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer")
+      .to_return(status: 200, body: JSON.generate({ full_name: "rails/devcontainer" }), headers: json_headers)
+
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer/pulls?state=open")
+      .to_return(
+        status: 200,
+        body: JSON.generate([
+          {
+            number: 100,
+            title: "Add Ruby version: 3.4.0",
+            body: "Automated Ruby Version Update for 3.4.0",
+            html_url: "https://github.com/rails/devcontainer/pull/100",
+            head: { ref: "automated/ruby-versions-100" },
+            labels: [{ name: "automation" }, { name: "ruby-versions" }]
+          }
+        ]),
+        headers: json_headers
+      )
+
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer/contents/.github/ruby-versions.json?ref=automated/ruby-versions-100")
+      .to_return(
+        status: 200,
+        body: JSON.generate({ content: Base64.strict_encode64(JSON.generate(["3.4.0", "3.3.10"])) }),
+        headers: json_headers
+      )
+  end
+
+  def stub_github_api_with_empty_versions_file_pr
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer")
+      .to_return(status: 200, body: JSON.generate({ full_name: "rails/devcontainer" }), headers: json_headers)
+
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer/pulls?state=open")
+      .to_return(
+        status: 200,
+        body: JSON.generate([
+          {
+            number: 100,
+            title: "Add Ruby version: 3.4.0",
+            head: { ref: "automated/ruby-versions-empty" },
+            labels: [{ name: "automation" }, { name: "ruby-versions" }]
+          }
+        ]),
+        headers: json_headers
+      )
+
+    stub_request(:get, "https://api.github.com/repos/rails/devcontainer/contents/.github/ruby-versions.json?ref=automated/ruby-versions-empty")
+      .to_return(
+        status: 200,
+        body: JSON.generate({ content: "" }),
         headers: json_headers
       )