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

Fixup brew style failures.

Browse Source
This commit is contained in:
Mike McQuaid 2019-04-30 08:44:35 +01:00
parent 738f4689a5
commit c4f72312ce
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
72 changed files with 409 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/brew.rb
View File

@ -72,7 +72,7 @@ begin
if internal_dev_cmd && !ARGV.homebrew_developer? if internal_dev_cmd && !ARGV.homebrew_developer?
if (HOMEBREW_REPOSITORY/".git/config").exist? if (HOMEBREW_REPOSITORY/".git/config").exist?
system "git", "config", "--file=#{HOMEBREW_REPOSITORY}/.git/config", system "git", "config", "--file=#{HOMEBREW_REPOSITORY}/.git/config",
"--replace-all", "homebrew.devcmdrun", "true" "--replace-all", "homebrew.devcmdrun", "true"
end end
ENV["HOMEBREW_DEV_CMD_RUN"] = "1" ENV["HOMEBREW_DEV_CMD_RUN"] = "1"
end end

8
Library/Homebrew/cask/artifact/relocated.rb
View File

@ -62,8 +62,8 @@ module Cask
odebug "Adding #{ALT_NAME_ATTRIBUTE} metadata" odebug "Adding #{ALT_NAME_ATTRIBUTE} metadata"
altnames = command.run("/usr/bin/xattr", altnames = command.run("/usr/bin/xattr",
args: ["-p", ALT_NAME_ATTRIBUTE, file], args: ["-p", ALT_NAME_ATTRIBUTE, file],
print_stderr: false).stdout.sub(/\A\((.*)\)\Z/, '\1') print_stderr: false).stdout.sub(/\A\((.*)\)\Z/, '\1')
odebug "Existing metadata is: '#{altnames}'" odebug "Existing metadata is: '#{altnames}'"
altnames.concat(", ") unless altnames.empty? altnames.concat(", ") unless altnames.empty?
altnames.concat(%Q("#{altname}")) altnames.concat(%Q("#{altname}"))
@ -73,8 +73,8 @@ module Cask
command.run!("/bin/chmod", args: ["--", "u+rw", file, file.realpath]) command.run!("/bin/chmod", args: ["--", "u+rw", file, file.realpath])
command.run!("/usr/bin/xattr", command.run!("/usr/bin/xattr",
args: ["-w", ALT_NAME_ATTRIBUTE, altnames, file], args: ["-w", ALT_NAME_ATTRIBUTE, altnames, file],
print_stderr: false) print_stderr: false)
end end
def printable_target def printable_target

8
Library/Homebrew/cask/artifact/symlinked.rb
View File

@ -40,14 +40,14 @@ module Cask
def link(**options) def link(**options)
unless source.exist? unless source.exist?
raise CaskError, raise CaskError,
"It seems the #{self.class.link_type_english_name.downcase} " \ "It seems the #{self.class.link_type_english_name.downcase} " \
"source '#{source}' is not there." "source '#{source}' is not there."
end end
if target.exist? && !target.symlink? if target.exist? && !target.symlink?
raise CaskError, raise CaskError,
"It seems there is already #{self.class.english_article} " \ "It seems there is already #{self.class.english_article} " \
"#{self.class.english_name} at '#{target}'; not linking." "#{self.class.english_name} at '#{target}'; not linking."
end end
ohai "Linking #{self.class.english_name} '#{source.basename}' to '#{target}'." ohai "Linking #{self.class.english_name} '#{source.basename}' to '#{target}'."

8
Library/Homebrew/cask/cmd/internal_stanza.rb
View File

@ -49,10 +49,10 @@ module Cask
return if DSL::DSL_METHODS.include?(stanza) return if DSL::DSL_METHODS.include?(stanza)
raise ArgumentError, raise ArgumentError,
<<~EOS <<~EOS
Unknown/unsupported stanza: '#{stanza}' Unknown/unsupported stanza: '#{stanza}'
Check Cask reference for supported stanzas. Check Cask reference for supported stanzas.
EOS EOS
end end
def run def run

22
Library/Homebrew/cask/installer.rb
View File

@ -258,22 +258,22 @@ module Cask
operator, release = @cask.depends_on.macos.first operator, release = @cask.depends_on.macos.first
unless MacOS.version.send(operator, release) unless MacOS.version.send(operator, release)
raise CaskError, raise CaskError,
"Cask #{@cask} depends on macOS release #{operator} #{release}, " \ "Cask #{@cask} depends on macOS release #{operator} #{release}, " \
"but you are running release #{MacOS.version}." "but you are running release #{MacOS.version}."
end end
elsif @cask.depends_on.macos.length > 1 elsif @cask.depends_on.macos.length > 1
unless @cask.depends_on.macos.include?(Gem::Version.new(MacOS.version.to_s)) unless @cask.depends_on.macos.include?(Gem::Version.new(MacOS.version.to_s))
raise CaskError, raise CaskError,
"Cask #{@cask} depends on macOS release being one of " \ "Cask #{@cask} depends on macOS release being one of " \
"[#{@cask.depends_on.macos.map(&:to_s).join(", ")}], " \ "[#{@cask.depends_on.macos.map(&:to_s).join(", ")}], " \
"but you are running release #{MacOS.version}." "but you are running release #{MacOS.version}."
end end
else else
unless MacOS.version == @cask.depends_on.macos.first unless MacOS.version == @cask.depends_on.macos.first
raise CaskError, raise CaskError,
"Cask #{@cask} depends on macOS release " \ "Cask #{@cask} depends on macOS release " \
"#{@cask.depends_on.macos.first}, " \ "#{@cask.depends_on.macos.first}, " \
"but you are running release #{MacOS.version}." "but you are running release #{MacOS.version}."
end end
end end
end end
@ -288,9 +288,9 @@ module Cask
end end
raise CaskError, raise CaskError,
"Cask #{@cask} depends on hardware architecture being one of " \ "Cask #{@cask} depends on hardware architecture being one of " \
"[#{@cask.depends_on.arch.map(&:to_s).join(", ")}], " \ "[#{@cask.depends_on.arch.map(&:to_s).join(", ")}], " \
"but you are running #{@current_arch}" "but you are running #{@current_arch}"
end end
def x11_dependencies def x11_dependencies

4
Library/Homebrew/cleanup.rb
View File

@ -385,8 +385,8 @@ module Homebrew
end end
dirs.select(&:directory?).each do |dir| dirs.select(&:directory?).each do |dir|
system_command "find", system_command "find",
args: [dir, "-name", ".DS_Store", "-delete"], args: [dir, "-name", ".DS_Store", "-delete"],
print_stderr: false print_stderr: false
end end
end end

4
Library/Homebrew/cmd/--cache.rb
View File

@ -16,9 +16,9 @@ module Homebrew
If <formula> is provided, display the file or directory used to cache <formula>. If <formula> is provided, display the file or directory used to cache <formula>.
EOS EOS
switch "-s", "--build-from-source", switch "-s", "--build-from-source",
description: "Show the cache file used when building from source." description: "Show the cache file used when building from source."
switch "--force-bottle", switch "--force-bottle",
description: "Show the cache file used when pouring a bottle." description: "Show the cache file used when pouring a bottle."
conflicts "--build-from-source", "--force-bottle" conflicts "--build-from-source", "--force-bottle"
end end
end end

6
Library/Homebrew/cmd/--env.rb
View File

@ -19,10 +19,10 @@ module Homebrew
the list is formatted for export to `bash`(1) unless `--plain` is passed. the list is formatted for export to `bash`(1) unless `--plain` is passed.
EOS EOS
flag "--shell=", flag "--shell=",
description: "Generate a list of environment variables for the specified shell, " \ description: "Generate a list of environment variables for the specified shell, " \
"or `--shell=auto` to detect the current shell." "or `--shell=auto` to detect the current shell."
switch "--plain", switch "--plain",
description: "Plain output even when piped." description: "Plain output even when piped."
end end
end end

6
Library/Homebrew/cmd/analytics.rb
View File

@ -44,12 +44,12 @@ module Homebrew
end end
when "on" when "on"
safe_system "git", "config", "--file=#{config_file}", safe_system "git", "config", "--file=#{config_file}",
"--replace-all", "homebrew.analyticsdisabled", "false" "--replace-all", "homebrew.analyticsdisabled", "false"
safe_system "git", "config", "--file=#{config_file}", safe_system "git", "config", "--file=#{config_file}",
"--replace-all", "homebrew.analyticsmessage", "true" "--replace-all", "homebrew.analyticsmessage", "true"
when "off" when "off"
safe_system "git", "config", "--file=#{config_file}", safe_system "git", "config", "--file=#{config_file}",
"--replace-all", "homebrew.analyticsdisabled", "true" "--replace-all", "homebrew.analyticsdisabled", "true"
system "git", "config", "--file=#{config_file}", "--unset-all", "homebrew.analyticsuuid" system "git", "config", "--file=#{config_file}", "--unset-all", "homebrew.analyticsuuid"
when "regenerate-uuid" when "regenerate-uuid"
# it will be regenerated in next run. # it will be regenerated in next run.

12
Library/Homebrew/cmd/cleanup.rb
View File

@ -17,15 +17,15 @@ module Homebrew
EOS EOS
flag "--prune=", flag "--prune=",
description: "Remove all cache files older than specified <days>." description: "Remove all cache files older than specified <days>."
switch "-n", "--dry-run", switch "-n", "--dry-run",
description: "Show what would be removed, but do not actually remove anything." description: "Show what would be removed, but do not actually remove anything."
switch "-s", switch "-s",
description: "Scrub the cache, including downloads for even the latest versions. "\ description: "Scrub the cache, including downloads for even the latest versions. "\
"Note downloads for any installed formula or cask will still not be deleted. "\ "Note downloads for any installed formula or cask will still not be deleted. "\
"If you want to delete those too: `rm -rf \"$(brew --cache)\"`" "If you want to delete those too: `rm -rf \"$(brew --cache)\"`"
switch "--prune-prefix", switch "--prune-prefix",
description: "Only prune the symlinks and directories from the prefix and remove no other files." description: "Only prune the symlinks and directories from the prefix and remove no other files."
switch :verbose switch :verbose
switch :debug switch :debug
end end

6
Library/Homebrew/cmd/commands.rb
View File

@ -13,10 +13,10 @@ module Homebrew
Show a list of built-in and external commands. Show a list of built-in and external commands.
EOS EOS
switch "--quiet", switch "--quiet",
description: "List only the names of commands without the header." description: "List only the names of commands without the header."
switch "--include-aliases", switch "--include-aliases",
depends_on: "--quiet", depends_on: "--quiet",
description: "Include the aliases of internal commands." description: "Include the aliases of internal commands."
switch :verbose switch :verbose
switch :debug switch :debug
end end

38
Library/Homebrew/cmd/deps.rb
View File

@ -17,38 +17,38 @@ module Homebrew
show the intersection of dependencies for each formula. show the intersection of dependencies for each formula.
EOS EOS
switch "-n", switch "-n",
description: "Show dependencies in topological order." description: "Show dependencies in topological order."
switch "--1", switch "--1",
description: "Only show dependencies one level down, instead of recursing." description: "Only show dependencies one level down, instead of recursing."
switch "--union", switch "--union",
description: "Show the union of dependencies for multiple <formula>, instead of the intersection." description: "Show the union of dependencies for multiple <formula>, instead of the intersection."
switch "--full-name", switch "--full-name",
description: "List dependencies by their full name." description: "List dependencies by their full name."
switch "--include-build", switch "--include-build",
description: "Include `:build` dependencies for <formula>." description: "Include `:build` dependencies for <formula>."
switch "--include-optional", switch "--include-optional",
description: "Include `:optional` dependencies for <formula>." description: "Include `:optional` dependencies for <formula>."
switch "--include-test", switch "--include-test",
description: "Include `:test` dependencies for <formula> (non-recursive)." description: "Include `:test` dependencies for <formula> (non-recursive)."
switch "--skip-recommended", switch "--skip-recommended",
description: "Skip `:recommended` dependencies for <formula>." description: "Skip `:recommended` dependencies for <formula>."
switch "--include-requirements", switch "--include-requirements",
description: "Include requirements in addition to dependencies for <formula>." description: "Include requirements in addition to dependencies for <formula>."
switch "--tree", switch "--tree",
description: "Show dependencies as a tree. When given multiple formula arguments, "\ description: "Show dependencies as a tree. When given multiple formula arguments, "\
"show individual trees for each formula." "show individual trees for each formula."
switch "--annotate", switch "--annotate",
description: "Mark any build, test, optional, or recommended dependencies as "\ description: "Mark any build, test, optional, or recommended dependencies as "\
"such in the output." "such in the output."
switch "--installed", switch "--installed",
description: "List dependencies for formulae that are currently installed. If <formula> is "\ description: "List dependencies for formulae that are currently installed. If <formula> is "\
"specified, list only its dependencies that are currently installed." "specified, list only its dependencies that are currently installed."
switch "--all", switch "--all",
description: "List dependencies for all available formulae." description: "List dependencies for all available formulae."
switch "--for-each", switch "--for-each",
description: "Switch into the mode used by the `--all` option, but only list dependencies "\ description: "Switch into the mode used by the `--all` option, but only list dependencies "\
"for the specified <formula>, one formula per line. This is used for "\ "for the specified <formula>, one formula per line. This is used for "\
"debugging the `--installed`/`--all` display mode." "debugging the `--installed`/`--all` display mode."
switch :verbose switch :verbose
switch :debug switch :debug
conflicts "--installed", "--all" conflicts "--installed", "--all"

12
Library/Homebrew/cmd/desc.rb
View File

@ -20,14 +20,14 @@ module Homebrew
first search, making that search slower than subsequent ones. first search, making that search slower than subsequent ones.
EOS EOS
flag "-s", "--search=", flag "-s", "--search=",
description: "Search both name and description for provided <text>. If <text> is flanked by "\ description: "Search both name and description for provided <text>. If <text> is flanked by "\
"slashes, it is interpreted as a regular expression." "slashes, it is interpreted as a regular expression."
flag "-n", "--name=", flag "-n", "--name=",
description: "Search just the names for provided <text>. If <text> is flanked by slashes, it is "\ description: "Search just the names for provided <text>. If <text> is flanked by slashes, it is "\
"interpreted as a regular expression." "interpreted as a regular expression."
flag "-d", "--description=", flag "-d", "--description=",
description: "Search just the descriptions for provided <text>. If <text> is flanked by slashes, "\ description: "Search just the descriptions for provided <text>. If <text> is flanked by slashes, "\
"it is interpreted as a regular expression." "it is interpreted as a regular expression."
switch :verbose switch :verbose
conflicts "--search=", "--name=", "--description=" conflicts "--search=", "--name=", "--description="
end end

4
Library/Homebrew/cmd/diy.rb
View File

@ -16,9 +16,9 @@ module Homebrew
the Cellar and then link it into Homebrew's prefix with `brew link`. the Cellar and then link it into Homebrew's prefix with `brew link`.
EOS EOS
flag "--name=", flag "--name=",
description: "Explicitly set the provided <name> of the package being installed." description: "Explicitly set the provided <name> of the package being installed."
flag "--version=", flag "--version=",
description: "Explicitly set the provided <version> of the package being installed." description: "Explicitly set the provided <version> of the package being installed."
switch :verbose switch :verbose
switch :debug switch :debug
end end

4
Library/Homebrew/cmd/doctor.rb
View File

@ -18,9 +18,9 @@ module Homebrew
an issue; just ignore this. an issue; just ignore this.
EOS EOS
switch "--list-checks", switch "--list-checks",
description: "List all audit methods." description: "List all audit methods."
switch "-D", "--audit-debug", switch "-D", "--audit-debug",
description: "Enable debugging and profiling of audit methods." description: "Enable debugging and profiling of audit methods."
switch :verbose switch :verbose
switch :debug switch :debug
end end

24
Library/Homebrew/cmd/fetch.rb
View File

@ -16,26 +16,26 @@ module Homebrew
For tarballs, also print SHA-256 checksums. For tarballs, also print SHA-256 checksums.
EOS EOS
switch "--HEAD", switch "--HEAD",
description: "Fetch HEAD version instead of stable version." description: "Fetch HEAD version instead of stable version."
switch "--devel", switch "--devel",
description: "Fetch development version instead of stable version." description: "Fetch development version instead of stable version."
switch :verbose, switch :verbose,
description: "Do a verbose VCS checkout, if the URL represents a VCS. This is useful for "\ description: "Do a verbose VCS checkout, if the URL represents a VCS. This is useful for "\
"seeing if an existing VCS cache has been updated." "seeing if an existing VCS cache has been updated."
switch :force, switch :force,
description: "Remove a previously cached version and re-fetch." description: "Remove a previously cached version and re-fetch."
switch "--retry", switch "--retry",
description: "Retry if a download fails or re-download if the checksum of a previously cached "\ description: "Retry if a download fails or re-download if the checksum of a previously cached "\
"version no longer matches." "version no longer matches."
switch "--deps", switch "--deps",
description: "Download dependencies for any listed <formula>." description: "Download dependencies for any listed <formula>."
switch "-s", "--build-from-source", switch "-s", "--build-from-source",
description: "Download the source for rather than a bottle." description: "Download the source for rather than a bottle."
switch "--build-bottle", switch "--build-bottle",
description: "Download the source (for eventual bottling) rather than a bottle." description: "Download the source (for eventual bottling) rather than a bottle."
switch "--force-bottle", switch "--force-bottle",
description: "Download a bottle if it exists for the current or newest version of macOS, "\ description: "Download a bottle if it exists for the current or newest version of macOS, "\
"even if it would not be used during installation." "even if it would not be used during installation."
switch :verbose switch :verbose
switch :debug switch :debug
conflicts "--devel", "--HEAD" conflicts "--devel", "--HEAD"

10
Library/Homebrew/cmd/gist-logs.rb
View File

@ -23,13 +23,13 @@ module Homebrew
If no logs are found, an error message is presented. If no logs are found, an error message is presented.
EOS EOS
switch "--with-hostname", switch "--with-hostname",
description: "Include the hostname in the Gist." description: "Include the hostname in the Gist."
switch "-n", "--new-issue", switch "-n", "--new-issue",
description: "Automatically create a new issue in the appropriate GitHub repository as "\ description: "Automatically create a new issue in the appropriate GitHub repository as "\
"well as creating the Gist." "well as creating the Gist."
switch "-p", "--private", switch "-p", "--private",
description: "The Gist will be marked private and will not appear in listings but will "\ description: "The Gist will be marked private and will not appear in listings but will "\
"be accessible with the link." "be accessible with the link."
switch :verbose switch :verbose
switch :debug switch :debug
end end

42
Library/Homebrew/cmd/info.rb
View File

@ -22,33 +22,33 @@ module Homebrew
If <formula> is specified, show summary of information about <formula>. If <formula> is specified, show summary of information about <formula>.
EOS EOS
switch "--analytics", switch "--analytics",
description: "Display global Homebrew analytics data or, if specified, installation and "\ description: "Display global Homebrew analytics data or, if specified, installation and "\
"build error data for <formula> (provided neither `HOMEBREW_NO_ANALYTICS` "\ "build error data for <formula> (provided neither `HOMEBREW_NO_ANALYTICS` "\
"nor `HOMEBREW_NO_GITHUB_API` are set)." "nor `HOMEBREW_NO_GITHUB_API` are set)."
flag "--days", flag "--days",
depends_on: "--analytics", depends_on: "--analytics",
description: "How many days of global analytics data to retrieve. "\ description: "How many days of global analytics data to retrieve. "\
"The value for <days> must be `30`, `90` or `365`. The default is `30`." "The value for <days> must be `30`, `90` or `365`. The default is `30`."
flag "--category", flag "--category",
depends_on: "--analytics", depends_on: "--analytics",
description: "Which type of global analytics data to retrieve. "\ description: "Which type of global analytics data to retrieve. "\
"The value for <category> must be `install`, `install-on-request`, "\ "The value for <category> must be `install`, `install-on-request`, "\
"`cask-install`, `build-error` or `os-version`. The default is `install`." "`cask-install`, `build-error` or `os-version`. The default is `install`."
switch "--github", switch "--github",
description: "Open a browser to the GitHub source page for <formula>. "\ description: "Open a browser to the GitHub source page for <formula>. "\
"To view formula history locally: `brew log -p` <formula>" "To view formula history locally: `brew log -p` <formula>"
flag "--json", flag "--json",
description: "Print a JSON representation of <formula>. Currently the default and only accepted "\ description: "Print a JSON representation of <formula>. Currently the default and only accepted "\
"value for <version> is `v1`. See the docs for examples of using the JSON "\ "value for <version> is `v1`. See the docs for examples of using the JSON "\
"output: <https://docs.brew.sh/Querying-Brew>" "output: <https://docs.brew.sh/Querying-Brew>"
switch "--installed", switch "--installed",
depends_on: "--json", depends_on: "--json",
description: "Print JSON of formulae that are currently installed." description: "Print JSON of formulae that are currently installed."
switch "--all", switch "--all",
depends_on: "--json", depends_on: "--json",
description: "Print JSON of all available formulae." description: "Print JSON of all available formulae."
switch :verbose, switch :verbose,
description: "Show more verbose analytics data for <formula>." description: "Show more verbose analytics data for <formula>."
switch :debug switch :debug
conflicts "--installed", "--all" conflicts "--installed", "--all"
end end
@ -222,7 +222,7 @@ module Homebrew
return if ENV["HOMEBREW_NO_ANALYTICS"] || ENV["HOMEBREW_NO_GITHUB_API"] return if ENV["HOMEBREW_NO_ANALYTICS"] || ENV["HOMEBREW_NO_GITHUB_API"]
output, = curl_output("--max-time", "5", output, = curl_output("--max-time", "5",
"https://formulae.brew.sh/api/#{endpoint}") "https://formulae.brew.sh/api/#{endpoint}")
return if output.blank? return if output.blank?
JSON.parse(output) JSON.parse(output)

80
Library/Homebrew/cmd/install.rb
View File

@ -27,64 +27,64 @@ module Homebrew
EOS EOS
switch :debug, switch :debug,
description: "If brewing fails, open an interactive debugging session with access to IRB "\ description: "If brewing fails, open an interactive debugging session with access to IRB "\
"or a shell inside the temporary build directory" "or a shell inside the temporary build directory"
flag "--env=", flag "--env=",
description: "If `std` is passed, use the standard build environment instead of superenv."\ description: "If `std` is passed, use the standard build environment instead of superenv."\
"If `super` is passed, use superenv even if the formula specifies the "\ "If `super` is passed, use superenv even if the formula specifies the "\
"standard build environment." "standard build environment."
switch "--ignore-dependencies", switch "--ignore-dependencies",
description: "An unsupported Homebrew development flag to skip installing any dependencies of "\ description: "An unsupported Homebrew development flag to skip installing any dependencies of "\
"any kind. If the dependencies are not already present, the formula will have issues. "\ "any kind. If the dependencies are not already present, the formula will have issues. "\
"If you're not developing Homebrew, consider adjusting your PATH rather than "\ "If you're not developing Homebrew, consider adjusting your PATH rather than "\
"using this flag." "using this flag."
switch "--only-dependencies", switch "--only-dependencies",
description: "Install the dependencies with specified options but do not install the "\ description: "Install the dependencies with specified options but do not install the "\
"specified formula." "specified formula."
flag "--cc=", flag "--cc=",
description: "Attempt to compile using provided <compiler>. <compiler> should be the "\ description: "Attempt to compile using provided <compiler>. <compiler> should be the "\
"name of the compiler's executable, for instance `gcc-7` for GCC 7. "\ "name of the compiler's executable, for instance `gcc-7` for GCC 7. "\
"In order to use LLVM's clang, use `llvm_clang`. To specify the "\ "In order to use LLVM's clang, use `llvm_clang`. To specify the "\
"Apple-provided clang, use `clang`. This parameter will only accept "\ "Apple-provided clang, use `clang`. This parameter will only accept "\
"compilers that are provided by Homebrew or bundled with macOS. "\ "compilers that are provided by Homebrew or bundled with macOS. "\
"Please do not file issues if you encounter errors while using this flag." "Please do not file issues if you encounter errors while using this flag."
switch "-s", "--build-from-source", switch "-s", "--build-from-source",
description: "Compile the specified <formula> from source even if a bottle is provided. "\ description: "Compile the specified <formula> from source even if a bottle is provided. "\
"Dependencies will still be installed from bottles if they are available." "Dependencies will still be installed from bottles if they are available."
switch "--force-bottle", switch "--force-bottle",
description: "Install from a bottle if it exists for the current or newest version of "\ description: "Install from a bottle if it exists for the current or newest version of "\
"macOS, even if it would not normally be used for installation." "macOS, even if it would not normally be used for installation."
switch "--include-test", switch "--include-test",
description: "Install testing dependencies required to run `brew test`." description: "Install testing dependencies required to run `brew test`."
switch "--devel", switch "--devel",
description: "If <formula> defines it, install the development version." description: "If <formula> defines it, install the development version."
switch "--HEAD", switch "--HEAD",
description: "If <formula> defines it, install the HEAD version, aka. master, trunk, unstable." description: "If <formula> defines it, install the HEAD version, aka. master, trunk, unstable."
switch "--fetch-HEAD", switch "--fetch-HEAD",
description: "Fetch the upstream repository to detect if the HEAD installation of the "\ description: "Fetch the upstream repository to detect if the HEAD installation of the "\
"formula is outdated. Otherwise, the repository's HEAD will be checked for "\ "formula is outdated. Otherwise, the repository's HEAD will be checked for "\
"updates when a new stable or development version has been released." "updates when a new stable or development version has been released."
switch "--keep-tmp", switch "--keep-tmp",
description: "Don't delete the temporary files created during installation." description: "Don't delete the temporary files created during installation."
switch "--build-bottle", switch "--build-bottle",
description: "Prepare the formula for eventual bottling during installation." description: "Prepare the formula for eventual bottling during installation."
flag "--bottle-arch=", flag "--bottle-arch=",
depends_on: "--build-bottle", depends_on: "--build-bottle",
description: "Optimise bottles for the given architecture rather than the oldest "\ description: "Optimise bottles for the given architecture rather than the oldest "\
"architecture supported by the version of macOS the bottles are built on." "architecture supported by the version of macOS the bottles are built on."
switch :force, switch :force,
description: "Install without checking for previously installed keg-only or "\ description: "Install without checking for previously installed keg-only or "\
"non-migrated versions." "non-migrated versions."
switch :verbose, switch :verbose,
description: "Print the verification and postinstall steps." description: "Print the verification and postinstall steps."
switch "--display-times", switch "--display-times",
description: "Print install times for each formula at the end of the run." description: "Print install times for each formula at the end of the run."
switch "-i", "--interactive", switch "-i", "--interactive",
description: "Download and patch <formula>, then open a shell. This allows the user to "\ description: "Download and patch <formula>, then open a shell. This allows the user to "\
"run `./configure --help` and otherwise determine how to turn the software "\ "run `./configure --help` and otherwise determine how to turn the software "\
"package into a Homebrew package." "package into a Homebrew package."
switch "-g", "--git", switch "-g", "--git",
description: "Create a Git repository, useful for creating patches to the software." description: "Create a Git repository, useful for creating patches to the software."
conflicts "--ignore-dependencies", "--only-dependencies" conflicts "--ignore-dependencies", "--only-dependencies"
conflicts "--devel", "--HEAD" conflicts "--devel", "--HEAD"
conflicts "--build-from-source", "--build-bottle", "--force-bottle" conflicts "--build-from-source", "--build-bottle", "--force-bottle"

8
Library/Homebrew/cmd/link.rb
View File

@ -17,12 +17,12 @@ module Homebrew
installations. installations.
EOS EOS
switch "--overwrite", switch "--overwrite",
description: "Delete files already existing in the prefix while linking." description: "Delete files already existing in the prefix while linking."
switch "-n", "--dry-run", switch "-n", "--dry-run",
description: "List all files which would be linked or deleted by "\ description: "List all files which would be linked or deleted by "\
"`brew link --overwrite`, but will not actually link or delete any files." "`brew link --overwrite`, but will not actually link or delete any files."
switch :force, switch :force,
description: "Allow only key-only formulae to be linked." description: "Allow only key-only formulae to be linked."
switch :verbose switch :verbose
switch :debug switch :debug
end end

32
Library/Homebrew/cmd/list.rb
View File

@ -15,31 +15,31 @@ module Homebrew
List all installed formulae. List all installed formulae.
EOS EOS
switch "--full-name", switch "--full-name",
description: "Print formulae with fully-qualified names. If `--full-name` is not "\ description: "Print formulae with fully-qualified names. If `--full-name` is not "\
"passed, other options (i.e. `-1`, `-l`, `-t` and `-r`) are passed to `ls` "\ "passed, other options (i.e. `-1`, `-l`, `-t` and `-r`) are passed to `ls` "\
"which produces the actual output." "which produces the actual output."
switch "--unbrewed", switch "--unbrewed",
description: "List all files in the Homebrew prefix not installed by Homebrew." description: "List all files in the Homebrew prefix not installed by Homebrew."
switch "--versions", switch "--versions",
description: "Show the version number for installed formulae, or only the specified "\ description: "Show the version number for installed formulae, or only the specified "\
"formulae if <formula> are given." "formulae if <formula> are given."
switch "--multiple", switch "--multiple",
depends_on: "--versions", depends_on: "--versions",
description: "Only show formulae with multiple versions installed." description: "Only show formulae with multiple versions installed."
switch "--pinned", switch "--pinned",
description: "Show the versions of pinned formulae, or only the specified (pinned) "\ description: "Show the versions of pinned formulae, or only the specified (pinned) "\
"formulae if <formula> are given. See also `pin`, `unpin`." "formulae if <formula> are given. See also `pin`, `unpin`."
# passed through to ls # passed through to ls
switch "-1", switch "-1",
description: "Force output to be one entry per line. " \ description: "Force output to be one entry per line. " \
"This is the default when output is not to a terminal." "This is the default when output is not to a terminal."
switch "-l", switch "-l",
description: "List in long format. If the output is to a terminal, "\ description: "List in long format. If the output is to a terminal, "\
"a total sum for all the file sizes is output on a line before the long listing." "a total sum for all the file sizes is output on a line before the long listing."
switch "-r", switch "-r",
description: "Reverse the order of the sort to get the oldest entries first." description: "Reverse the order of the sort to get the oldest entries first."
switch "-t", switch "-t",
description: "Sort by time modified (most recently modified first)." description: "Sort by time modified (most recently modified first)."
switch :verbose switch :verbose
switch :debug switch :debug
end end

8
Library/Homebrew/cmd/log.rb
View File

@ -14,13 +14,13 @@ module Homebrew
Show the `git log` for the given <formula>. Show the `git log` for the given <formula>.
EOS EOS
switch "-p", "-u", "--patch", switch "-p", "-u", "--patch",
description: "Also output patch from commit." description: "Also output patch from commit."
switch "--stat", switch "--stat",
description: "Also output diffstat from commit." description: "Also output diffstat from commit."
switch "--oneline", switch "--oneline",
description: "Output only one line per commit." description: "Output only one line per commit."
switch "-1", "--max-count=1", switch "-1", "--max-count=1",
description: "Output only one commit." description: "Output only one commit."
end end
end end

4
Library/Homebrew/cmd/migrate.rb
View File

@ -15,8 +15,8 @@ module Homebrew
packages. packages.
EOS EOS
switch :force, switch :force,
description: "Treat installed <formula> and passed <formula> like if they are from "\ description: "Treat installed <formula> and passed <formula> like if they are from "\
"same taps and migrate them anyway." "same taps and migrate them anyway."
switch :verbose switch :verbose
switch :debug switch :debug
end end

4
Library/Homebrew/cmd/missing.rb
View File

@ -19,8 +19,8 @@ module Homebrew
`missing` exits with a non-zero status if any formulae are missing dependencies. `missing` exits with a non-zero status if any formulae are missing dependencies.
EOS EOS
comma_array "--hide", comma_array "--hide",
description: "Act as if none of the provided <hidden> are installed. <hidden> should be "\ description: "Act as if none of the provided <hidden> are installed. <hidden> should be "\
"comma-separated list of formulae." "comma-separated list of formulae."
switch :verbose switch :verbose
switch :debug switch :debug
end end

6
Library/Homebrew/cmd/options.rb
View File

@ -15,11 +15,11 @@ module Homebrew
Display install options specific to <formula> Display install options specific to <formula>
EOS EOS
switch "--compact", switch "--compact",
description: "Show all options on a single line separated by spaces." description: "Show all options on a single line separated by spaces."
switch "--all", switch "--all",
description: "Show options for all formulae." description: "Show options for all formulae."
switch "--installed", switch "--installed",
description: "Show options for all installed formulae." description: "Show options for all installed formulae."
switch :debug switch :debug
conflicts "--all", "--installed" conflicts "--all", "--installed"
end end

16
Library/Homebrew/cmd/outdated.rb
View File

@ -18,17 +18,17 @@ module Homebrew
suppressed otherwise. suppressed otherwise.
EOS EOS
switch :quiet, switch :quiet,
description: "List only the names of outdated brews (takes precedence over `--verbose`)." description: "List only the names of outdated brews (takes precedence over `--verbose`)."
switch :verbose, switch :verbose,
description: "Display detailed version information." description: "Display detailed version information."
flag "--json", flag "--json",
description: "Print output in JSON format. Currently the default and only accepted "\ description: "Print output in JSON format. Currently the default and only accepted "\
"value for <version> is `v1`. See the docs for examples of using the JSON "\ "value for <version> is `v1`. See the docs for examples of using the JSON "\
"output: <https://docs.brew.sh/Querying-Brew>" "output: <https://docs.brew.sh/Querying-Brew>"
switch "--fetch-HEAD", switch "--fetch-HEAD",
description: "Fetch the upstream repository to detect if the HEAD installation of the "\ description: "Fetch the upstream repository to detect if the HEAD installation of the "\
"formula is outdated. Otherwise, the repository's HEAD will be checked for "\ "formula is outdated. Otherwise, the repository's HEAD will be checked for "\
"updates when a new stable or development version has been released." "updates when a new stable or development version has been released."
switch :debug switch :debug
conflicts "--quiet", "--verbose", "--json" conflicts "--quiet", "--verbose", "--json"
end end

20
Library/Homebrew/cmd/reinstall.rb
View File

@ -20,22 +20,22 @@ module Homebrew
Unless `HOMEBREW_NO_INSTALL_CLEANUP` is set, `brew cleanup` will be run for the reinstalled formulae or, every 30 days, for all formulae. Unless `HOMEBREW_NO_INSTALL_CLEANUP` is set, `brew cleanup` will be run for the reinstalled formulae or, every 30 days, for all formulae.
EOS EOS
switch :debug, switch :debug,
description: "If brewing fails, open an interactive debugging session with access to IRB "\ description: "If brewing fails, open an interactive debugging session with access to IRB "\
"or a shell inside the temporary build directory" "or a shell inside the temporary build directory"
switch "-s", "--build-from-source", switch "-s", "--build-from-source",
description: "Compile <formula> from source even if a bottle is available." description: "Compile <formula> from source even if a bottle is available."
switch "--force-bottle", switch "--force-bottle",
description: "Install from a bottle if it exists for the current or newest version of "\ description: "Install from a bottle if it exists for the current or newest version of "\
"macOS, even if it would not normally be used for installation." "macOS, even if it would not normally be used for installation."
switch "--keep-tmp", switch "--keep-tmp",
description: "Don't delete the temporary files created during installation." description: "Don't delete the temporary files created during installation."
switch :force, switch :force,
description: "Install without checking for previously installed keg-only or "\ description: "Install without checking for previously installed keg-only or "\
"non-migrated versions." "non-migrated versions."
switch :verbose, switch :verbose,
description: "Print the verification and postinstall steps." description: "Print the verification and postinstall steps."
switch "--display-times", switch "--display-times",
description: "Print install times for each formula at the end of the run." description: "Print install times for each formula at the end of the run."
conflicts "--build-from-source", "--force-bottle" conflicts "--build-from-source", "--force-bottle"
formula_options formula_options
end end

10
Library/Homebrew/cmd/search.rb
View File

@ -37,16 +37,16 @@ module Homebrew
No online search is performed. No online search is performed.
EOS EOS
switch "--casks", switch "--casks",
description: "Display all locally available casks (including tapped ones). "\ description: "Display all locally available casks (including tapped ones). "\
"No online search is performed." "No online search is performed."
switch "--desc", switch "--desc",
description: "search formulae with a description matching <text> and casks with "\ description: "search formulae with a description matching <text> and casks with "\
"a name matching <text>." "a name matching <text>."
package_manager_switches = PACKAGE_MANAGERS.keys.map { |name| "--#{name}" } package_manager_switches = PACKAGE_MANAGERS.keys.map { |name| "--#{name}" }
package_manager_switches.each do |s| package_manager_switches.each do |s|
switch s, switch s,
description: "Search for <text> in the given package manager's list." description: "Search for <text> in the given package manager's list."
end end
switch :verbose switch :verbose
switch :debug switch :debug

2
Library/Homebrew/cmd/sh.rb
View File

@ -19,7 +19,7 @@ module Homebrew
which otherwise build systems would not find. which otherwise build systems would not find.
EOS EOS
flag "--env=", flag "--env=",
description: "Use the standard `PATH` instead of superenv's, when <std> is passed" description: "Use the standard `PATH` instead of superenv's, when <std> is passed"
switch :verbose switch :verbose
switch :debug switch :debug
end end

12
Library/Homebrew/cmd/style.rb
View File

@ -20,15 +20,15 @@ module Homebrew
including core code and all formulae. including core code and all formulae.
EOS EOS
switch "--fix", switch "--fix",
description: "Fix style violations automatically using RuboCop's auto-correct feature." description: "Fix style violations automatically using RuboCop's auto-correct feature."
switch "--display-cop-names", switch "--display-cop-names",
description: "Include the RuboCop cop name for each violation in the output." description: "Include the RuboCop cop name for each violation in the output."
comma_array "--only-cops", comma_array "--only-cops",
description: "Specify a comma-separated <cops> list to check for violations of only the "\ description: "Specify a comma-separated <cops> list to check for violations of only the "\
"listed RuboCop cops." "listed RuboCop cops."
comma_array "--except-cops", comma_array "--except-cops",
description: "Specify a comma-separated <cops> list to skip checking for violations of the "\ description: "Specify a comma-separated <cops> list to skip checking for violations of the "\
"listed RuboCop cops." "listed RuboCop cops."
switch :verbose switch :verbose
switch :debug switch :debug
conflicts "--only-cops", "--except-cops" conflicts "--only-cops", "--except-cops"

8
Library/Homebrew/cmd/tap-info.rb
View File

@ -14,11 +14,11 @@ module Homebrew
Display a brief summary of all installed taps if no <tap> are passed. Display a brief summary of all installed taps if no <tap> are passed.
EOS EOS
switch "--installed", switch "--installed",
description: "Display information on all installed taps." description: "Display information on all installed taps."
flag "--json", flag "--json",
description: "Print a JSON representation of <taps>. Currently the default and only accepted "\ description: "Print a JSON representation of <taps>. Currently the default and only accepted "\
"value for <version> is `v1`. See the docs for examples of using the JSON "\ "value for <version> is `v1`. See the docs for examples of using the JSON "\
"output: <https://docs.brew.sh/Querying-Brew>" "output: <https://docs.brew.sh/Querying-Brew>"
switch :debug switch :debug
end end
end end

2
Library/Homebrew/cmd/tap-pin.rb
View File

@ -20,7 +20,7 @@ module Homebrew
def tap_pin def tap_pin
odeprecated "brew tap-pin user/tap", odeprecated "brew tap-pin user/tap",
"fully-scoped user/tap/formula naming" "fully-scoped user/tap/formula naming"
tap_pin_args.parse tap_pin_args.parse

2
Library/Homebrew/cmd/tap-unpin.rb
View File

@ -19,7 +19,7 @@ module Homebrew
def tap_unpin def tap_unpin
odeprecated "brew tap-pin user/tap", odeprecated "brew tap-pin user/tap",
"fully-scoped user/tap/formula naming" "fully-scoped user/tap/formula naming"
tap_unpin_args.parse tap_unpin_args.parse

16
Library/Homebrew/cmd/tap.rb
View File

@ -25,18 +25,18 @@ module Homebrew
using protocols other than HTTPS, e.g., SSH, GIT, HTTP, FTP(S), RSYNC. using protocols other than HTTPS, e.g., SSH, GIT, HTTP, FTP(S), RSYNC.
EOS EOS
switch "--full", switch "--full",
description: "Use a full clone when tapping a repository. By default, the repository is "\ description: "Use a full clone when tapping a repository. By default, the repository is "\
"cloned as a shallow copy (`--depth=1`). To convert a shallow copy to a "\ "cloned as a shallow copy (`--depth=1`). To convert a shallow copy to a "\
"full copy, you can retap passing `--full` without first untapping." "full copy, you can retap passing `--full` without first untapping."
switch "--force-auto-update", switch "--force-auto-update",
description: "Auto-update tap even if it is not hosted on GitHub. By default, only taps "\ description: "Auto-update tap even if it is not hosted on GitHub. By default, only taps "\
"hosted on GitHub are auto-updated (for performance reasons)." "hosted on GitHub are auto-updated (for performance reasons)."
switch "--repair", switch "--repair",
description: "Migrate tapped formulae from symlink-based to directory-based structure." description: "Migrate tapped formulae from symlink-based to directory-based structure."
switch "--list-pinned", switch "--list-pinned",
description: "List all pinned taps." description: "List all pinned taps."
switch "-q", "--quieter", switch "-q", "--quieter",
description: "Suppress any warnings." description: "Suppress any warnings."
switch :debug switch :debug
end end
end end

6
Library/Homebrew/cmd/uninstall.rb
View File

@ -17,10 +17,10 @@ module Homebrew
Uninstall <formula>. Uninstall <formula>.
EOS EOS
switch :force, switch :force,
description: "Delete all installed versions of the <formula>" description: "Delete all installed versions of the <formula>"
switch "--ignore-dependencies", switch "--ignore-dependencies",
description: "Don't fail uninstall, even if <formula> is a dependency of any installed "\ description: "Don't fail uninstall, even if <formula> is a dependency of any installed "\
"formulae." "formulae."
switch :debug switch :debug
end end
end end

4
Library/Homebrew/cmd/unlink.rb
View File

@ -16,8 +16,8 @@ module Homebrew
`brew unlink` <formula> `&&` <commands> `&& brew link` <formula> `brew unlink` <formula> `&&` <commands> `&& brew link` <formula>
EOS EOS
switch "-n", "--dry-run", switch "-n", "--dry-run",
description: "List all files which would be unlinked, but will not actually unlink or "\ description: "List all files which would be unlinked, but will not actually unlink or "\
"delete any files." "delete any files."
switch :verbose switch :verbose
switch :debug switch :debug
end end

8
Library/Homebrew/cmd/unpack.rb
View File

@ -16,12 +16,12 @@ module Homebrew
working directory. working directory.
EOS EOS
flag "--destdir=", flag "--destdir=",
description: "Create subdirectories in the directory named by <path> instead." description: "Create subdirectories in the directory named by <path> instead."
switch "--patch", switch "--patch",
description: "Patches for <formula> will be applied to the unpacked source." description: "Patches for <formula> will be applied to the unpacked source."
switch "-g", "--git", switch "-g", "--git",
description: "Initialise a Git repository in the unpacked source. This is useful for creating "\ description: "Initialise a Git repository in the unpacked source. This is useful for creating "\
"patches for the software." "patches for the software."
switch :force switch :force
switch :verbose switch :verbose
switch :debug switch :debug

2
Library/Homebrew/cmd/update-report.rb
View File

@ -26,7 +26,7 @@ module Homebrew
The Ruby implementation of `brew update`. Never called manually. The Ruby implementation of `brew update`. Never called manually.
EOS EOS
switch "--preinstall", switch "--preinstall",
description: "Run in 'auto-update' mode (faster, less output)." description: "Run in 'auto-update' mode (faster, less output)."
switch :force switch :force
switch :quiet switch :quiet
switch :debug switch :debug

28
Library/Homebrew/cmd/upgrade.rb
View File

@ -24,28 +24,28 @@ module Homebrew
Unless `HOMEBREW_NO_INSTALL_CLEANUP` is set, `brew cleanup` will be run for the upgraded formulae or, every 30 days, for all formulae. Unless `HOMEBREW_NO_INSTALL_CLEANUP` is set, `brew cleanup` will be run for the upgraded formulae or, every 30 days, for all formulae.
EOS EOS
switch :debug, switch :debug,
description: "If brewing fails, open an interactive debugging session with access to IRB "\ description: "If brewing fails, open an interactive debugging session with access to IRB "\
"or a shell inside the temporary build directory" "or a shell inside the temporary build directory"
switch "-s", "--build-from-source", switch "-s", "--build-from-source",
description: "Compile <formula> from source even if a bottle is available." description: "Compile <formula> from source even if a bottle is available."
switch "--force-bottle", switch "--force-bottle",
description: "Install from a bottle if it exists for the current or newest version of "\ description: "Install from a bottle if it exists for the current or newest version of "\
"macOS, even if it would not normally be used for installation." "macOS, even if it would not normally be used for installation."
switch "--fetch-HEAD", switch "--fetch-HEAD",
description: "Fetch the upstream repository to detect if the HEAD installation of the "\ description: "Fetch the upstream repository to detect if the HEAD installation of the "\
"formula is outdated. Otherwise, the repository's HEAD will be checked for "\ "formula is outdated. Otherwise, the repository's HEAD will be checked for "\
"updates when a new stable or development version has been released." "updates when a new stable or development version has been released."
switch "--ignore-pinned", switch "--ignore-pinned",
description: "Set a 0 exit code even if pinned formulae are not upgraded." description: "Set a 0 exit code even if pinned formulae are not upgraded."
switch "--keep-tmp", switch "--keep-tmp",
description: "Don't delete the temporary files created during installation." description: "Don't delete the temporary files created during installation."
switch :force, switch :force,
description: "Install without checking for previously installed keg-only or "\ description: "Install without checking for previously installed keg-only or "\
"non-migrated versions." "non-migrated versions."
switch :verbose, switch :verbose,
description: "Print the verification and postinstall steps." description: "Print the verification and postinstall steps."
switch "--display-times", switch "--display-times",
description: "Print install times for each formula at the end of the run." description: "Print install times for each formula at the end of the run."
conflicts "--build-from-source", "--force-bottle" conflicts "--build-from-source", "--force-bottle"
formula_options formula_options
end end

16
Library/Homebrew/cmd/uses.rb
View File

@ -25,21 +25,21 @@ module Homebrew
By default, `uses` shows usage of <formula> by stable builds. By default, `uses` shows usage of <formula> by stable builds.
EOS EOS
switch "--recursive", switch "--recursive",
description: "Resolve more than one level of dependencies." description: "Resolve more than one level of dependencies."
switch "--installed", switch "--installed",
description: "Only list installed formulae." description: "Only list installed formulae."
switch "--include-build", switch "--include-build",
description: "Include all formulae that specify <formula> as `:build` type dependency." description: "Include all formulae that specify <formula> as `:build` type dependency."
switch "--include-test", switch "--include-test",
description: "Include all formulae that specify <formula> as `:test` type dependency." description: "Include all formulae that specify <formula> as `:test` type dependency."
switch "--include-optional", switch "--include-optional",
description: "Include all formulae that specify <formula> as `:optional` type dependency." description: "Include all formulae that specify <formula> as `:optional` type dependency."
switch "--skip-recommended", switch "--skip-recommended",
description: "Skip all formulae that specify <formula> as `:recommended` type dependency." description: "Skip all formulae that specify <formula> as `:recommended` type dependency."
switch "--devel", switch "--devel",
description: "Show usage of <formula> by development build." description: "Show usage of <formula> by development build."
switch "--HEAD", switch "--HEAD",
description: "Show usage of <formula> by HEAD build." description: "Show usage of <formula> by HEAD build."
switch :debug switch :debug
conflicts "--devel", "--HEAD" conflicts "--devel", "--HEAD"
end end

2
Library/Homebrew/dependency_collector.rb
View File

@ -163,7 +163,7 @@ class DependencyCollector
# allow unknown strategies to pass through # allow unknown strategies to pass through
else else
raise TypeError, raise TypeError,
"#{strategy.inspect} is not an AbstractDownloadStrategy subclass" "#{strategy.inspect} is not an AbstractDownloadStrategy subclass"
end end
end end

42
Library/Homebrew/dev-cmd/audit.rb
View File

@ -26,34 +26,34 @@ module Homebrew
If no <formula> are provided, all of them are checked. If no <formula> are provided, all of them are checked.
EOS EOS
switch "--strict", switch "--strict",
description: "Run additional style checks, including RuboCop style checks." description: "Run additional style checks, including RuboCop style checks."
switch "--online", switch "--online",
description: "Run additional slower style checks that require a network connection." description: "Run additional slower style checks that require a network connection."
switch "--new-formula", switch "--new-formula",
description: "Run various additional style checks to determine if a new formula is eligible "\ description: "Run various additional style checks to determine if a new formula is eligible "\
"for Homebrew. This should be used when creating new formula and implies "\ "for Homebrew. This should be used when creating new formula and implies "\
"`--strict` and `--online`." "`--strict` and `--online`."
switch "--fix", switch "--fix",
description: "Fix style violations automatically using RuboCop's auto-correct feature." description: "Fix style violations automatically using RuboCop's auto-correct feature."
switch "--display-cop-names", switch "--display-cop-names",
description: "Include the RuboCop cop name for each violation in the output." description: "Include the RuboCop cop name for each violation in the output."
switch "--display-filename", switch "--display-filename",
description: "Prefix every line of output with name of the file or formula being audited, to "\ description: "Prefix every line of output with name of the file or formula being audited, to "\
"make output easy to grep." "make output easy to grep."
switch "-D", "--audit-debug", switch "-D", "--audit-debug",
description: "Enable debugging and profiling of audit methods." description: "Enable debugging and profiling of audit methods."
comma_array "--only", comma_array "--only",
description: "Specify a comma-separated <method> list to only run the methods named "\ description: "Specify a comma-separated <method> list to only run the methods named "\
"`audit_`<method>." "`audit_`<method>."
comma_array "--except", comma_array "--except",
description: "Specify a comma-separated <method> list to skip running the methods named "\ description: "Specify a comma-separated <method> list to skip running the methods named "\
"`audit_`<method>." "`audit_`<method>."
comma_array "--only-cops", comma_array "--only-cops",
description: "Specify a comma-separated <cops> list to check for violations of only the listed "\ description: "Specify a comma-separated <cops> list to check for violations of only the listed "\
"RuboCop cops." "RuboCop cops."
comma_array "--except-cops", comma_array "--except-cops",
description: "Specify a comma-separated <cops> list to skip checking for violations of the listed "\ description: "Specify a comma-separated <cops> list to skip checking for violations of the listed "\
"RuboCop cops." "RuboCop cops."
switch :verbose switch :verbose
switch :debug switch :debug
conflicts "--only", "--except" conflicts "--only", "--except"
@ -532,9 +532,9 @@ module Homebrew
return unless DevelopmentTools.curl_handles_most_https_certificates? return unless DevelopmentTools.curl_handles_most_https_certificates?
if http_content_problem = curl_check_http_content(homepage, if http_content_problem = curl_check_http_content(homepage,
user_agents: [:browser, :default], user_agents: [:browser, :default],
check_content: true, check_content: true,
strict: @strict) strict: @strict)
problem http_content_problem problem http_content_problem
end end
end end

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

@ -53,33 +53,33 @@ module Homebrew
value, while `--no-rebuild` will remove it. value, while `--no-rebuild` will remove it.
EOS EOS
switch "--skip-relocation", switch "--skip-relocation",
description: "Do not check if the bottle can be marked as relocatable." description: "Do not check if the bottle can be marked as relocatable."
switch "--or-later", switch "--or-later",
description: "Append `_or_later` to the bottle tag." description: "Append `_or_later` to the bottle tag."
switch "--force-core-tap", switch "--force-core-tap",
description: "Build a bottle even if <formula> is not in `homebrew/core` or any installed taps." description: "Build a bottle even if <formula> is not in `homebrew/core` or any installed taps."
switch "--no-rebuild", switch "--no-rebuild",
description: "If the formula specifies a rebuild version, remove it from the generated DSL." description: "If the formula specifies a rebuild version, remove it from the generated DSL."
switch "--keep-old", switch "--keep-old",
description: "If the formula specifies a rebuild version, attempt to preserve its value in the "\ description: "If the formula specifies a rebuild version, attempt to preserve its value in the "\
"generated DSL." "generated DSL."
switch "--json", switch "--json",
description: "Write bottle information to a JSON file, which can be used as the argument for "\ description: "Write bottle information to a JSON file, which can be used as the argument for "\
"`--merge`." "`--merge`."
switch "--merge", switch "--merge",
description: "Generate an updated bottle block for a formula and optionally merge it into the "\ description: "Generate an updated bottle block for a formula and optionally merge it into the "\
"formula file. Instead of a formula name, requires a JSON file generated with "\ "formula file. Instead of a formula name, requires a JSON file generated with "\
"`brew bottle --json` <formula>." "`brew bottle --json` <formula>."
switch "--write", switch "--write",
depends_on: "--merge", depends_on: "--merge",
description: "Write the changes to the formula file. A new commit will be generated unless "\ description: "Write the changes to the formula file. A new commit will be generated unless "\
"`--no-commit` is passed." "`--no-commit` is passed."
switch "--no-commit", switch "--no-commit",
depends_on: "--write", depends_on: "--write",
description: "When passed with `--write`, a new commit will not generated after writing changes "\ description: "When passed with `--write`, a new commit will not generated after writing changes "\
"to the formula file." "to the formula file."
flag "--root-url=", flag "--root-url=",
description: "Use the specified <URL> as the root of the bottle's URL instead of Homebrew's default." description: "Use the specified <URL> as the root of the bottle's URL instead of Homebrew's default."
switch :verbose switch :verbose
switch :debug switch :debug
conflicts "--no-rebuild", "--keep-old" conflicts "--no-rebuild", "--keep-old"
@ -545,8 +545,8 @@ module Homebrew
path.parent.cd do path.parent.cd do
safe_system "git", "commit", "--no-edit", "--verbose", safe_system "git", "commit", "--no-edit", "--verbose",
"--message=#{short_name}: #{update_or_add} #{pkg_version} bottle.", "--message=#{short_name}: #{update_or_add} #{pkg_version} bottle.",
"--", path "--", path
end end
end end
else else

44
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -26,38 +26,38 @@ module Homebrew
formula already uses. formula already uses.
EOS EOS
switch "--devel", switch "--devel",
description: "Bump the development rather than stable version. The development spec must already exist." description: "Bump the development rather than stable version. The development spec must already exist."
switch "-n", "--dry-run", switch "-n", "--dry-run",
description: "Print what would be done rather than doing it." description: "Print what would be done rather than doing it."
switch "--write", switch "--write",
depends_on: "--dry-run", depends_on: "--dry-run",
description: "When passed along with `--dry-run`, perform a not-so-dry run by making the expected "\ description: "When passed along with `--dry-run`, perform a not-so-dry run by making the expected "\
"file modifications but not taking any Git actions." "file modifications but not taking any Git actions."
switch "--no-audit", switch "--no-audit",
description: "Don't run `brew audit` before opening the PR." description: "Don't run `brew audit` before opening the PR."
switch "--strict", switch "--strict",
description: "Run `brew audit --strict` before opening the PR." description: "Run `brew audit --strict` before opening the PR."
switch "--no-browse", switch "--no-browse",
description: "Print the pull request URL instead of opening in a browser." description: "Print the pull request URL instead of opening in a browser."
flag "--mirror=", flag "--mirror=",
description: "Use the provided <URL> as a mirror URL." description: "Use the provided <URL> as a mirror URL."
flag "--version=", flag "--version=",
description: "Use the provided <version> to override the value parsed from the URL or tag. Note "\ description: "Use the provided <version> to override the value parsed from the URL or tag. Note "\
"that `--version=0` can be used to delete an existing version override from a "\ "that `--version=0` can be used to delete an existing version override from a "\
"formula if it has become redundant." "formula if it has become redundant."
flag "--message=", flag "--message=",
description: "Append the provided <message> to the default PR message." description: "Append the provided <message> to the default PR message."
flag "--url=", flag "--url=",
description: "Specify the <URL> for the new download. If a <URL> is specified, the <SHA-256> "\ description: "Specify the <URL> for the new download. If a <URL> is specified, the <SHA-256> "\
"checksum of the new download should also be specified." "checksum of the new download should also be specified."
flag "--sha256=", flag "--sha256=",
depends_on: "--url=", depends_on: "--url=",
description: "Specify the <SHA-256> checksum of the new download." description: "Specify the <SHA-256> checksum of the new download."
flag "--tag=", flag "--tag=",
description: "Specify the new git commit <tag> for the formula." description: "Specify the new git commit <tag> for the formula."
flag "--revision=", flag "--revision=",
required_for: "--tag=", required_for: "--tag=",
description: "Specify the new git commit <revision> corresponding to a specified <tag>." description: "Specify the new git commit <revision> corresponding to a specified <tag>."
switch :force switch :force
switch :quiet switch :quiet
@ -340,8 +340,8 @@ module Homebrew
safe_system "git", "fetch", "--unshallow", "origin" if shallow safe_system "git", "fetch", "--unshallow", "origin" if shallow
safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master" safe_system "git", "checkout", "--no-track", "-b", branch, "origin/master"
safe_system "git", "commit", "--no-edit", "--verbose", safe_system "git", "commit", "--no-edit", "--verbose",
"--message=#{formula.name} #{new_formula_version}#{devel_message}", "--message=#{formula.name} #{new_formula_version}#{devel_message}",
"--", formula.path "--", formula.path
safe_system "git", "push", "--set-upstream", remote_url, "#{branch}:#{branch}" safe_system "git", "push", "--set-upstream", remote_url, "#{branch}:#{branch}"
safe_system "git", "checkout", "--quiet", "-" safe_system "git", "checkout", "--quiet", "-"
pr_message = <<~EOS pr_message = <<~EOS

20
Library/Homebrew/dev-cmd/create.rb
View File

@ -20,23 +20,23 @@ module Homebrew
<http://www.rubydoc.info/github/Homebrew/brew/master/Formula> <http://www.rubydoc.info/github/Homebrew/brew/master/Formula>
EOS EOS
switch "--autotools", switch "--autotools",
description: "Create a basic template for an Autotools-style build." description: "Create a basic template for an Autotools-style build."
switch "--cmake", switch "--cmake",
description: "Create a basic template for a CMake-style build." description: "Create a basic template for a CMake-style build."
switch "--meson", switch "--meson",
description: "Create a basic template for a Meson-style build." description: "Create a basic template for a Meson-style build."
switch "--no-fetch", switch "--no-fetch",
description: "Homebrew will not download <URL> to the cache and will thus not add the SHA-256 "\ description: "Homebrew will not download <URL> to the cache and will thus not add the SHA-256 "\
"to the formula for you, nor will it check the GitHub API for GitHub projects "\ "to the formula for you, nor will it check the GitHub API for GitHub projects "\
"(to fill out its description and homepage)." "(to fill out its description and homepage)."
switch "--HEAD", switch "--HEAD",
description: "Indicate that <URL> points to the package's repository rather than a file." description: "Indicate that <URL> points to the package's repository rather than a file."
flag "--set-name=", flag "--set-name=",
description: "Set the name of the new formula to the provided <name>." description: "Set the name of the new formula to the provided <name>."
flag "--set-version=", flag "--set-version=",
description: "Set the version of the new formula to the provided <version>." description: "Set the version of the new formula to the provided <version>."
flag "--tap=", flag "--tap=",
description: "Generate the new formula in the provided tap, specified as <user>`/`<repo>." description: "Generate the new formula in the provided tap, specified as <user>`/`<repo>."
switch :force switch :force
switch :verbose switch :verbose
switch :debug switch :debug

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

@ -88,7 +88,7 @@ module Homebrew
EOS EOS
flag "--version=", flag "--version=",
description: "Extract the provided <version> of <formula> instead of the most recent." description: "Extract the provided <version> of <formula> instead of the most recent."
switch :force switch :force
switch :debug switch :debug
end end

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

@ -25,10 +25,10 @@ module Homebrew
Enter the interactive Homebrew Ruby shell. Enter the interactive Homebrew Ruby shell.
EOS EOS
switch "--examples", switch "--examples",
description: "Show several examples." description: "Show several examples."
switch "--pry", switch "--pry",
env: :pry, env: :pry,
description: "Use Pry instead of IRB. Implied if `HOMEBREW_PRY` is set." description: "Use Pry instead of IRB. Implied if `HOMEBREW_PRY` is set."
end end
end end

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

@ -16,14 +16,14 @@ module Homebrew
Raises an error if run on uninstalled formulae. Raises an error if run on uninstalled formulae.
EOS EOS
switch "--test", switch "--test",
description: "Display only missing libraries and exit with a non-zero status if any missing "\ description: "Display only missing libraries and exit with a non-zero status if any missing "\
"libraries are found." "libraries are found."
switch "--reverse", switch "--reverse",
description: "For every library that a keg references, print its dylib path followed by the "\ description: "For every library that a keg references, print its dylib path followed by the "\
"binaries that link to it." "binaries that link to it."
switch "--cached", switch "--cached",
description: "Print the cached linkage values stored in `HOMEBREW_CACHE`, set by a previous "\ description: "Print the cached linkage values stored in `HOMEBREW_CACHE`, set by a previous "\
"`brew linkage` run." "`brew linkage` run."
switch :verbose switch :verbose
switch :debug switch :debug
end end

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

@ -24,12 +24,12 @@ module Homebrew
Generate Homebrew's manpages. Generate Homebrew's manpages.
EOS EOS
switch "--fail-if-changed", switch "--fail-if-changed",
description: "Return a failing status code if changes are detected in the manpage outputs. This "\ description: "Return a failing status code if changes are detected in the manpage outputs. This "\
"can be used for CI to be notified when the manpages are out of date. Additionally, "\ "can be used for CI to be notified when the manpages are out of date. Additionally, "\
"the date used in new manpages will match those in the existing manpages (to allow "\ "the date used in new manpages will match those in the existing manpages (to allow "\
"comparison without factoring in the date)." "comparison without factoring in the date)."
switch "--link", switch "--link",
description: "This is now done automatically by `brew update`." description: "This is now done automatically by `brew update`."
end end
end end

24
Library/Homebrew/dev-cmd/pull.rb
View File

@ -36,28 +36,28 @@ module Homebrew
on GitHub, the URL of a commit on GitHub or a "https://jenkins.brew.sh/job/..." testing job URL. on GitHub, the URL of a commit on GitHub or a "https://jenkins.brew.sh/job/..." testing job URL.
EOS EOS
switch "--bottle", switch "--bottle",
description: "Handle bottles, pulling the bottle-update commit and publishing files on Bintray." description: "Handle bottles, pulling the bottle-update commit and publishing files on Bintray."
switch "--bump", switch "--bump",
description: "For one-formula PRs, automatically reword commit message to our preferred format." description: "For one-formula PRs, automatically reword commit message to our preferred format."
switch "--clean", switch "--clean",
description: "Do not rewrite or otherwise modify the commits found in the pulled PR." description: "Do not rewrite or otherwise modify the commits found in the pulled PR."
switch "--ignore-whitespace", switch "--ignore-whitespace",
description: "Silently ignore whitespace discrepancies when applying diffs." description: "Silently ignore whitespace discrepancies when applying diffs."
switch "--resolve", switch "--resolve",
description: "When a patch fails to apply, leave in progress and allow user to resolve, instead "\ description: "When a patch fails to apply, leave in progress and allow user to resolve, instead "\
"of aborting." "of aborting."
switch "--branch-okay", switch "--branch-okay",
description: "Do not warn if pulling to a branch besides master (useful for testing)." description: "Do not warn if pulling to a branch besides master (useful for testing)."
switch "--no-pbcopy", switch "--no-pbcopy",
description: "Do not copy anything to the system clipboard." description: "Do not copy anything to the system clipboard."
switch "--no-publish", switch "--no-publish",
description: "Do not publish bottles to Bintray." description: "Do not publish bottles to Bintray."
switch "--warn-on-publish-failure", switch "--warn-on-publish-failure",
description: "Do not exit if there's a failure publishing bottles on Bintray." description: "Do not exit if there's a failure publishing bottles on Bintray."
flag "--bintray-org=", flag "--bintray-org=",
description: "Publish bottles at the provided Bintray <organisation>." description: "Publish bottles at the provided Bintray <organisation>."
flag "--test-bot-user=", flag "--test-bot-user=",
description: "Pull the bottle block commit from the provided <user> on GitHub." description: "Pull the bottle block commit from the provided <user> on GitHub."
switch :verbose switch :verbose
switch :debug switch :debug
end end

2
Library/Homebrew/dev-cmd/release-notes.rb
View File

@ -15,7 +15,7 @@ module Homebrew
If no <end_ref> is provided it defaults to `origin/master`. If no <end_ref> is provided it defaults to `origin/master`.
EOS EOS
switch "--markdown", switch "--markdown",
description: "Print as a Markdown list." description: "Print as a Markdown list."
end end
end end

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

@ -14,7 +14,7 @@ module Homebrew
`brew ruby -e "puts :gcc.f.deps"` or `brew ruby script.rb` `brew ruby -e "puts :gcc.f.deps"` or `brew ruby script.rb`
EOS EOS
switch "-e", switch "-e",
description: "Execute the provided string argument as a script." description: "Execute the provided string argument as a script."
switch :verbose switch :verbose
switch :debug switch :debug
end end

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

@ -20,11 +20,11 @@ module Homebrew
*Example:* `brew install jruby && brew test jruby` *Example:* `brew install jruby && brew test jruby`
EOS EOS
switch "--devel", switch "--devel",
description: "Test the development version of a formula." description: "Test the development version of a formula."
switch "--HEAD", switch "--HEAD",
description: "Test the head version of a formula." description: "Test the head version of a formula."
switch "--keep-tmp", switch "--keep-tmp",
description: "Keep the temporary files created for the test." description: "Keep the temporary files created for the test."
switch :verbose switch :verbose
switch :debug switch :debug
conflicts "--devel", "--HEAD" conflicts "--devel", "--HEAD"

16
Library/Homebrew/dev-cmd/tests.rb
View File

@ -14,19 +14,19 @@ module Homebrew
Run Homebrew's unit and integration tests. Run Homebrew's unit and integration tests.
EOS EOS
switch "--coverage", switch "--coverage",
description: "Generate code coverage reports." description: "Generate code coverage reports."
switch "--generic", switch "--generic",
description: "Run only OS-agnostic tests." description: "Run only OS-agnostic tests."
switch "--no-compat", switch "--no-compat",
description: "Do not load the compatibility layer when running tests." description: "Do not load the compatibility layer when running tests."
switch "--online", switch "--online",
description: "Include tests that use the GitHub API and tests that use any of the taps for "\ description: "Include tests that use the GitHub API and tests that use any of the taps for "\
"official external commands." "official external commands."
flag "--only=", flag "--only=",
description: "Run only <test_script>`_spec.rb`. Appending `:`<line_number> will start at a "\ description: "Run only <test_script>`_spec.rb`. Appending `:`<line_number> will start at a "\
"specific line." "specific line."
flag "--seed=", flag "--seed=",
description: "Randomise tests with the provided <value> instead of a random seed." description: "Randomise tests with the provided <value> instead of a random seed."
switch :verbose switch :verbose
switch :debug switch :debug
end end

8
Library/Homebrew/dev-cmd/update-test.rb
View File

@ -14,13 +14,13 @@ module Homebrew
If no arguments are passed, use `origin/master` as the start commit. If no arguments are passed, use `origin/master` as the start commit.
EOS EOS
switch "--to-tag", switch "--to-tag",
description: "Set `HOMEBREW_UPDATE_TO_TAG` to test updating between tags." description: "Set `HOMEBREW_UPDATE_TO_TAG` to test updating between tags."
switch "--keep-tmp", switch "--keep-tmp",
description: "Retain the temporary directory containing the new repository clone." description: "Retain the temporary directory containing the new repository clone."
flag "--commit=", flag "--commit=",
description: "Use provided <commit> as the start commit." description: "Use provided <commit> as the start commit."
flag "--before=", flag "--before=",
description: "Use the commit at provided <date> as the start commit." description: "Use the commit at provided <date> as the start commit."
switch :verbose switch :verbose
switch :debug switch :debug
end end

2
Library/Homebrew/download_strategy.rb
View File

@ -1068,7 +1068,7 @@ class DownloadStrategyDetector
detect_from_symbol(using) detect_from_symbol(using)
else else
raise TypeError, raise TypeError,
"Unknown download strategy specification #{strategy.inspect}" "Unknown download strategy specification #{strategy.inspect}"
end end
strategy strategy

6
Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
View File

@ -9,9 +9,9 @@ module UnpackStrategy
# folder has incorrect permissions. # folder has incorrect permissions.
# (Also, Homebrew's ZIP artifact automatically deletes this folder.) # (Also, Homebrew's ZIP artifact automatically deletes this folder.)
return system_command! "ditto", return system_command! "ditto",
args: ["-x", "-k", path, unpack_dir], args: ["-x", "-k", path, unpack_dir],
verbose: verbose, verbose: verbose,
print_stderr: false print_stderr: false
end end
result = begin result = begin

4
Library/Homebrew/formula_installer.rb
View File

@ -196,8 +196,8 @@ class FormulaInstaller
return if pinned_unsatisfied_deps.empty? return if pinned_unsatisfied_deps.empty?
raise CannotInstallFormulaError, raise CannotInstallFormulaError,
"You must `brew unpin #{pinned_unsatisfied_deps * " "}` as installing " \ "You must `brew unpin #{pinned_unsatisfied_deps * " "}` as installing " \
"#{formula.full_name} requires the latest version of pinned dependencies" "#{formula.full_name} requires the latest version of pinned dependencies"
end end
def build_bottle_preinstall def build_bottle_preinstall

8
Library/Homebrew/formulary.rb
View File

@ -31,12 +31,12 @@ module Formulary
begin begin
mod.const_get(class_name) mod.const_get(class_name)
rescue NameError => original_exception rescue NameError => e
class_list = mod.constants class_list = mod.constants
.map { |const_name| mod.const_get(const_name) } .map { |const_name| mod.const_get(const_name) }
.select { |const| const.is_a?(Class) } .select { |const| const.is_a?(Class) }
e = FormulaClassUnavailableError.new(name, path, class_name, class_list) new_exception = FormulaClassUnavailableError.new(name, path, class_name, class_list)
raise e, "", original_exception.backtrace raise new_exception, "", e.backtrace
end end
end end
@ -463,7 +463,7 @@ module Formulary
selected_formula = factory(possible_pinned_tap_formulae.first, spec) selected_formula = factory(possible_pinned_tap_formulae.first, spec)
if core_path(ref).file? if core_path(ref).file?
odeprecated "brew tap-pin user/tap", odeprecated "brew tap-pin user/tap",
"fully-scoped user/tap/formula naming" "fully-scoped user/tap/formula naming"
opoo <<~EOS opoo <<~EOS
#{ref} is provided by core, but is now shadowed by #{selected_formula.full_name}. #{ref} is provided by core, but is now shadowed by #{selected_formula.full_name}.
This behaviour is deprecated and will be removed in Homebrew 2.2.0. This behaviour is deprecated and will be removed in Homebrew 2.2.0.

4
Library/Homebrew/keg.rb
View File

@ -189,8 +189,8 @@ class Keg
extend Forwardable extend Forwardable
def_delegators :path, def_delegators :path,
:to_s, :hash, :abv, :disk_usage, :file_count, :directory?, :exist?, :/, :to_s, :hash, :abv, :disk_usage, :file_count, :directory?, :exist?, :/,
:join, :rename, :find :join, :rename, :find
def initialize(path) def initialize(path)
path = path.resolved_path if path.to_s.start_with?("#{HOMEBREW_PREFIX}/opt/") path = path.resolved_path if path.to_s.start_with?("#{HOMEBREW_PREFIX}/opt/")

4
Library/Homebrew/patch.rb
View File

@ -117,8 +117,8 @@ class ExternalPatch
attr_reader :resource, :strip attr_reader :resource, :strip
def_delegators :resource, def_delegators :resource,
:url, :fetch, :patch_files, :verify_download_integrity, :cached_download, :url, :fetch, :patch_files, :verify_download_integrity, :cached_download,
:clear_cache :clear_cache
def initialize(strip, &block) def initialize(strip, &block)
@strip = strip @strip = strip

2
Library/Homebrew/requirements/codesign_requirement.rb
View File

@ -18,7 +18,7 @@ class CodesignRequirement < Requirement
mktemp do mktemp do
FileUtils.cp "/usr/bin/false", "codesign_check" FileUtils.cp "/usr/bin/false", "codesign_check"
quiet_system "/usr/bin/codesign", "-f", "-s", @identity, quiet_system "/usr/bin/codesign", "-f", "-s", @identity,
"--dryrun", "codesign_check" "--dryrun", "codesign_check"
end end
end end

2
Library/Homebrew/requirements/java_requirement.rb
View File

@ -71,7 +71,7 @@ class JavaRequirement < Requirement
JAVA_SUGGESTION_MAP = { JAVA_SUGGESTION_MAP = {
"1.8" => CaskSuggestion.new( "1.8" => CaskSuggestion.new(
"homebrew/cask-versions/adoptopenjdk8", "homebrew/cask-versions/adoptopenjdk8",
"AdoptOpenJDK 8", "AdoptOpenJDK 8",
), ),
"12.0" => CaskSuggestion.new("adoptopenjdk", "AdoptOpenJDK"), "12.0" => CaskSuggestion.new("adoptopenjdk", "AdoptOpenJDK"),
}.freeze }.freeze

1
Library/Homebrew/rubocops.rb
View File

@ -2,6 +2,7 @@
require_relative "load_path" require_relative "load_path"
require "rubocop-performance"
require "rubocop-rspec" require "rubocop-rspec"
require "rubocops/formula_desc" require "rubocops/formula_desc"
require "rubocops/components_order" require "rubocops/components_order"

2
Library/Homebrew/test/cask/artifact/shared_examples/uninstall_zap.rb
View File

@ -250,7 +250,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
expect(subject).to receive(:system_command!) expect(subject).to receive(:system_command!)
.with( .with(
"osascript", "osascript",
args: ["-e", 'tell application "System Events" to delete every login item whose name is "Fancy"'], args: ["-e", 'tell application "System Events" to delete every login item whose name is "Fancy"'],
) )
.and_return(instance_double("SystemCommand::Result")) .and_return(instance_double("SystemCommand::Result"))

2
Library/Homebrew/test/cask/cmd/style_spec.rb
View File

@ -81,7 +81,7 @@ describe Cask::Cmd::Style, :cask do
it { it {
expect(subject).to contain_exactly(a_path_ending_with("/homebrew/homebrew-cask/Casks"), expect(subject).to contain_exactly(a_path_ending_with("/homebrew/homebrew-cask/Casks"),
a_path_ending_with("/third-party/homebrew-tap/Casks")) a_path_ending_with("/third-party/homebrew-tap/Casks"))
} }
end end

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

@ -221,7 +221,7 @@ RSpec.shared_context "integration test" do
system "git", "init" system "git", "init"
system "git", "add", "--all" system "git", "add", "--all"
system "git", "commit", "-m", system "git", "commit", "-m",
"#{old_name.capitalize} has not yet been renamed" "#{old_name.capitalize} has not yet been renamed"
brew "install", old_name brew "install", old_name
@ -230,7 +230,7 @@ RSpec.shared_context "integration test" do
system "git", "add", "--all" system "git", "add", "--all"
system "git", "commit", "-m", system "git", "commit", "-m",
"#{old_name.capitalize} has been renamed to #{new_name.capitalize}" "#{old_name.capitalize} has been renamed to #{new_name.capitalize}"
end end
end end

2
Library/Homebrew/test/tap_spec.rb
View File

@ -120,7 +120,7 @@ describe Tap do
cd path do cd path do
system "git", "init" system "git", "init"
system "git", "remote", "add", "origin", system "git", "remote", "add", "origin",
"https://github.com/someone/homebrew-foo" "https://github.com/someone/homebrew-foo"
end end
expect(t.issues_url).to eq("https://github.com/someone/homebrew-foo/issues") expect(t.issues_url).to eq("https://github.com/someone/homebrew-foo/issues")
expect(subject.issues_url).to eq("https://github.com/Homebrew/homebrew-foo/issues") expect(subject.issues_url).to eq("https://github.com/Homebrew/homebrew-foo/issues")

4
Library/Homebrew/test/utils/git_spec.rb
View File

@ -35,8 +35,8 @@ describe Git do
it "gives revision commit based on before_commit when it is not nil" do it "gives revision commit based on before_commit when it is not nil" do
expect( expect(
described_class.last_revision_commit_of_file(HOMEBREW_CACHE, described_class.last_revision_commit_of_file(HOMEBREW_CACHE,
file, file,
before_commit: hash2), before_commit: hash2),
).to eq(hash2) ).to eq(hash2)
end end
end end

4
Library/Homebrew/test/utils/svn_spec.rb
View File

@ -35,8 +35,8 @@ describe Utils do
it "returns true when remote exists", :needs_network, :needs_svn do it "returns true when remote exists", :needs_network, :needs_svn do
HOMEBREW_CACHE.cd do HOMEBREW_CACHE.cd do
system HOMEBREW_SHIMS_PATH/"scm/svn", "checkout", system HOMEBREW_SHIMS_PATH/"scm/svn", "checkout",
"--non-interactive", "--trust-server-cert", "--quiet", "--non-interactive", "--trust-server-cert", "--quiet",
"https://github.com/Homebrew/install" "https://github.com/Homebrew/install"
end end
expect(described_class).to be_svn_remote_exists(HOMEBREW_CACHE/"install") expect(described_class).to be_svn_remote_exists(HOMEBREW_CACHE/"install")

14
Library/Homebrew/utils/analytics.rb
View File

@ -63,9 +63,9 @@ module Utils
else else
pid = fork do pid = fork do
exec ENV["HOMEBREW_CURL"], exec ENV["HOMEBREW_CURL"],
*args, *args,
"--silent", "--output", "/dev/null", "--silent", "--output", "/dev/null",
"https://www.google-analytics.com/collect" "https://www.google-analytics.com/collect"
end end
Process.detach pid Process.detach pid
end end
@ -73,10 +73,10 @@ module Utils
def report_event(category, action, label = os_prefix_ci, value = nil) def report_event(category, action, label = os_prefix_ci, value = nil)
report(:event, report(:event,
ec: category, ec: category,
ea: action, ea: action,
el: label, el: label,
ev: value) ev: value)
end end
def report_build_error(exception) def report_build_error(exception)

2
Library/Homebrew/utils/bottles.rb
View File

@ -60,7 +60,7 @@ module Utils
end end
def formula_contents(bottle_file, def formula_contents(bottle_file,
name: resolve_formula_names(bottle_file)[0]) name: resolve_formula_names(bottle_file)[0])
bottle_version = resolve_version bottle_file bottle_version = resolve_version bottle_file
formula_path = "#{name}/#{bottle_version}/.brew/#{name}.rb" formula_path = "#{name}/#{bottle_version}/.brew/#{name}.rb"
contents = Utils.popen_read "tar", "-xOzf", bottle_file, formula_path contents = Utils.popen_read "tar", "-xOzf", bottle_file, formula_path