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

Merge pull request #6558 from MikeMcQuaid/ruby-2.6-fixes

Browse Source 
Ruby 2.6.3 fixes
This commit is contained in:
Mike McQuaid 2019-10-08 19:35:41 +01:00 committed by GitHub
commit aa043c1d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/man.rb
View File

@ -125,7 +125,7 @@ module Homebrew
ronn.write markup ronn.write markup
ronn.close_write ronn.close_write
ronn_output = ronn.read ronn_output = ronn.read
odie "Got no output from ronn!" unless ronn_output odie "Got no output from ronn!" if ronn_output.blank?
if format_flag == "--markdown" if format_flag == "--markdown"
ronn_output = ronn_output.gsub(%r{<var>(.*?)</var>}, "*`\\1`*") ronn_output = ronn_output.gsub(%r{<var>(.*?)</var>}, "*`\\1`*")
.gsub(/\n\n\n+/, "\n\n") .gsub(/\n\n\n+/, "\n\n")

6
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -139,7 +139,11 @@ module Homebrew
end end
def check_ruby_version def check_ruby_version
ruby_version = "2.3.7" ruby_version = if MacOS.version >= :catalina
"2.6.3"
else
"2.3.7"
end
return if RUBY_VERSION == ruby_version return if RUBY_VERSION == ruby_version
return if ARGV.homebrew_developer? && OS::Mac.prerelease? return if ARGV.homebrew_developer? && OS::Mac.prerelease?

2
Library/Homebrew/system_command.rb
View File

@ -96,7 +96,7 @@ class SystemCommand
return [] if set_variables.empty? return [] if set_variables.empty?
["env", *set_variables] ["/usr/bin/env", *set_variables]
end end
def sudo_prefix def sudo_prefix

1
Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.catalina.bottle.tar.gz Symbolic link
View File

@ -0,0 +1 @@
testball_bottle-0.1.yosemite.bottle.tar.gz

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

@ -47,8 +47,7 @@ RSpec.shared_context "integration test" do
example.run example.run
ensure ensure
FileUtils.rm HOMEBREW_PREFIX/"bin/brew" FileUtils.rm_r HOMEBREW_PREFIX/"bin"
FileUtils.rmdir HOMEBREW_PREFIX/"bin"
end end
end end

4
Library/Homebrew/test/system_command_spec.rb
View File

@ -23,7 +23,7 @@ describe SystemCommand do
it "includes the given variables explicitly" do it "includes the given variables explicitly" do
expect(Open3) expect(Open3)
.to receive(:popen3) .to receive(:popen3)
.with(an_instance_of(Hash), ["env", "env"], "A=1", "B=2", "C=3", "env", *env_args, {}) .with(an_instance_of(Hash), ["/usr/bin/env", "/usr/bin/env"], "A=1", "B=2", "C=3", "env", *env_args, {})
.and_call_original .and_call_original
command.run! command.run!
@ -49,7 +49,7 @@ describe SystemCommand do
expect(Open3) expect(Open3)
.to receive(:popen3) .to receive(:popen3)
.with(an_instance_of(Hash), ["/usr/bin/sudo", "/usr/bin/sudo"], "-E", "--", .with(an_instance_of(Hash), ["/usr/bin/sudo", "/usr/bin/sudo"], "-E", "--",
"env", "A=1", "B=2", "C=3", "env", *env_args, {}) "/usr/bin/env", "A=1", "B=2", "C=3", "env", *env_args, {})
.and_wrap_original do |original_popen3, *_, &block| .and_wrap_original do |original_popen3, *_, &block|
original_popen3.call("true", &block) original_popen3.call("true", &block)
end end

5
Library/Homebrew/test/unpack_strategy/subversion_spec.rb
View File

@ -8,9 +8,8 @@ describe UnpackStrategy::Subversion, :needs_svn do
let(:path) { working_copy } let(:path) { working_copy }
before do before do
system "svnadmin", "create", repo safe_system "xcrun", "svnadmin", "create", repo
safe_system "svn", "checkout", "file://#{repo}", working_copy
system "svn", "checkout", "file://#{repo}", working_copy
FileUtils.touch working_copy/"test" FileUtils.touch working_copy/"test"
system "svn", "add", working_copy/"test" system "svn", "add", working_copy/"test"