From 8895acf059f7267dc939f9b4e6b047c0700b6324 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 21 May 2018 22:57:32 +0200 Subject: [PATCH 1/4] Activate Homebrew-Cask tap migration. --- Library/Homebrew/compat/tap.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/Library/Homebrew/compat/tap.rb b/Library/Homebrew/compat/tap.rb index 4230dcef7c..835b1ea48e 100644 --- a/Library/Homebrew/compat/tap.rb +++ b/Library/Homebrew/compat/tap.rb @@ -5,9 +5,6 @@ class Tap return unless user == "caskroom" - # TODO: Remove this check after migration. - return unless repo == "tap-migration-test" - new_user = "Homebrew" new_repo = (repo == "cask") ? repo : "cask-#{repo}" From 54834ccbe3b97707bae1482d3bc10039ec1c01d6 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 25 May 2018 16:21:37 +0200 Subject: [PATCH 2/4] Move `repo_var` method to `Tap` class. --- Library/Homebrew/cmd/update-report.rb | 11 ++--------- Library/Homebrew/tap.rb | 7 +++++++ Library/Homebrew/test/cmd/update-report_spec.rb | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index ee08cd6e09..013cab3a91 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -327,11 +327,11 @@ class Reporter def initialize(tap) @tap = tap - initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{repo_var}" + initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{tap.repo_var}" @initial_revision = ENV[initial_revision_var].to_s raise ReporterRevisionUnsetError, initial_revision_var if @initial_revision.empty? - current_revision_var = "HOMEBREW_UPDATE_AFTER#{repo_var}" + current_revision_var = "HOMEBREW_UPDATE_AFTER#{tap.repo_var}" @current_revision = ENV[current_revision_var].to_s raise ReporterRevisionUnsetError, current_revision_var if @current_revision.empty? end @@ -531,13 +531,6 @@ class Reporter private - def repo_var - @repo_var ||= tap.path.to_s - .strip_prefix(Tap::TAP_DIRECTORY.to_s) - .tr("^A-Za-z0-9", "_") - .upcase - end - def diff Utils.popen_read( "git", "-C", tap.path, "diff-tree", "-r", "--name-status", "--diff-filter=AMDR", diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index bcd205bab8..eec9c175ab 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -111,6 +111,13 @@ class Tap "https://github.com/#{full_name}" end + def repo_var + @repo_var ||= path.to_s + .strip_prefix(TAP_DIRECTORY.to_s) + .tr("^A-Za-z0-9", "_") + .upcase + end + # True if this {Tap} is a git repository. def git? path.git? diff --git a/Library/Homebrew/test/cmd/update-report_spec.rb b/Library/Homebrew/test/cmd/update-report_spec.rb index b98ff49916..50b33bf70a 100644 --- a/Library/Homebrew/test/cmd/update-report_spec.rb +++ b/Library/Homebrew/test/cmd/update-report_spec.rb @@ -20,8 +20,8 @@ describe Reporter do def initialize(tap) @tap = tap - ENV["HOMEBREW_UPDATE_BEFORE#{repo_var}"] = "12345678" - ENV["HOMEBREW_UPDATE_AFTER#{repo_var}"] = "abcdef00" + ENV["HOMEBREW_UPDATE_BEFORE#{tap.repo_var}"] = "12345678" + ENV["HOMEBREW_UPDATE_AFTER#{tap.repo_var}"] = "abcdef00" super(tap) end From 7b017b6ca9abf147a50921b40c1d3bf57a3cc85e Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 25 May 2018 16:22:46 +0200 Subject: [PATCH 3/4] Add compatibility layer for `brew update` revisions. --- Library/Homebrew/compat/tap.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Library/Homebrew/compat/tap.rb b/Library/Homebrew/compat/tap.rb index 835b1ea48e..7d2b378577 100644 --- a/Library/Homebrew/compat/tap.rb +++ b/Library/Homebrew/compat/tap.rb @@ -5,6 +5,9 @@ class Tap return unless user == "caskroom" + old_initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{repo_var}" + old_current_revision_var = "HOMEBREW_UPDATE_AFTER#{repo_var}" + new_user = "Homebrew" new_repo = (repo == "cask") ? repo : "cask-#{repo}" @@ -14,6 +17,12 @@ class Tap super(new_user, new_repo) + new_initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{repo_var}" + new_current_revision_var = "HOMEBREW_UPDATE_AFTER#{repo_var}" + + ENV[new_initial_revision_var] ||= ENV[old_initial_revision_var] + ENV[new_current_revision_var] ||= ENV[old_current_revision_var] + return unless old_path.git? new_name = name From 675d5fe61f8ad0f396ff1ee0370383790f50b52f Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 25 May 2018 17:28:43 +0200 Subject: [PATCH 4/4] Fix `spec_helper` cleanup. --- Library/Homebrew/test/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index eef774b48f..30c406a8c7 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -134,6 +134,7 @@ RSpec.configure do |config| HOMEBREW_PREFIX/"opt", HOMEBREW_PREFIX/"Caskroom", HOMEBREW_LIBRARY/"Taps/caskroom", + HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-foo",