aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-06-06 08:25:25 +0100
committerGitHub2017-06-06 08:25:25 +0100
commitd9abe6552d7d450c2afbf49170d008f4888e18fd (patch)
treefae03a68d89f2b333d669b2fc39c467692ae8140
parent29d226825221b929cc248dca4178085867a2afc8 (diff)
parent24d39430b50b8d9dfc4591bbf177c839f856bc6f (diff)
downloadbrew-d9abe6552d7d450c2afbf49170d008f4888e18fd.tar.bz2
Merge pull request #2738 from constXife/master
undefined local variable or method `ruby_version' on macOS 10.13 beta
-rw-r--r--Library/Homebrew/extend/os/mac/diagnostic.rb3
-rw-r--r--Library/Homebrew/test/os/mac/diagnostic_spec.rb13
2 files changed, 15 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 58d8c633d..913a5762b 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -195,7 +195,8 @@ module Homebrew
end
def check_ruby_version
- return if RUBY_VERSION[/\d\.\d/] == "2.0"
+ ruby_version = "2.0"
+ return if RUBY_VERSION[/\d\.\d/] == ruby_version
<<-EOS.undent
Ruby version #{RUBY_VERSION} is unsupported on #{MacOS.version}. Homebrew
diff --git a/Library/Homebrew/test/os/mac/diagnostic_spec.rb b/Library/Homebrew/test/os/mac/diagnostic_spec.rb
index 787f80fec..d6186e46b 100644
--- a/Library/Homebrew/test/os/mac/diagnostic_spec.rb
+++ b/Library/Homebrew/test/os/mac/diagnostic_spec.rb
@@ -45,4 +45,17 @@ describe Homebrew::Diagnostic::Checks do
expect(subject.check_homebrew_prefix)
.to match("Your Homebrew's prefix is not /usr/local.")
end
+
+ specify "#check_ruby_version" do
+ allow(MacOS).to receive(:version).and_return(OS::Mac::Version.new("10.13"))
+ stub_const("RUBY_VERSION", "2.3.3p222")
+
+ expect(subject.check_ruby_version)
+ .to match <<-EOS.undent
+ Ruby version 2.3.3p222 is unsupported on 10.13. Homebrew
+ is developed and tested on Ruby 2.0, and may not work correctly
+ on other Rubies. Patches are accepted as long as they don't cause breakage
+ on supported Rubies.
+ EOS
+ end
end