diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 45b6136723..3a54b0465f 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -275,7 +275,7 @@ module Formulary def load_file(flags:, ignore_errors:) if %r{githubusercontent.com/[\w-]+/[\w-]+/[a-f0-9]{40}(?:/Formula)?/(?[\w+-.@]+).rb} =~ url raise UsageError, "Installation of #{formula_name} from a GitHub commit URL is unsupported! " \ - "`brew extract #{formula_name}` to a stable tap on GitHub instead." + "`brew extract #{formula_name}` to a stable tap on GitHub instead." elsif url.match?(%r{^(https?|ftp)://}) raise UsageError, "Non-checksummed download of #{name} formula file from an arbitrary URL is unsupported! ", "`brew extract` or `brew create` and `brew tap-new` to create a "\ diff --git a/Library/Homebrew/rubocops/components_order.rb b/Library/Homebrew/rubocops/components_order.rb index 0cc492f915..7318bd6211 100644 --- a/Library/Homebrew/rubocops/components_order.rb +++ b/Library/Homebrew/rubocops/components_order.rb @@ -205,8 +205,8 @@ module RuboCop return if tap_style_exception? :components_order_exceptions problem "`#{format_component(c1)}` (line #{line_number(c1)}) " \ - "should be put before `#{format_component(c2)}` " \ - "(line #{line_number(c2)})" do |corrector| + "should be put before `#{format_component(c2)}` " \ + "(line #{line_number(c2)})" do |corrector| reorder_components(corrector, c1, c2) end end diff --git a/Library/Homebrew/rubocops/lines.rb b/Library/Homebrew/rubocops/lines.rb index 5b8f586b42..7bdb0e3d7a 100644 --- a/Library/Homebrew/rubocops/lines.rb +++ b/Library/Homebrew/rubocops/lines.rb @@ -205,7 +205,7 @@ module RuboCop find_method_with_args(body_node, :depends_on, "mpich") do problem "Formulae in homebrew/core should use 'depends_on \"open-mpi\"' " \ - "instead of '#{@offensive_node.source}'." do |corrector| + "instead of '#{@offensive_node.source}'." do |corrector| corrector.replace(@offensive_node.source_range, "depends_on \"open-mpi\"") end end @@ -340,7 +340,7 @@ module RuboCop offending_node(str) problem "References to `#{content}` should "\ - "match the specified python dependency (`#{fix}`)" do |corrector| + "match the specified python dependency (`#{fix}`)" do |corrector| corrector.replace(str.source_range, "\"#{fix}\"") end end diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb index 7ed678d254..b5392fdd69 100644 --- a/Library/Homebrew/test/dev-cmd/audit_spec.rb +++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb @@ -293,7 +293,7 @@ module Homebrew end it "checks online and verifies that a standard license id is the same "\ - "as what is indicated on its Github repo", :needs_network do + "as what is indicated on its Github repo", :needs_network do formula_text = <<~RUBY class Cask < Formula url "https://github.com/cask/cask/archive/v0.8.4.tar.gz" @@ -309,7 +309,7 @@ module Homebrew end it "checks online and verifies that a standard license id with AND is the same "\ - "as what is indicated on its Github repo", :needs_network do + "as what is indicated on its Github repo", :needs_network do formula_text = <<~RUBY class Cask < Formula url "https://github.com/cask/cask/archive/v0.8.4.tar.gz" @@ -325,7 +325,7 @@ module Homebrew end it "checks online and verifies that a standard license id with WITH is the same "\ - "as what is indicated on its Github repo", :needs_network do + "as what is indicated on its Github repo", :needs_network do formula_text = <<~RUBY class Cask < Formula url "https://github.com/cask/cask/archive/v0.8.4.tar.gz" @@ -407,7 +407,7 @@ module Homebrew end it "checks online and detects that a formula-specified license is not "\ - "the same as what is indicated on its Github repository", :needs_network do + "the same as what is indicated on its Github repository", :needs_network do formula_text = <<~RUBY class Cask < Formula url "https://github.com/cask/cask/archive/v0.8.4.tar.gz" @@ -441,7 +441,7 @@ module Homebrew end it "checks online and detects that an array of license does not contain "\ - "what is indicated on its Github repository", :needs_network do + "what is indicated on its Github repository", :needs_network do formula_text = <<~RUBY class Cask < Formula url "https://github.com/cask/cask/archive/v0.8.4.tar.gz" @@ -454,11 +454,11 @@ module Homebrew fa.audit_license expect(fa.problems.first[:message]).to match "Formula license [\"0BSD\", \"MIT\"] "\ - "does not match GitHub license [\"GPL-3.0\"]." + "does not match GitHub license [\"GPL-3.0\"]." end it "checks online and verifies that an array of license contains "\ - "what is indicated on its Github repository", :needs_network do + "what is indicated on its Github repository", :needs_network do formula_text = <<~RUBY class Cask < Formula url "https://github.com/cask/cask/archive/v0.8.4.tar.gz" diff --git a/Library/Homebrew/test/rubocops/cask/homepage_url_trailing_slash_spec.rb b/Library/Homebrew/test/rubocops/cask/homepage_url_trailing_slash_spec.rb index 148c6a6077..c05f24844d 100644 --- a/Library/Homebrew/test/rubocops/cask/homepage_url_trailing_slash_spec.rb +++ b/Library/Homebrew/test/rubocops/cask/homepage_url_trailing_slash_spec.rb @@ -51,7 +51,7 @@ describe RuboCop::Cop::Cask::HomepageUrlTrailingSlash do let(:expected_offenses) do [{ message: "'https://foo.brew.sh' must have a slash "\ - "after the domain.", + "after the domain.", severity: :convention, line: 2, column: 11, diff --git a/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb b/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb index 0afabf0386..aa08a97ec2 100644 --- a/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb +++ b/Library/Homebrew/test/rubocops/cask/stanza_order_spec.rb @@ -110,7 +110,7 @@ describe RuboCop::Cop::Cask::StanzaOrder do line: 3, column: 2, source: "uninstall :quit => 'com.example.foo',\n" \ - " :kext => 'com.example.foo.kext'", + " :kext => 'com.example.foo.kext'", }, { message: "`version` stanza out of order", severity: :convention, diff --git a/Library/Homebrew/test/utils/pypi_spec.rb b/Library/Homebrew/test/utils/pypi_spec.rb index 348f9dd10d..31a1fd2c44 100644 --- a/Library/Homebrew/test/utils/pypi_spec.rb +++ b/Library/Homebrew/test/utils/pypi_spec.rb @@ -6,11 +6,11 @@ require "utils/pypi" describe PyPI do let(:package_url) do "https://files.pythonhosted.org/packages/b0/3f/2e1dad67eb172b6443b5eb37eb885a054a55cfd733393071499514140282/"\ - "snakemake-5.29.0.tar.gz" + "snakemake-5.29.0.tar.gz" end let(:old_package_url) do "https://files.pythonhosted.org/packages/6f/c4/da52bfdd6168ea46a0fe2b7c983b6c34c377a8733ec177cc00b197a96a9f/"\ - "snakemake-5.28.0.tar.gz" + "snakemake-5.28.0.tar.gz" end describe PyPI::Package do diff --git a/Library/Homebrew/uninstall.rb b/Library/Homebrew/uninstall.rb index 0e835b2013..5f662bfe73 100644 --- a/Library/Homebrew/uninstall.rb +++ b/Library/Homebrew/uninstall.rb @@ -137,7 +137,7 @@ module Homebrew def are_required_by_deps "#{"is".pluralize(reqs.count)} required by #{deps.to_sentence}, " \ - "which #{"is".pluralize(deps.count)} currently installed" + "which #{"is".pluralize(deps.count)} currently installed" end end diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb index 3d20136514..a1efb5b9bd 100644 --- a/Library/Homebrew/utils/analytics.rb +++ b/Library/Homebrew/utils/analytics.rb @@ -274,10 +274,10 @@ module Utils formatted_percent_header = format "%#{percent_width}s", percent_header puts "#{formatted_index_header} | #{formatted_name_with_options_header} | "\ - "#{formatted_count_header} | #{formatted_percent_header}" + "#{formatted_count_header} | #{formatted_percent_header}" columns_line = "#{"-"*index_width}:|-#{"-"*name_with_options_width}-|-"\ - "#{"-"*count_width}:|-#{"-"*percent_width}:" + "#{"-"*count_width}:|-#{"-"*percent_width}:" puts columns_line index = 0 @@ -296,7 +296,7 @@ module Utils format_percent((count.to_i * 100) / total_count.to_f) end puts "#{formatted_index} | #{formatted_name_with_options} | " \ - "#{formatted_count} | #{formatted_percent}%" + "#{formatted_count} | #{formatted_percent}%" next if index > 10 end return unless results.length > 1 @@ -310,7 +310,7 @@ module Utils formatted_total_percent_footer = format "%#{percent_width}s", formatted_total_percent puts "#{formatted_total_footer} | #{formatted_blank_footer} | "\ - "#{formatted_total_count_footer} | #{formatted_total_percent_footer}%" + "#{formatted_total_count_footer} | #{formatted_total_percent_footer}%" end def config_true?(key) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 8783284f57..e7782048b2 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -195,7 +195,7 @@ module PyPI input_packages.each do |existing_package| if existing_package.same_package?(extra_package) && existing_package.version != extra_package.version odie "Conflicting versions specified for the `#{extra_package.name}` package: "\ - "#{existing_package.version}, #{extra_package.version}" + "#{existing_package.version}, #{extra_package.version}" end end