From 7655a6f91ade0d69fd6333b24e409869480d9e18 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 25 Sep 2024 09:52:28 -0400 Subject: [PATCH 1/4] chore: remote_repo -> remote_repository Signed-off-by: Rui Chen --- Library/Homebrew/dev-cmd/bump-cask-pr.rb | 2 +- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 2 +- Library/Homebrew/dev-cmd/bump.rb | 2 +- Library/Homebrew/test/download_strategies/git_spec.rb | 10 +++++----- Library/Homebrew/test/tap_spec.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb index 52cd7b1ddb..953501321c 100644 --- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb @@ -248,7 +248,7 @@ module Homebrew sig { params(cask: Cask::Cask, new_version: BumpVersionParser).void } def check_pull_requests(cask, new_version:) - tap_remote_repo = cask.tap.full_name || cask.tap.remote_repo + tap_remote_repo = cask.tap.full_name || cask.tap.remote_repository file = cask.sourcefile_path.relative_path_from(cask.tap.path).to_s quiet = args.quiet? diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 5f93b441a3..9164cdeed6 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -129,7 +129,7 @@ module Homebrew # spamming during normal output. Homebrew.install_bundler_gems!(groups: ["audit", "style"]) unless args.no_audit? - tap_remote_repo = formula.tap.full_name || formula.tap.remote_repo + tap_remote_repo = formula.tap.full_name || formula.tap.remote_repository remote = "origin" remote_branch = formula.tap.git_repository.origin_branch_name previous_branch = "-" diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index 9cd3ce2706..5f79a9c022 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -270,7 +270,7 @@ module Homebrew ).returns T.nilable(T.any(T::Array[String], String)) } def retrieve_pull_requests(formula_or_cask, name, version: nil) - tap_remote_repo = formula_or_cask.tap&.remote_repo || formula_or_cask.tap&.full_name + tap_remote_repository = formula_or_cask.tap&.remote_repository || formula_or_cask.tap&.full_name pull_requests = begin GitHub.fetch_pull_requests(name, tap_remote_repo, version:) rescue GitHub::API::ValidationFailedError => e diff --git a/Library/Homebrew/test/download_strategies/git_spec.rb b/Library/Homebrew/test/download_strategies/git_spec.rb index 42f1fdaeb4..4f75e28214 100644 --- a/Library/Homebrew/test/download_strategies/git_spec.rb +++ b/Library/Homebrew/test/download_strategies/git_spec.rb @@ -50,16 +50,16 @@ RSpec.describe GitDownloadStrategy do end describe "#fetch_last_commit" do - let(:url) { "file://#{remote_repo}" } + let(:url) { "file://#{remote_repository}" } let(:version) { Version.new("HEAD") } - let(:remote_repo) { HOMEBREW_PREFIX/"remote_repo" } + let(:remote_repository) { HOMEBREW_PREFIX/"remote_repository" } - before { remote_repo.mkpath } + before { remote_repository.mkpath } - after { FileUtils.rm_rf remote_repo } + after { FileUtils.rm_rf remote_repository } it "fetches the hash of the last commit" do - remote_repo.cd do + remote_repository.cd do setup_git_repo FileUtils.touch "LICENSE" git_commit_all diff --git a/Library/Homebrew/test/tap_spec.rb b/Library/Homebrew/test/tap_spec.rb index 9c969e44b7..b1826bda23 100644 --- a/Library/Homebrew/test/tap_spec.rb +++ b/Library/Homebrew/test/tap_spec.rb @@ -234,7 +234,7 @@ RSpec.describe Tap do end end - describe "#remote_repo" do + describe "#remote_repository" do it "returns the remote https repository" do setup_git_repo From b178a802209bec4fd9bfa561a080df69874b2fc4 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 25 Sep 2024 10:00:00 -0400 Subject: [PATCH 2/4] update tap_remote_repo ref Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> --- Library/Homebrew/dev-cmd/bump.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index 5f79a9c022..ec433b2d18 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -272,7 +272,7 @@ module Homebrew def retrieve_pull_requests(formula_or_cask, name, version: nil) tap_remote_repository = formula_or_cask.tap&.remote_repository || formula_or_cask.tap&.full_name pull_requests = begin - GitHub.fetch_pull_requests(name, tap_remote_repo, version:) + GitHub.fetch_pull_requests(name, tap_remote_repository, version:) rescue GitHub::API::ValidationFailedError => e odebug "Error fetching pull requests for #{formula_or_cask} #{name}: #{e}" nil From 874fdaaa42eeb0e73c8810980c30fe27a0b31554 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 25 Sep 2024 10:00:53 -0400 Subject: [PATCH 3/4] ignore remote_repo refs in tests Signed-off-by: Rui Chen --- Library/Homebrew/test/download_strategies/git_spec.rb | 10 +++++----- Library/Homebrew/test/tap_spec.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/test/download_strategies/git_spec.rb b/Library/Homebrew/test/download_strategies/git_spec.rb index 4f75e28214..42f1fdaeb4 100644 --- a/Library/Homebrew/test/download_strategies/git_spec.rb +++ b/Library/Homebrew/test/download_strategies/git_spec.rb @@ -50,16 +50,16 @@ RSpec.describe GitDownloadStrategy do end describe "#fetch_last_commit" do - let(:url) { "file://#{remote_repository}" } + let(:url) { "file://#{remote_repo}" } let(:version) { Version.new("HEAD") } - let(:remote_repository) { HOMEBREW_PREFIX/"remote_repository" } + let(:remote_repo) { HOMEBREW_PREFIX/"remote_repo" } - before { remote_repository.mkpath } + before { remote_repo.mkpath } - after { FileUtils.rm_rf remote_repository } + after { FileUtils.rm_rf remote_repo } it "fetches the hash of the last commit" do - remote_repository.cd do + remote_repo.cd do setup_git_repo FileUtils.touch "LICENSE" git_commit_all diff --git a/Library/Homebrew/test/tap_spec.rb b/Library/Homebrew/test/tap_spec.rb index b1826bda23..9c969e44b7 100644 --- a/Library/Homebrew/test/tap_spec.rb +++ b/Library/Homebrew/test/tap_spec.rb @@ -234,7 +234,7 @@ RSpec.describe Tap do end end - describe "#remote_repository" do + describe "#remote_repo" do it "returns the remote https repository" do setup_git_repo From 09b71befb4db70c444969d0e2479c1323d12dd3c Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 25 Sep 2024 10:03:17 -0400 Subject: [PATCH 4/4] revert tap_remote_repository change Signed-off-by: Rui Chen --- Library/Homebrew/dev-cmd/bump.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index ec433b2d18..10ebb49e12 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -270,9 +270,9 @@ module Homebrew ).returns T.nilable(T.any(T::Array[String], String)) } def retrieve_pull_requests(formula_or_cask, name, version: nil) - tap_remote_repository = formula_or_cask.tap&.remote_repository || formula_or_cask.tap&.full_name + tap_remote_repo = formula_or_cask.tap&.remote_repository || formula_or_cask.tap&.full_name pull_requests = begin - GitHub.fetch_pull_requests(name, tap_remote_repository, version:) + GitHub.fetch_pull_requests(name, tap_remote_repo, version:) rescue GitHub::API::ValidationFailedError => e odebug "Error fetching pull requests for #{formula_or_cask} #{name}: #{e}" nil