admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #4174 from reitermarkus/cask-tap-migration

Browse Source 
Add compatibility layer for handling Cask Tap migration.
This commit is contained in:
Mike McQuaid 2018-05-21 14:45:14 +01:00 committed by GitHub
commit 5c3ec3e7ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cask/lib/hbc/audit.rb
View File

@ -60,7 +60,8 @@ module Hbc
return if @cask.sourcefile_path.nil?
tap = @cask.tap
return if tap.nil? || tap.user != "caskroom"
return if tap.nil?
return unless ["Homebrew", "caskroom"].include?(tap.user)
return unless cask.artifacts.any? { |k| k.is_a?(Hbc::Artifact::Pkg) && k.stanza_options.key?(:allow_untrusted) }
add_warning "allow_untrusted is not permitted in official Homebrew-Cask taps"

2
Library/Homebrew/cask/lib/hbc/cli/search.rb
View File

@ -21,7 +21,7 @@ module Hbc
def self.search_remote(query)
matches = begin
GitHub.search_code(
user: "caskroom",
user: ["Homebrew", "caskroom"],
path: "Casks",
filename: query,
extension: "rb",

2
Library/Homebrew/cask/lib/hbc/version.rb
View File

@ -3,7 +3,7 @@ module Hbc
@full_version ||= begin
<<~EOS
Homebrew-Cask #{HOMEBREW_VERSION}
caskroom/homebrew-cask #{Hbc.default_tap.version_string}
#{Hbc.default_tap.full_name} #{Hbc.default_tap.version_string}
EOS
end
end

2
Library/Homebrew/cmd/update-report.rb
View File

@ -470,7 +470,7 @@ class Reporter
next unless tabs.first.tap == tap # skip if installed formula is not from this tap.
new_tap = Tap.fetch(new_tap_name)
# For formulae migrated to cask: Auto-install cask or provide install instructions.
if new_tap_name == "caskroom/cask"
if ["homebrew/cask", "caskroom/cask"].include?(new_tap_name)
if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory?
ohai "#{name} has been moved to Homebrew-Cask."
ohai "brew unlink #{name}"

1
Library/Homebrew/compat.rb
View File

@ -9,3 +9,4 @@ require "compat/extend/string"
require "compat/gpg"
require "compat/dependable"
require "compat/os/mac"
require "compat/tap"

38
Library/Homebrew/compat/tap.rb Normal file
View File

@ -0,0 +1,38 @@
class Tap
module Compat
def initialize(user, repo)
super
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}"
old_name = name
old_path = path
old_remote = path.git_origin
super(new_user, new_repo)
return unless old_path.git?
new_name = name
new_path = path
new_remote = default_remote
ohai "Migrating tap #{old_name} to #{new_name}..." if $stdout.tty?
puts "Moving #{old_path} to #{new_path}..." if $stdout.tty?
path.dirname.mkpath
FileUtils.mv old_path, new_path
puts "Changing remote from #{old_remote} to #{new_remote}..." if $stdout.tty?
new_path.git_origin = new_remote
end
end
prepend Compat
end

7
Library/Homebrew/extend/git_repository.rb
View File

@ -13,6 +13,13 @@ module GitRepositoryExtension
end
end
def git_origin=(origin)
return unless git? && Utils.git_available?
cd do
safe_system "git", "remote", "set-url", "origin", origin
end
end
def git_head
return unless git? && Utils.git_available?
cd do

2
Library/Homebrew/missing_formula.rb
View File

@ -101,7 +101,7 @@ module Homebrew
EOS
break if new_tap_name == CoreTap.instance.name
install_cmd = if new_tap_user == "caskroom"
install_cmd = if new_tap_user == "caskroom" || (new_tap_user == "homebrew" && new_tap_repo.start_with?("cask"))
"cask install"
else
"install"

14
Library/Homebrew/test/cask/cli/info_spec.rb
View File

@ -12,7 +12,7 @@ describe Hbc::CLI::Info, :cask do
local-caffeine: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/local-caffeine.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/local-caffeine.rb
==> Name
None
==> Artifacts
@ -26,7 +26,7 @@ describe Hbc::CLI::Info, :cask do
local-caffeine: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/local-caffeine.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/local-caffeine.rb
==> Name
None
==> Artifacts
@ -34,7 +34,7 @@ describe Hbc::CLI::Info, :cask do
local-transmission: 2.61
http://example.com/local-transmission
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/local-transmission.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/local-transmission.rb
==> Name
None
==> Artifacts
@ -56,7 +56,7 @@ describe Hbc::CLI::Info, :cask do
with-caveats: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/with-caveats.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/with-caveats.rb
==> Name
None
==> Artifacts
@ -82,7 +82,7 @@ describe Hbc::CLI::Info, :cask do
with-conditional-caveats: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/with-conditional-caveats.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/with-conditional-caveats.rb
==> Name
None
==> Artifacts
@ -97,7 +97,7 @@ describe Hbc::CLI::Info, :cask do
with-languages: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/with-languages.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/with-languages.rb
==> Name
None
==> Languages
@ -114,7 +114,7 @@ describe Hbc::CLI::Info, :cask do
without-languages: 1.2.3
http://example.com/local-caffeine
Not installed
From: https://github.com/caskroom/homebrew-spec/blob/master/Casks/without-languages.rb
From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/without-languages.rb
==> Name
None
==> Artifacts

2
Library/Homebrew/test/cask/cli/style_spec.rb
View File

@ -89,7 +89,7 @@ describe Hbc::CLI::Style, :cask do
end
end
it { is_expected.to contain_exactly(a_path_ending_with("/caskroom/homebrew-spec/Casks"), a_path_ending_with("/third-party/homebrew-tap/Casks")) }
it { is_expected.to contain_exactly(a_path_ending_with("/homebrew/homebrew-cask-spec/Casks"), a_path_ending_with("/third-party/homebrew-tap/Casks")) }
end
context "when at least one cask token is a path that exists" do

3
Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
View File

@ -27,7 +27,7 @@ RSpec.shared_context "Homebrew-Cask" do
[Hbc::Config.global.binarydir, Hbc.caskroom, Hbc.cache].each(&:mkpath)
Hbc.default_tap = Tap.fetch("caskroom", "spec").tap do |tap|
Hbc.default_tap = Tap.fetch("Homebrew", "cask-spec").tap do |tap|
FileUtils.mkdir_p tap.path.dirname
FileUtils.ln_sf TEST_FIXTURE_DIR.join("cask"), tap.path
end
@ -42,7 +42,6 @@ RSpec.shared_context "Homebrew-Cask" do
FileUtils.rm_rf HOMEBREW_CASK_DIRS.values
FileUtils.rm_rf [Hbc::Config.global.binarydir, Hbc.caskroom, Hbc.cache]
Hbc.default_tap.path.unlink
FileUtils.rm_rf Hbc.default_tap.path.parent
third_party_tap.path.unlink
FileUtils.rm_rf third_party_tap.path.parent
end