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

Merge pull request #6687 from jonchang/frozen-string-literal

Browse Source 
Ruby 2.6 frozen string literals
This commit is contained in:
Mike McQuaid 2019-11-04 10:33:13 +00:00 committed by GitHub
commit 33330ba5b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.rb
View File

@ -6,8 +6,8 @@ std_trap = trap("INT") { exit! 130 } # no backtrace thanks
# check ruby version before requiring any modules. # check ruby version before requiring any modules.
RUBY_X, RUBY_Y, = RUBY_VERSION.split(".").map(&:to_i) RUBY_X, RUBY_Y, = RUBY_VERSION.split(".").map(&:to_i)
if RUBY_X < 2 || (RUBY_X == 2 && RUBY_Y < 3) if RUBY_X < 2 || (RUBY_X == 2 && RUBY_Y < 6)
raise "Homebrew must be run under Ruby 2.3! You're running #{RUBY_VERSION}." raise "Homebrew must be run under Ruby 2.6! You're running #{RUBY_VERSION}."
end end
# Load Bundler first of all if it's needed to avoid Gem version conflicts. # Load Bundler first of all if it's needed to avoid Gem version conflicts.

12
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -1,6 +1,4 @@
# Uses ERB so can't use Frozen String Literals until >=Ruby 2.4: # frozen_string_literal: true
# https://bugs.ruby-lang.org/issues/12031
# frozen_string_literal: false
require "formula" require "formula"
require "utils/bottles" require "utils/bottles"
@ -11,7 +9,7 @@ require "cli/parser"
require "utils/inreplace" require "utils/inreplace"
require "erb" require "erb"
BOTTLE_ERB = <<-EOS.freeze BOTTLE_ERB = <<-EOS
bottle do bottle do
<% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %> <% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %>
root_url "<%= root_url %>" root_url "<%= root_url %>"
@ -43,7 +41,7 @@ module Homebrew
def bottle_args def bottle_args
Homebrew::CLI::Parser.new do Homebrew::CLI::Parser.new do
usage_banner <<~EOS.freeze usage_banner <<~EOS
`bottle` [<options>] <formula> `bottle` [<options>] <formula>
Generate a bottle (binary package) from a formula that was installed with Generate a bottle (binary package) from a formula that was installed with
@ -382,7 +380,7 @@ module Homebrew
"#{key}: old: #{old_value}, new: #{value}" "#{key}: old: #{old_value}, new: #{value}"
end end
odie <<~EOS.freeze odie <<~EOS
--keep-old was passed but there are changes in: --keep-old was passed but there are changes in:
#{mismatches.join("\n")} #{mismatches.join("\n")}
EOS EOS
@ -493,7 +491,7 @@ module Homebrew
end end
unless mismatches.empty? unless mismatches.empty?
odie <<~EOS.freeze odie <<~EOS
--keep-old was passed but there are changes in: --keep-old was passed but there are changes in:
#{mismatches.join("\n")} #{mismatches.join("\n")}
EOS EOS

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

@ -1,6 +1,4 @@
# Uses ERB so can't use Frozen String Literals until >=Ruby 2.4: # frozen_string_literal: true
# https://bugs.ruby-lang.org/issues/12031
# frozen_string_literal: false
require "formula" require "formula"
require "erb" require "erb"
@ -18,7 +16,7 @@ module Homebrew
def man_args def man_args
Homebrew::CLI::Parser.new do Homebrew::CLI::Parser.new do
usage_banner <<~EOS.freeze usage_banner <<~EOS
`man` [<options>] `man` [<options>]
Generate Homebrew's manpages. Generate Homebrew's manpages.