diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index da142f6820..4d20b6a909 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -416,7 +416,7 @@ module Cask return unless verified_matches_url? add_error "The URL's domain #{domain} matches the homepage domain #{homepage}, " \ - "the `verified` parameter of the `url` stanza is unnecessary. " \ + "the 'verified' parameter of the 'url' stanza is unnecessary. " \ "See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#when-url-and-homepage-hostnames-differ-add-verified" end @@ -427,7 +427,7 @@ module Cask return if verified_present? add_error "The URL's domain #{domain} does not match the homepage domain #{homepage}, " \ - "a `verified` parameter has to be added to the `url` stanza. " \ + "a 'verified' parameter has to be added to the 'url' stanza. " \ "See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#when-url-and-homepage-hostnames-differ-add-verified" end diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb index 3d711f4a82..a0d0ecb98c 100644 --- a/Library/Homebrew/cask/cmd/upgrade.rb +++ b/Library/Homebrew/cask/cmd/upgrade.rb @@ -101,7 +101,7 @@ module Cask return false if outdated_casks.empty? if casks.empty? && !greedy - ohai "Casks with `auto_updates` or `version :latest` will not be upgraded; pass `--greedy` to upgrade them." + ohai "Casks with 'auto_updates' or 'version :latest' will not be upgraded; pass `--greedy` to upgrade them." end verb = dry_run ? "Would upgrade" : "Upgrading" diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb index 2ae9494b99..3c277e20c4 100644 --- a/Library/Homebrew/exceptions.rb +++ b/Library/Homebrew/exceptions.rb @@ -384,8 +384,8 @@ class FormulaUnknownPythonError < RuntimeError The version of Python to use with the virtualenv in the `#{formula.full_name}` formula cannot be guessed automatically because a recognised Python dependency could not be found. - If you are using a non-standard Python depedency, please add `:using => "python@x.y"` to - `virtualenv_install_with_resources` to resolve the issue manually. + If you are using a non-standard Python dependency, please add `:using => "python@x.y"` + to 'virtualenv_install_with_resources' to resolve the issue manually. EOS end end @@ -394,10 +394,11 @@ end class FormulaAmbiguousPythonError < RuntimeError def initialize(formula) super <<~EOS - The version of python to use with the virtualenv in the `#{formula.full_name}` formula - cannot be guessed automatically. If the simultaneous use of multiple pythons - is intentional, please add `:using => "python@x.y"` to - `virtualenv_install_with_resources` to resolve the ambiguity manually. + The version of Python to use with the virtualenv in the `#{formula.full_name}` formula + cannot be guessed automatically. + + If the simultaneous use of multiple Pythons is intentional, please add `:using => "python@x.y"` + to 'virtualenv_install_with_resources' to resolve the ambiguity manually. EOS end end diff --git a/Library/Homebrew/extend/on_os.rb b/Library/Homebrew/extend/on_os.rb index a30a241d3b..5bf551fe59 100644 --- a/Library/Homebrew/extend/on_os.rb +++ b/Library/Homebrew/extend/on_os.rb @@ -7,7 +7,7 @@ module OnOS # # Do something Mac-specific # end def on_macos(&block) - raise "No block content defined for on_macos block" unless block + raise "No block content defined for 'on_macos' block" unless block end # Block only executed on Linux. No-op on macOS. @@ -15,7 +15,7 @@ module OnOS # # Do something Linux-specific # end def on_linux(&block) - raise "No block content defined for on_linux block" unless block + raise "No block content defined for 'on_linux' block" unless block end end diff --git a/Library/Homebrew/extend/os/linux/on_os.rb b/Library/Homebrew/extend/os/linux/on_os.rb index d1bbbab734..433d8b111b 100644 --- a/Library/Homebrew/extend/os/linux/on_os.rb +++ b/Library/Homebrew/extend/os/linux/on_os.rb @@ -3,7 +3,7 @@ module OnOS def on_linux(&block) - raise "No block content defined for on_linux block" unless block + raise "No block content defined for 'on_linux' block" unless block yield end diff --git a/Library/Homebrew/extend/os/mac/on_os.rb b/Library/Homebrew/extend/os/mac/on_os.rb index f043909555..e3f71dbd10 100644 --- a/Library/Homebrew/extend/os/mac/on_os.rb +++ b/Library/Homebrew/extend/os/mac/on_os.rb @@ -3,7 +3,7 @@ module OnOS def on_macos(&block) - raise "No block content defined for on_macos block" unless block + raise "No block content defined for 'on_macos' block" unless block yield end diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 68deb02245..0925fb3182 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -221,13 +221,13 @@ module Homebrew # Don't complain about missing cross-tap dependencies next rescue FormulaUnavailableError - problem "Can't find dependency #{dep.name.inspect}." + problem "Can't find dependency '#{dep.name.inspect}'." next rescue TapFormulaAmbiguityError - problem "Ambiguous dependency #{dep.name.inspect}." + problem "Ambiguous dependency '#{dep.name.inspect}'." next rescue TapFormulaWithOldnameAmbiguityError - problem "Ambiguous oldname dependency #{dep.name.inspect}." + problem "Ambiguous oldname dependency '#{dep.name.inspect}'." next end @@ -258,10 +258,10 @@ module Homebrew end end - problem "Dependency #{dep} does not define option #{opt.name.inspect}" + problem "Dependency '#{dep}' does not define option #{opt.name.inspect}" end - problem "Don't use git as a dependency (it's always available)" if @new_formula && dep.name == "git" + problem "Don't use 'git' as a dependency (it's always available)" if @new_formula && dep.name == "git" problem "Dependency '#{dep.name}' is marked as :run. Remove :run; it is a no-op." if dep.tags.include?(:run) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 8722df1f67..510a7f4e46 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -806,7 +806,7 @@ class FormulaInstaller fix_dynamic_linkage(keg) if !@poured_bottle || !formula.bottle_specification.skip_relocation? if build_bottle? - ohai "Not running post_install as we're building a bottle" + ohai "Not running 'post_install' as we're building a bottle" puts "You can run it manually using:" puts " brew postinstall #{formula.full_name}" else diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 1d029e2aab..6512856afa 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -356,7 +356,7 @@ class BottleSpecification if [HOMEBREW_DEFAULT_PREFIX, HOMEBREW_MACOS_ARM_DEFAULT_PREFIX, HOMEBREW_LINUX_DEFAULT_PREFIX].exclude?(prefix) - odeprecated "setting `prefix` for bottles" + odeprecated "setting 'prefix' for bottles" end @prefix = prefix end diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb index 6303db5ae9..4912e3885a 100644 --- a/Library/Homebrew/test/cask/audit_spec.rb +++ b/Library/Homebrew/test/cask/audit_spec.rb @@ -917,7 +917,7 @@ describe Cask::Audit, :cask do RUBY end - it { is_expected.to fail_with(/a `verified` parameter has to be added/) } + it { is_expected.to fail_with(/a 'verified' parameter has to be added/) } end context "when the url does not match the homepage with verified" do diff --git a/Library/Homebrew/utils/ast.rb b/Library/Homebrew/utils/ast.rb index fc320039e0..bc4e389b23 100644 --- a/Library/Homebrew/utils/ast.rb +++ b/Library/Homebrew/utils/ast.rb @@ -117,7 +117,7 @@ module Utils sig { params(name: Symbol, replacement: T.any(Numeric, String, Symbol), type: T.nilable(Symbol)).void } def replace_stanza(name, replacement, type: nil) stanza_node = stanza(name, type: type) - raise "Could not find `#{name}` stanza!" if stanza_node.blank? + raise "Could not find '#{name}' stanza!" if stanza_node.blank? tree_rewriter.replace(stanza_node.source_range, stanza_text(name, replacement, indent: 2).lstrip) end