language
stringclasses
1 value
owner
stringlengths
2
15
repo
stringlengths
2
21
sha
stringlengths
45
45
message
stringlengths
7
36.3k
path
stringlengths
1
199
patch
stringlengths
15
102k
is_multipart
bool
2 classes
Other
Homebrew
brew
2020f382cb6cc51d58f7cf6c2895361129f11b5a.json
docs: add two taps, update CI info and fix some wording.
docs/Brew-Test-Bot.md
@@ -3,7 +3,7 @@ `brew test-bot` is the name for the automated review and testing system funded by [our Kickstarter in 2013](https://www.kickstarter.com/projects/homebrew/brew-test-bot). -It comprises four Mac Minis running in a data centre in England which host +It comprises four Mac Minis and three Xserves running in two data centres which host [a Jenkins instance at https://jenkins.brew.sh](https://jenkins.brew.sh) and run the [`brew-test-bot.rb`](https://github.com/Homebrew/homebrew-test-bot/blob/master/cmd/brew-test-bot.rb) Ruby script to perform automated testing of commits to the master branch, pull @@ -36,8 +36,6 @@ A passed build looks like this: On failed or passed builds you can click the "Details" link to view the result in Jenkins. -When you click this you'll see the results. - A passed build looks like this: ![Passed Jenkins Build](img/docs/brew-test-bot-passed-jenkins.png)
true
Other
Homebrew
brew
2020f382cb6cc51d58f7cf6c2895361129f11b5a.json
docs: add two taps, update CI info and fix some wording.
docs/Interesting-Taps-and-Forks.md
@@ -33,11 +33,15 @@ You can be added as a maintainer for one of the Homebrew organization taps and a * [brewsci/science](https://github.com/brewsci/homebrew-science): Software tailored to scientific endeavours. +* [davidchall/hep](https://github.com/davidchall/homebrew-hep): High energy physics formulae. + +* [lifepillar/appleii](https://github.com/lifepillar/homebrew-appleii): Formulae for vintage Apple emulation. + ## Interesting forks -* [mistydemeo/tigerbrew](https://github.com/mistydemeo/tigerbrew): Experimental Tiger PowerPC version +* [mistydemeo/tigerbrew](https://github.com/mistydemeo/tigerbrew): Experimental Tiger PowerPC version. -* [Linuxbrew/brew](https://github.com/Linuxbrew/brew): Experimental Linux version +* [Linuxbrew/brew](https://github.com/Linuxbrew/brew): Experimental Linux version. ## Technical details
true
Other
Homebrew
brew
1373441e53d838264c70690e9612009f0e9735d8.json
xcode_requirement: inform users of macOS upgrade. If you need a newer Xcode than the latest version provided by your version of macOS then you need to upgrade your OS to install the software.
Library/Homebrew/requirements/xcode_requirement.rb
@@ -22,7 +22,12 @@ def message A full installation of Xcode.app#{version} is required to compile this software. Installing just the Command Line Tools is not sufficient. EOS - if MacOS.version >= :lion + if Version.new(MacOS::Xcode.latest_version) < Version.new(@version) + message + <<~EOS + Xcode#{version} cannot be installed on macOS #{MacOS.version}. + You must upgrade your version of macOS. + EOS + elsif MacOS.version >= :lion message + <<~EOS Xcode can be installed from the App Store. EOS
false
Other
Homebrew
brew
edd1c76d409e224e329131bbd635d944cdf6fe1f.json
bump-formula-pr: detect download strategy from url. Previously, CurlDownloadStrategy was hard coded.
Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -198,7 +198,7 @@ def bump_formula_pr new_url.sub "mirrors.ocf.berkeley.edu/debian", "mirrorservice.org/sites/ftp.debian.org/debian" end resource = Resource.new { @url = new_url } - resource.download_strategy = CurlDownloadStrategy + resource.download_strategy = DownloadStrategyDetector.detect_from_url(new_url) resource.owner = Resource.new(formula.name) resource.version = forced_version if forced_version odie "No --version= argument specified!" unless resource.version
false
Other
Homebrew
brew
99bb068ca734c7096bf82c72730f1babc7f72431.json
bump-formula-pr: improve formula name guessing.
Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -137,9 +137,16 @@ def bump_formula_pr new_url = ARGV.value("url") if new_url && !formula - is_devel = ARGV.include?("--devel") - base_url = new_url.split("/")[0..4].join("/") + # Split the new URL on / and find any formulae that have the same URL + # except for the last component, but don't try to match any more than the + # first five components since sometimes the last component isn't the only + # one to change. + new_url_split = new_url.split("/") + maximum_url_components_to_match = 5 + components_to_match = [new_url_split.count - 1, maximum_url_components_to_match].min + base_url = new_url_split.first(components_to_match).join("/") base_url = /#{Regexp.escape(base_url)}/ + is_devel = ARGV.include?("--devel") guesses = [] Formula.each do |f| if is_devel && f.devel && f.devel.url && f.devel.url.match(base_url)
false
Other
Homebrew
brew
78933b3ee91a9bfd71128bd7e7e46b9af9ef30e2.json
ruby.sh: fix version check. - Rather than checking for the absence of a failure check for an actual success in the check - Fix the check to work on Ruby 1.9 (where `RUBY_VERSION.to_s.dup` is required to avoid modifying a frozen string).
Library/Homebrew/utils/ruby.sh
@@ -2,7 +2,7 @@ setup-ruby-path() { local vendor_dir local vendor_ruby_current_version local vendor_ruby_path - local ruby_old_version + local ruby_version_new_enough local minimum_ruby_version="2.3.3" vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor" @@ -35,12 +35,12 @@ setup-ruby-path() { HOMEBREW_RUBY_PATH="$(which ruby)" fi - if [[ -n "$HOMEBREW_RUBY_PATH" ]] + if [[ -n "$HOMEBREW_RUBY_PATH" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]] then - ruby_old_version="$("$HOMEBREW_RUBY_PATH" -rrubygems -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")" + ruby_version_new_enough="$("$HOMEBREW_RUBY_PATH" -rrubygems -e "puts Gem::Version.new(RUBY_VERSION.to_s.dup) >= Gem::Version.new('$minimum_ruby_version')")" fi - if [[ -z "$HOMEBREW_RUBY_PATH" || "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] + if [[ -z "$HOMEBREW_RUBY_PATH" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" || "$ruby_version_new_enough" != "true" ]] then brew vendor-install ruby if [[ ! -x "$vendor_ruby_path" ]]
false
Other
Homebrew
brew
4b231e793d25b3d30940a44e6f2dde0a8f34ff94.json
Fix Travis deprecation error.
.travis.yml
@@ -23,7 +23,10 @@ before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then HOMEBREW_REPOSITORY="$(brew --repo)"; sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; - mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library"; + mkdir -p "$PWD/Library/Taps/homebrew" + mv "$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" "$PWD/Library/homebrew/homebrew-core"; + git -C "$PWD/Library/homebrew/homebrew-core" fetch --tags --force origin + git -C "$PWD/Library/homebrew/homebrew-core" checkout --force -B master origin/master sudo rm -rf "$HOMEBREW_REPOSITORY"; sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot;
false
Other
Homebrew
brew
4a1a8b86ac094621a50eff1526b53f62758ad1be.json
bump-formula-pr: use "resource" not "rsrc"
Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -184,23 +184,23 @@ def bump_formula_pr elsif !new_url odie "#{formula}: no --url= argument specified!" else - rsrc_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ + resource_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu" new_mirror else new_url end - rsrc = Resource.new { @url = rsrc_url } - rsrc.download_strategy = CurlDownloadStrategy - rsrc.owner = Resource.new(formula.name) - rsrc.version = forced_version if forced_version - odie "No --version= argument specified!" unless rsrc.version - rsrc_path = rsrc.fetch + resource = Resource.new { @url = resource_url } + resource.download_strategy = CurlDownloadStrategy + resource.owner = Resource.new(formula.name) + resource.version = forced_version if forced_version + odie "No --version= argument specified!" unless resource.version + resource_path = resource.fetch gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar" gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable? tar = which("gtar") || gnu_tar_gtar || which("tar") - if Utils.popen_read(tar, "-tf", rsrc_path) =~ %r{/.*\.} - new_hash = rsrc_path.sha256 + if Utils.popen_read(tar, "-tf", resource_path) =~ %r{/.*\.} + new_hash = resource_path.sha256 elsif new_url.include? ".tar" odie "#{formula}: no --url=/--#{hash_type}= arguments specified!" end
false
Other
Homebrew
brew
459b113e28cab57cde94625b3f284e54986c2167.json
utils: reduce odeprecated warnings. Fix the code so we don't actually output `odeprecated` warnings for `HOMEBREW_CACHE`d or `.brew`d formulae.
Library/Homebrew/utils.rb
@@ -82,16 +82,19 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call # - Location of caller of deprecated method (if all else fails). backtrace = caller tap_message = nil + + # Don't throw deprecations at all for cached or .brew formulae. + return if backtrace.any? do |line| + line.include?(HOMEBREW_CACHE) || line.include?("/.brew/") + end + caller_message = backtrace.detect do |line| next unless line =~ %r{^#{Regexp.escape(HOMEBREW_LIBRARY)}/Taps/([^/]+/[^/]+)/} tap = Tap.fetch Regexp.last_match(1) tap_message = "\nPlease report this to the #{tap} tap!" true end caller_message ||= backtrace.detect do |line| - # Don't throw deprecations at all for cached or .brew formulae. - next false if line.include?(HOMEBREW_CACHE) - next false if line.include?("/.brew/") !line.start_with?("#{HOMEBREW_LIBRARY_PATH}/compat/") end caller_message ||= backtrace[1]
false
Other
Homebrew
brew
2844b0748da7d18fa9dca30a5ebbb00617493b66.json
build: remove req satisfied calls.
Library/Homebrew/build.rb
@@ -81,12 +81,10 @@ def install ENV.x11 = reqs.any? { |rq| rq.is_a?(X11Requirement) } ENV.setup_build_environment(formula) post_superenv_hacks - reqs.each(&:satisfied?) reqs.each(&:modify_build_environment) deps.each(&:modify_build_environment) else ENV.setup_build_environment(formula) - reqs.each(&:satisfied?) reqs.each(&:modify_build_environment) deps.each(&:modify_build_environment)
false
Other
Homebrew
brew
480a25aef9ea5ae0e1a0e206b60522bc79003908.json
Add doctor and style to checklist. Ensures that contributors know about `brew doctor` and `brew style` before submitting a PR, since CI fails on `brew style` breaches.
.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,8 @@ - [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/Homebrew/brew/pulls) for the same change? - [ ] Have you added an explanation of what your changes do and why you'd like us to include them? - [ ] Have you written new tests for your changes? [Here's an example](https://github.com/Homebrew/homebrew/pull/49031). +- [ ] Have you successfully run `brew style` with your changes locally? +- [ ] Have you successfully run `brew doctor` with your changes locally? - [ ] Have you successfully run `brew tests` with your changes locally? -----
false
Other
Homebrew
brew
ab00c0f719a5646060a9fbd15fbecb1b2a9eb16d.json
compat/requirements: fix dependency names.
Library/Homebrew/compat/requirements.rb
@@ -12,111 +12,111 @@ class CVSRequirement < Requirement class EmacsRequirement < Requirement fatal true satisfy do - odeprecated("EmacsRequirement", "'depends_on \"cvs\"'") + odeprecated("EmacsRequirement", "'depends_on \"emacs\"'") which "emacs" end end class FortranRequirement < Requirement fatal true satisfy do - odeprecated("FortranRequirement", "'depends_on \"cvs\"'") + odeprecated("FortranRequirement", "'depends_on \"gcc\"'") which "gfortran" end end class GitRequirement < Requirement fatal true satisfy do - odeprecated("GitRequirement", "'depends_on \"cvs\"'") + odeprecated("GitRequirement", "'depends_on \"git\"'") which "git" end end class GPG2Requirement < Requirement fatal true satisfy do - odeprecated("GPG2Requirement", "'depends_on \"cvs\"'") + odeprecated("GPG2Requirement", "'depends_on \"gnupg\"'") which "gpg" end end class MercurialRequirement < Requirement fatal true satisfy do - odeprecated("MercurialRequirement", "'depends_on \"cvs\"'") + odeprecated("MercurialRequirement", "'depends_on \"mercurial\"'") which "hg" end end class MPIRequirement < Requirement fatal true satisfy do - odeprecated("MPIRequirement", "'depends_on \"cvs\"'") + odeprecated("MPIRequirement", "'depends_on \"open-mpi\"'") which "mpicc" end end class MysqlRequirement < Requirement fatal true satisfy do - odeprecated("MysqlRequirement", "'depends_on \"cvs\"'") + odeprecated("MysqlRequirement", "'depends_on \"mysql\"'") which "mysql_config" end end class PerlRequirement < Requirement fatal true satisfy do - odeprecated("PerlRequirement", "'depends_on \"cvs\"'") + odeprecated("PerlRequirement", "'depends_on \"perl\"'") which "perl" end end class PostgresqlRequirement < Requirement fatal true satisfy do - odeprecated("PostgresqlRequirement", "'depends_on \"cvs\"'") + odeprecated("PostgresqlRequirement", "'depends_on \"postgresql\"'") which "pg_config" end end class PythonRequirement < Requirement fatal true satisfy do - odeprecated("PythonRequirement", "'depends_on \"cvs\"'") + odeprecated("PythonRequirement", "'depends_on \"python\"'") which "python" end end class Python3Requirement < Requirement fatal true satisfy do - odeprecated("Python3Requirement", "'depends_on \"cvs\"'") + odeprecated("Python3Requirement", "'depends_on \"python3\"'") which "python3" end end class RbenvRequirement < Requirement fatal true satisfy do - odeprecated("RbenvRequirement", "'depends_on \"cvs\"'") + odeprecated("RbenvRequirement", "'depends_on \"rbenv\"'") which "rbenv" end end class RubyRequirement < Requirement fatal true satisfy do - odeprecated("RubyRequirement", "'depends_on \"cvs\"'") + odeprecated("RubyRequirement", "'depends_on \"ruby\"'") which "ruby" end end class SubversionRequirement < Requirement fatal true satisfy do - odeprecated("SubversionRequirement", "'depends_on \"cvs\"'") + odeprecated("SubversionRequirement", "'depends_on \"subversion\"'") which "svn" end end @@ -126,7 +126,7 @@ class TeXRequirement < Requirement cask "mactex" download "https://www.tug.org/mactex/" satisfy do - odeprecated("TeXRequirement", "'depends_on \"cvs\"'") + odeprecated("TeXRequirement") which("tex") || which("latex") end end
false
Other
Homebrew
brew
53d87d3b58845b8778e214e2b4e4632029d24b07.json
fix broken sentence
Library/Homebrew/diagnostic.rb
@@ -339,8 +339,7 @@ def check_access_prefix_directories by Homebrew. If a formula tries to write a file to this directory, the install will fail during the link step. - You should change the ownership and permissions of these directories. - back to your user account. + You should change the ownership of these directories to your account. sudo chown -R $(whoami) #{not_writable_dirs.join(" ")} EOS end
false
Other
Homebrew
brew
f818f0e68139fd1e7b2665f0cd415936aa8cc63d.json
formula: reject dot dirs as racks Dot directories are not racks because formulae names do not start with "." so avoid attempting to descend into dot directories, which may not always be possible (e.g. .Trashes).
Library/Homebrew/formula.rb
@@ -1371,7 +1371,7 @@ def self.clear_installed_formulae_cache def self.racks @racks ||= if HOMEBREW_CELLAR.directory? HOMEBREW_CELLAR.subdirs.reject do |rack| - rack.symlink? || rack.subdirs.empty? + rack.symlink? || rack.basename.to_s.start_with?(".") || rack.subdirs.empty? end else []
false
Other
Homebrew
brew
67fc68afaf264c55af484d3e6f7ec8141605ebfd.json
README.md: secure two URLs
README.md
@@ -72,7 +72,7 @@ Alternatively, if you'd rather make a one-off payment: BROOKLYN, NY 11201 USA - Donate by wire transfer: contact accounting@sfconservancy.org for wire transfer details. -Homebrew is a member of the [Software Freedom Conservancy](http://sfconservancy.org) which provides us with an ability to receive tax-deductible, Homebrew earmarked donations (and [many other services](http://sfconservancy.org/members/services/)). Software Freedom Conservancy, Inc. is a 501(c)(3) organization incorporated in New York, and donations made to it are fully tax-deductible to the extent permitted by law. +Homebrew is a member of the [Software Freedom Conservancy](https://sfconservancy.org) which provides us with an ability to receive tax-deductible, Homebrew earmarked donations (and [many other services](https://sfconservancy.org/members/services/)). Software Freedom Conservancy, Inc. is a 501(c)(3) organization incorporated in New York, and donations made to it are fully tax-deductible to the extent permitted by law. ## Sponsors Our Xserve ESXi boxes for CI are hosted by [MacStadium](https://www.macstadium.com).
false
Other
Homebrew
brew
78c829790d990b324320c3089c74eaec95c5ec31.json
Improve deprecation message for dependency tags It took me a while to figure out what this deprecation actually did, because the message wasn't accurate.
Library/Homebrew/compat/dependency_collector.rb
@@ -9,7 +9,7 @@ module Compat def parse_string_spec(spec, tags) if (tag = tags.first) && LANGUAGE_MODULES.include?(tag) - odeprecated "'depends_on :#{tag}'" + odeprecated "'depends_on ... => #{tag.inspect}'" LanguageModuleRequirement.new(tag, spec, tags[1]) else super
false
Other
Homebrew
brew
65695885b68a69d6104b0661a2293a2783748a19.json
Update other Homebrew maintainers.
Library/Homebrew/dev-cmd/man.rb
@@ -64,8 +64,10 @@ def build_man_page .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:core_maintainer] = readme.read[%r{(Homebrew/homebrew-core's lead maintainer .*\.)}, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') - variables[:maintainers] = readme.read[/(Homebrew's other current maintainers .*\.)/, 1] - .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') + variables[:brew_maintainers] = readme.read[%r{(Homebrew/brew's other current maintainers .*\.)}, 1] + .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') + variables[:core_maintainers] = readme.read[%r{(Homebrew/homebrew-core's other current maintainers .*\.)}, 1] + .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:former_maintainers] = readme.read[/(Former maintainers .*\.)/, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1')
true
Other
Homebrew
brew
65695885b68a69d6104b0661a2293a2783748a19.json
Update other Homebrew maintainers.
Library/Homebrew/manpages/brew.1.md.erb
@@ -278,7 +278,9 @@ Homebrew Documentation: <https://docs.brew.sh> <%= core_maintainer.concat("\n") %> -<%= maintainers.concat("\n") %> +<%= brew_maintainers.concat("\n") %> + +<%= core_maintainers.concat("\n") %> <%= former_maintainers.concat("\n") %>
true
Other
Homebrew
brew
65695885b68a69d6104b0661a2293a2783748a19.json
Update other Homebrew maintainers.
README.md
@@ -40,9 +40,11 @@ Homebrew's lead maintainer is [Mike McQuaid](https://github.com/mikemcquaid). Homebrew/homebrew-core's lead maintainer is [ilovezfs](https://github.com/ilovezfs). -Homebrew's other current maintainers are [Alyssa Ross](https://github.com/alyssais), [Alex Dunn](https://github.com/dunn), [FX Coudert](https://github.com/fxcoudert), [Josh Hagins](https://github.com/jawshooah), [JCount](https://github.com/jcount), [Misty De Meo](https://github.com/mistydemeo), [neutric](https://github.com/neutric), [Tomasz Pajor](https://github.com/nijikon), [Markus Reiter](https://github.com/reitermarkus), [Tom Schoonjans](https://github.com/tschoonj), [Uladzislau Shablinski](https://github.com/vladshablinsky) and [William Woodruff](https://github.com/woodruffw). +Homebrew/brew's other current maintainers are [ilovezfs](https://github.com/ilovezfs), [Alyssa Ross](https://github.com/alyssais), [JCount](https://github.com/jcount), [Misty De Meo](https://github.com/mistydemeo), [Gautham Goli](https://github.com/GauthamGoli), [Markus Reiter](https://github.com/reitermarkus) and [William Woodruff](https://github.com/woodruffw). -Former maintainers with significant contributions include [Tim Smith](https://github.com/tdsmith), [Baptiste Fontaine](https://github.com/bfontaine), [Xu Cheng](https://github.com/xu-cheng), [Martin Afanasjew](https://github.com/UniqMartin), [Dominyk Tiller](https://github.com/DomT4), [Brett Koonce](https://github.com/asparagui), [Charlie Sharpsteen](https://github.com/Sharpie), [Jack Nagel](https://github.com/jacknagel), [Adam Vandenberg](https://github.com/adamv), [Andrew Janke](https://github.com/apjanke) and Homebrew's creator: [Max Howell](https://github.com/mxcl). +Homebrew/homebrew-core's other current maintainers are [FX Coudert](https://github.com/fxcoudert), [JCount](https://github.com/jcount), [Misty De Meo](https://github.com/mistydemeo) and [Tom Schoonjans](https://github.com/tschoonj). + +Former maintainers with significant contributions include [Tim Smith](https://github.com/tdsmith), [Baptiste Fontaine](https://github.com/bfontaine), [Xu Cheng](https://github.com/xu-cheng), [Martin Afanasjew](https://github.com/UniqMartin), [Dominyk Tiller](https://github.com/DomT4), [Brett Koonce](https://github.com/asparagui), [Charlie Sharpsteen](https://github.com/Sharpie), [Jack Nagel](https://github.com/jacknagel), [Adam Vandenberg](https://github.com/adamv), [Andrew Janke](https://github.com/apjanke), [Alex Dunn](https://github.com/dunn), [neutric](https://github.com/neutric), [Tomasz Pajor](https://github.com/nijikon), [Uladzislau Shablinski](https://github.com/vladshablinsky) and Homebrew's creator: [Max Howell](https://github.com/mxcl). ## Community - [discourse.brew.sh (forum)](https://discourse.brew.sh)
true
Other
Homebrew
brew
65695885b68a69d6104b0661a2293a2783748a19.json
Update other Homebrew maintainers.
docs/Manpage.md
@@ -1123,9 +1123,11 @@ Homebrew's lead maintainer is Mike McQuaid. Homebrew/homebrew-core's lead maintainer is ilovezfs. -Homebrew's other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tom Schoonjans, Uladzislau Shablinski and William Woodruff. +Homebrew/brew's other current maintainers are ilovezfs, Alyssa Ross, JCount, Misty De Meo, Gautham Goli, Markus Reiter and William Woodruff. -Former maintainers with significant contributions include Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew's creator: Max Howell. +Homebrew/homebrew-core's other current maintainers are FX Coudert, JCount, Misty De Meo and Tom Schoonjans. + +Former maintainers with significant contributions include Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg, Andrew Janke, Alex Dunn, neutric, Tomasz Pajor, Uladzislau Shablinski and Homebrew's creator: Max Howell. ## BUGS
true
Other
Homebrew
brew
65695885b68a69d6104b0661a2293a2783748a19.json
Update other Homebrew maintainers.
manpages/brew-cask.1
@@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW\-CASK" "1" "December 2017" "Homebrew" "brew-cask" +.TH "BREW\-CASK" "1" "January 2018" "Homebrew" "brew-cask" . .SH "NAME" \fBbrew\-cask\fR \- a friendly binary installer for macOS
true
Other
Homebrew
brew
65695885b68a69d6104b0661a2293a2783748a19.json
Update other Homebrew maintainers.
manpages/brew.1
@@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW" "1" "December 2017" "Homebrew" "brew" +.TH "BREW" "1" "January 2018" "Homebrew" "brew" . .SH "NAME" \fBbrew\fR \- The missing package manager for macOS @@ -1166,10 +1166,13 @@ Homebrew\'s lead maintainer is Mike McQuaid\. Homebrew/homebrew\-core\'s lead maintainer is ilovezfs\. . .P -Homebrew\'s other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tom Schoonjans, Uladzislau Shablinski and William Woodruff\. +Homebrew/brew\'s other current maintainers are ilovezfs, Alyssa Ross, JCount, Misty De Meo, Gautham Goli, Markus Reiter and William Woodruff\. . .P -Former maintainers with significant contributions include Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew\'s creator: Max Howell\. +Homebrew/homebrew\-core\'s other current maintainers are FX Coudert, JCount, Misty De Meo and Tom Schoonjans\. +. +.P +Former maintainers with significant contributions include Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg, Andrew Janke, Alex Dunn, neutric, Tomasz Pajor, Uladzislau Shablinski and Homebrew\'s creator: Max Howell\. . .SH "BUGS" See our issues on GitHub:
true
Other
Homebrew
brew
ebd50d136f40b3795e9feecd7de0177f6067a61d.json
info: show spec options for optionless formulae Previsiouly, info would not display --HEAD or --devel for formulae that had no options other than those spec options.
Library/Homebrew/cmd/info.rb
@@ -164,7 +164,7 @@ def info_formula(f) end end - unless f.options.empty? + if !f.options.empty? || f.head || f.devel ohai "Options" Homebrew.dump_options_for_formula f end
false
Other
Homebrew
brew
17c24d040bc2a488b9bd70546cf0ef4f6d81d3bc.json
utils: tell developers to submit odeprecated PRs. Rather than just telling them to submit an issue as it's likely that as these folks will be able to submit a PR.
Library/Homebrew/utils.rb
@@ -101,7 +101,8 @@ def odeprecated(method, replacement = nil, disable: false, disable_on: nil, call if ARGV.homebrew_developer? || disable || Homebrew.raise_deprecation_exceptions? - raise MethodDeprecatedError, message + developer_message = message + "Or, even better, submit a PR to fix it!" + raise MethodDeprecatedError, developer_message elsif !Homebrew.auditing? opoo "#{message}\n" end
false
Other
Homebrew
brew
8bf948482325bdc10ab7d0eff75ce0da4d5daf1c.json
cask moved: check target writable for move_back
Library/Homebrew/cask/lib/hbc/artifact/moved.rb
@@ -65,7 +65,7 @@ def move_back(skip: false, force: false, command: nil, **options) ohai "Moving #{self.class.english_name} '#{target.basename}' back to '#{source}'." source.dirname.mkpath - if source.parent.writable? + if target.parent.writable? FileUtils.move(target, source) else command.run("/bin/mv", args: [target, source], sudo: true)
false
Other
Homebrew
brew
0306eff958a8d4b749b9d4d344d47498dc9e7a7f.json
brew unlink: fix short option
completions/zsh/_brew
@@ -711,15 +711,15 @@ _brew_uninstall() { # brew unlink [--dry-run] formula: _brew_unlink() { _arguments \ - '(--dry-run =n)'{--dry-run,=n}'[don''t unlink or delete any files]' \ + '(--dry-run -n)'{--dry-run,-n}'[don''t unlink or delete any files]' \ ':formula:__brew_installed_formulae' } # brew unlinkapps [--local] [--dry-run] [formulae]: _brew_unlinkapps() { _arguments \ '(--local)--local[remove symlinks from ~/Applications instead of the system directory]' \ - '(--dry-run =n)'{--dry-run,-n}'[don''t unlink or delete any files]' \ + '(--dry-run -n)'{--dry-run,-n}'[don''t unlink or delete any files]' \ ':formula:__brew_installed_formulae' }
false
Other
Homebrew
brew
9be416e3c88a1ac9e6781fba3c792a33d2f5e4c9.json
Suppress alias expansion in bash completion script
completions/bash/brew
@@ -51,7 +51,7 @@ __brewcomp() { __brew_complete_formulae() { local cur="${COMP_WORDS[COMP_CWORD]}" local formulas="$(brew search)" - local shortnames="$(echo "$formulas" | grep / | cut -d / -f 3)" + local shortnames="$(echo "$formulas" | \grep / | \cut -d / -f 3)" COMPREPLY=($(compgen -W "$formulas $shortnames" -- "$cur")) } @@ -593,7 +593,7 @@ __brew_cask_complete_formulae () local lib=$(brew --repository)/Library local taps=${lib}/Taps local casks=${lib}/Taps/caskroom/homebrew-cask/Casks - local ff=$(\ls ${casks} 2>/dev/null | sed 's/\.rb//g') + local ff=$(\ls ${casks} 2>/dev/null | \sed 's/\.rb//g') COMPREPLY=($(compgen -W "$ff" -- "$cur")) } @@ -738,7 +738,7 @@ _brew() { then # Do not auto-complete "*instal" or "*uninstal" aliases for "*install" commands. # Prefix newline to prevent not checking the first command. - local cmds=$'\n'"$(brew commands --quiet --include-aliases | grep -v instal$)" + local cmds=$'\n'"$(brew commands --quiet --include-aliases | \grep -v instal$)" __brewcomp "${cmds}" return fi
false
Other
Homebrew
brew
924865ec7f18078650be87ca31b6c0a434b0a78d.json
curl: handle more non-executable curl edge-cases. Address some additional issues mentioned in #3624.
Library/Homebrew/utils/curl.rb
@@ -2,10 +2,13 @@ require "open3" def curl_executable - curl = Pathname.new ENV["HOMEBREW_CURL"] - curl = which("curl") unless curl.exist? - return curl if curl.executable? - raise "#{curl} is not executable" + @curl ||= [ + ENV["HOMEBREW_CURL"], + which("curl"), + "/usr/bin/curl", + ].map { |c| Pathname(c) }.find(&:executable?) + raise "curl is not executable" unless @curl + @curl end def curl_args(*extra_args, show_output: false, user_agent: :default)
false
Other
Homebrew
brew
fa763216200a2ae1c36f5ec4cbf3d4f17d5053ff.json
Interesting-Taps-and-Forks: add brewsci org taps. From the artist known as homebrew-science.
docs/Interesting-Taps-and-Forks.md
@@ -29,6 +29,10 @@ You can be added as a maintainer for one of the Homebrew organization taps and a * [osrf/simulation](https://github.com/osrf/homebrew-simulation): Tools for robotics simulation. +* [brewsci/bio](https://github.com/brewsci/homebrew-bio): Bioinformatics formulae. + +* [brewsci/science](https://github.com/brewsci/homebrew-science): Software tailored to scientific endeavours. + ## Interesting forks * [mistydemeo/tigerbrew](https://github.com/mistydemeo/tigerbrew): Experimental Tiger PowerPC version
false
Other
Homebrew
brew
f5e8b2680e9a94d57666fc8b5e2ff324fb1bd143.json
docs: Fix depends_on examples in Formula page example: Error: depends_on :mysql Correct: depends_on "mysql"
Library/Homebrew/formula.rb
@@ -2207,19 +2207,19 @@ def go_resource(name, &block) # depends_on :x11 # X11/XQuartz components. # depends_on :osxfuse # Permits the use of the upstream signed binary or our source package. # depends_on :tuntap # Does the same thing as above. This is vital for Yosemite and above. - # depends_on :mysql => :recommended</pre> + # depends_on "mysql" => :recommended</pre> # <pre># It is possible to only depend on something if # # `build.with?` or `build.without? "another_formula"`: - # depends_on :mysql # allows brewed or external mysql to be used - # depends_on :postgresql if build.without? "sqlite" - # depends_on :hg # Mercurial (external or brewed) is needed</pre> + # depends_on "mysql" # allows brewed or external mysql to be used + # depends_on "postgresql" if build.without? "sqlite" + # depends_on "hg" # Mercurial (external or brewed) is needed</pre> # # <pre># If any Python >= 2.7 < 3.x is okay (either from macOS or brewed): - # depends_on :python</pre> + # depends_on "python"</pre> # <pre># to depend on Python >= 2.7 but use system Python where possible - # depends_on :python if MacOS.version <= :snow_leopard</pre> + # depends_on "python" if MacOS.version <= :snow_leopard</pre> # <pre># Python 3.x if the `--with-python3` is given to `brew install example` - # depends_on :python3 => :optional</pre> + # depends_on "python3" => :optional</pre> def depends_on(dep) specs.each { |spec| spec.depends_on(dep) } end
false
Other
Homebrew
brew
7f2fda104a47b696b4333e424d078b28860cb5c3.json
formula_cop: match any values in hash match. e.g. match an array or symbol or string.
Library/Homebrew/rubocops/extend/formula_cop.rb
@@ -214,7 +214,7 @@ def find_const(node, const_name) EOS def_node_search :dependency_name_hash_match?, <<~EOS - (hash (pair ({str sym} %1) ({str sym array} _))) + (hash (pair ({str sym} %1) (...))) EOS # To compare node with appropriate Ruby variable
false
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/ARGV.rb
@@ -1,6 +1,5 @@ module HomebrewArgvExtension def build_32_bit? - odeprecated "ARGV.build_32_bit?" - include? "--32-bit" + odisabled "ARGV.build_32_bit?" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/ENV/shared.rb
@@ -5,6 +5,6 @@ def j1 end def java_cache - # odeprecated "ENV.java_cache" + odeprecated "ENV.java_cache" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/build_options.rb
@@ -1,11 +1,9 @@ class BuildOptions def build_32_bit? - odeprecated "build.build_32_bit?" - include?("32-bit") && option_defined?("32-bit") + odisabled "build.build_32_bit?" end def build_bottle? - odeprecated "build.build_bottle?", "build.bottle?" - bottle? + odisabled "build.build_bottle?", "build.bottle?" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/dependency_collector.rb
@@ -10,6 +10,7 @@ class DependencyCollector def parse_string_spec(spec, tags) if (tag = tags.first) && LANGUAGE_MODULES.include?(tag) + odeprecated "'depends_on :#{tag}'" LanguageModuleRequirement.new(tag, spec, tags[1]) else _parse_string_spec(spec, tags) @@ -23,7 +24,7 @@ def parse_symbol_spec(spec, tags) when :clt odeprecated "'depends_on :clt'" when :tex - # odeprecated "'depends_on :tex'" + odeprecated "'depends_on :tex'" TeXRequirement.new(tags) when :autoconf, :automake, :bsdmake, :libtool output_deprecation(spec, tags) @@ -39,7 +40,7 @@ def parse_symbol_spec(spec, tags) output_deprecation("libtool", tags) Dependency.new("libtool", tags) when :apr - # output_deprecation(spec, tags, "apr-util") + output_deprecation(spec, tags, "apr-util") Dependency.new("apr-util", tags) when :fortran # output_deprecation(spec, tags, "gcc")
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/fails_with_llvm.rb
@@ -1,9 +1,9 @@ class Formula def fails_with_llvm(_msg = nil, _data = nil) - odeprecated "Formula#fails_with_llvm in install" + odisabled "Formula#fails_with_llvm in install" end def self.fails_with_llvm(_msg = nil, _data = {}) - odeprecated "Formula.fails_with_llvm" + odisabled "Formula.fails_with_llvm" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/formula.rb
@@ -1,12 +1,10 @@ module FormulaCompat def x11_installed? - odeprecated "Formula#x11_installed?", "MacOS::X11.installed?" - MacOS::X11.installed? + odisabled "Formula#x11_installed?", "MacOS::X11.installed?" end def snow_leopard_64? - odeprecated "Formula#snow_leopard_64?", "MacOS.prefer_64_bit?" - MacOS.prefer_64_bit? + odisabled "Formula#snow_leopard_64?", "MacOS.prefer_64_bit?" end end @@ -15,48 +13,40 @@ class Formula extend FormulaCompat def std_cmake_parameters - odeprecated "Formula#std_cmake_parameters", "Formula#std_cmake_args" - "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev" + odisabled "Formula#std_cmake_parameters", "Formula#std_cmake_args" end - def cxxstdlib_check(check_type) - odeprecated "Formula#cxxstdlib_check in install", - "Formula.cxxstdlib_check outside install" - self.class.cxxstdlib_check check_type + def cxxstdlib_check(_) + odisabled "Formula#cxxstdlib_check in install", + "Formula.cxxstdlib_check outside install" end def self.bottle_sha1(*) - odeprecated "Formula.bottle_sha1" + odisabled "Formula.bottle_sha1" end def self.all - odeprecated "Formula.all", "Formula.map" - map + odisabled "Formula.all", "Formula.map" end - def self.canonical_name(name) - odeprecated "Formula.canonical_name", "Formulary.canonical_name" - Formulary.canonical_name(name) + def self.canonical_name(_) + odisabled "Formula.canonical_name", "Formulary.canonical_name" end - def self.class_s(name) - odeprecated "Formula.class_s", "Formulary.class_s" - Formulary.class_s(name) + def self.class_s(_) + odisabled "Formula.class_s", "Formulary.class_s" end - def self.factory(name) - odeprecated "Formula.factory", "Formulary.factory" - Formulary.factory(name) + def self.factory(_) + odisabled "Formula.factory", "Formulary.factory" end def self.require_universal_deps - odeprecated "Formula.require_universal_deps" - define_method(:require_universal_deps?) { true } + odisabled "Formula.require_universal_deps" end - def self.path(name) - odeprecated "Formula.path", "Formulary.core_path" - Formulary.core_path(name) + def self.path(_) + odisabled "Formula.path", "Formulary.core_path" end DATA = :DATA @@ -67,20 +57,18 @@ def patches {} end - def python(_options = {}, &_block) - odeprecated "Formula#python" - yield if block_given? - PythonRequirement.new + def python(_options = {}, &_) + odisabled "Formula#python" end alias python2 python alias python3 python def startup_plist - odeprecated "Formula#startup_plist", "Formula#plist" + odisabled "Formula#startup_plist", "Formula#plist" end def rake(*args) - # odeprecated "FileUtils#rake", "system \"rake\"" + odeprecated "FileUtils#rake", "system \"rake\"" system "rake", *args end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/formula_specialties.rb
@@ -1,47 +1,23 @@ class ScriptFileFormula < Formula def install - odeprecated "ScriptFileFormula#install", "Formula#install" - bin.install Dir["*"] + odisabled "ScriptFileFormula#install", "Formula#install" end end class GithubGistFormula < ScriptFileFormula - def self.url(val) - odeprecated "GithubGistFormula.url", "Formula.url" - super - version File.basename(File.dirname(val))[0, 6] + def self.url(_val) + odisabled "GithubGistFormula.url", "Formula.url" end end -# This formula serves as the base class for several very similar -# formulae for Amazon Web Services related tools. class AmazonWebServicesFormula < Formula - # Use this method to perform a standard install for Java-based tools, - # keeping the .jars out of HOMEBREW_PREFIX/lib def install - odeprecated "AmazonWebServicesFormula#install", "Formula#install" - - rm Dir["bin/*.cmd"] # Remove Windows versions - libexec.install Dir["*"] - bin.install_symlink Dir["#{libexec}/bin/*"] - ["#{libexec}/bin/service"] + odisabled "AmazonWebServicesFormula#install", "Formula#install" end alias standard_install install # Use this method to generate standard caveats. - def standard_instructions(home_name, home_value = libexec) - odeprecated "AmazonWebServicesFormula#standard_instructions", "Formula#caveats" - - <<~EOS - Before you can use these tools you must export some variables to your $SHELL. - - To export the needed variables, add them to your dotfiles. - * On Bash, add them to `~/.bash_profile`. - * On Zsh, add them to `~/.zprofile` instead. - - export JAVA_HOME="$(/usr/libexec/java_home)" - export AWS_ACCESS_KEY="<Your AWS Access ID>" - export AWS_SECRET_KEY="<Your AWS Secret Key>" - export #{home_name}="#{home_value}" - EOS + def standard_instructions(_, _) + odisabled "AmazonWebServicesFormula#standard_instructions", "Formula#caveats" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/global.rb
@@ -3,8 +3,7 @@ module Homebrew def method_missing(method, *args, &block) if instance_methods.include?(method) - odeprecated "#{self}##{method}", "'module_function' or 'def self.#{method}' to convert it to a class method" - return instance_method(method).bind(self).call(*args, &block) + odisabled "#{self}##{method}", "'module_function' or 'def self.#{method}' to convert it to a class method" end super end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/gpg.rb
@@ -4,46 +4,24 @@ module Gpg module_function def executable + odeprecated "Gpg.executable", 'which "gpg"' which "gpg" end def available? + odeprecated "Gpg.available?", 'which "gpg"' File.executable?(executable.to_s) end - def create_test_key(path) - odie "No GPG present to test against!" unless available? - - (path/"batch.gpg").write <<~EOS - Key-Type: RSA - Key-Length: 2048 - Subkey-Type: RSA - Subkey-Length: 2048 - Name-Real: Testing - Name-Email: testing@foo.bar - Expire-Date: 1d - %no-protection - %commit - EOS - system executable, "--batch", "--gen-key", "batch.gpg" + def create_test_key(_) + odeprecated "Gpg.create_test_key" end def cleanup_test_processes! - odie "No GPG present to test against!" unless available? - - gpgconf = Pathname.new(executable).parent/"gpgconf" - - system gpgconf, "--kill", "gpg-agent" - system gpgconf, "--homedir", "keyrings/live", "--kill", - "gpg-agent" + odeprecated "Gpg.cleanup_test_processes!" end - def test(path) - create_test_key(path) - begin - yield - ensure - cleanup_test_processes! - end + def test(_) + odeprecated "Gpg.test" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/hardware.rb
@@ -1,43 +1,35 @@ module Hardware class << self def is_32_bit? - odeprecated "Hardware.is_32_bit?", "Hardware::CPU.is_32_bit?" - !CPU.is_64_bit? + odisabled "Hardware.is_32_bit?", "Hardware::CPU.is_32_bit?" end def is_64_bit? - odeprecated "Hardware.is_64_bit?", "Hardware::CPU.is_64_bit?" - CPU.is_64_bit? + odisabled "Hardware.is_64_bit?", "Hardware::CPU.is_64_bit?" end def bits - odeprecated "Hardware.bits", "Hardware::CPU.bits" - Hardware::CPU.bits + odisabled "Hardware.bits", "Hardware::CPU.bits" end def cpu_type - odeprecated "Hardware.cpu_type", "Hardware::CPU.type" - Hardware::CPU.type + odisabled "Hardware.cpu_type", "Hardware::CPU.type" end def cpu_family - odeprecated "Hardware.cpu_family", "Hardware::CPU.family" - Hardware::CPU.family + odisabled "Hardware.cpu_family", "Hardware::CPU.family" end def intel_family - odeprecated "Hardware.intel_family", "Hardware::CPU.family" - Hardware::CPU.family + odisabled "Hardware.intel_family", "Hardware::CPU.family" end def ppc_family - odeprecated "Hardware.ppc_family", "Hardware::CPU.family" - Hardware::CPU.family + odisabled "Hardware.ppc_family", "Hardware::CPU.family" end def processor_count - odeprecated "Hardware.processor_count", "Hardware::CPU.cores" - Hardware::CPU.cores + odisabled "Hardware.processor_count", "Hardware::CPU.cores" end end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/json.rb
@@ -4,34 +4,16 @@ module Utils module JSON module_function - Error = Class.new(StandardError) - - def load(str) - odeprecated "Utils::JSON.load", "JSON.parse" - ::JSON.parse(str) - rescue ::JSON::ParserError => e - raise Error, e.message + def load(_) + odisabled "Utils::JSON.load", "JSON.parse" end - def dump(obj) - odeprecated "Utils::JSON.dump", "JSON.generate" - ::JSON.generate(obj) + def dump(_) + odisabled "Utils::JSON.dump", "JSON.generate" end - def stringify_keys(obj) - odeprecated "Utils::JSON.stringify_keys" - case obj - when Array - obj.map { |val| stringify_keys(val) } - when Hash - obj.inject({}) do |result, (key, val)| - key = key.respond_to?(:to_s) ? key.to_s : key - val = stringify_keys(val) - result.merge!(key => val) - end - else - obj - end + def stringify_keys(_) + odisabled "Utils::JSON.stringify_keys" end end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/keg.rb
@@ -1,6 +1,5 @@ class Keg def fname - odeprecated "Keg#fname", "Keg#name" - name + odisabled "Keg#fname", "Keg#name" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/macos.rb
@@ -10,142 +10,115 @@ module Mac module_function def xcode_folder - odeprecated "MacOS.xcode_folder", "MacOS::Xcode.folder" - Xcode.folder + odisabled "MacOS.xcode_folder", "MacOS::Xcode.folder" end def xcode_prefix - odeprecated "MacOS.xcode_prefix", "MacOS::Xcode.prefix" - Xcode.prefix + odisabled "MacOS.xcode_prefix", "MacOS::Xcode.prefix" end def xcode_installed? - odeprecated "MacOS.xcode_installed?", "MacOS::Xcode.installed?" - Xcode.installed? + odisabled "MacOS.xcode_installed?", "MacOS::Xcode.installed?" end def xcode_version - odeprecated "MacOS.xcode_version", "MacOS::Xcode.version" - Xcode.version + odisabled "MacOS.xcode_version", "MacOS::Xcode.version" end def clt_installed? - odeprecated "MacOS.clt_installed?", "MacOS::CLT.installed?" - CLT.installed? + odisabled "MacOS.clt_installed?", "MacOS::CLT.installed?" end def clt_version? - odeprecated "MacOS.clt_version?", "MacOS::CLT.version" - CLT.version + odisabled "MacOS.clt_version?", "MacOS::CLT.version" end def x11_installed? - odeprecated "MacOS.x11_installed?", "MacOS::X11.installed?" - X11.installed? + odisabled "MacOS.x11_installed?", "MacOS::X11.installed?" end def x11_prefix - odeprecated "MacOS.x11_prefix", "MacOS::X11.prefix" - X11.prefix + odisabled "MacOS.x11_prefix", "MacOS::X11.prefix" end def leopard? - odeprecated "MacOS.leopard?", "'MacOS.version == :leopard'" - version == :leopard + odisabled "MacOS.leopard?", "'MacOS.version == :leopard'" end def snow_leopard? - odeprecated "MacOS.snow_leopard?", "'MacOS.version >= :snow_leopard'" - version >= :snow_leopard + odisabled "MacOS.snow_leopard?", "'MacOS.version >= :snow_leopard'" end def snow_leopard_or_newer? - odeprecated "MacOS.snow_leopard_or_newer?", "'MacOS.version >= :snow_leopard'" - version >= :snow_leopard + odisabled "MacOS.snow_leopard_or_newer?", "'MacOS.version >= :snow_leopard'" end def lion? - odeprecated "MacOS.lion?", "'MacOS.version >= :lion'" - version >= :lion + odisabled "MacOS.lion?", "'MacOS.version >= :lion'" end def lion_or_newer? - odeprecated "MacOS.lion_or_newer?", "'MacOS.version >= :lion'" - version >= :lion + odisabled "MacOS.lion_or_newer?", "'MacOS.version >= :lion'" end def mountain_lion? - odeprecated "MacOS.mountain_lion?", "'MacOS.version >= :mountain_lion'" - version >= :mountain_lion + odisabled "MacOS.mountain_lion?", "'MacOS.version >= :mountain_lion'" end def mountain_lion_or_newer? - odeprecated "MacOS.mountain_lion_or_newer?", "'MacOS.version >= :mountain_lion'" - version >= :mountain_lion + odisabled "MacOS.mountain_lion_or_newer?", "'MacOS.version >= :mountain_lion'" end def macports_or_fink_installed? - odeprecated "MacOS.macports_or_fink_installed?", "!MacOS.macports_or_fink.empty?" - !macports_or_fink.empty? + odisabled "MacOS.macports_or_fink_installed?", "!MacOS.macports_or_fink.empty?" end - def locate(tool) - odeprecated "MacOS.locate", "DevelopmentTools.locate" - DevelopmentTools.locate(tool) + def locate(_) + odisabled "MacOS.locate", "DevelopmentTools.locate" end def default_cc - odeprecated "MacOS.default_cc", "DevelopmentTools.default_cc" - DevelopmentTools.default_cc + odisabled "MacOS.default_cc", "DevelopmentTools.default_cc" end def default_compiler - odeprecated "MacOS.default_compiler", "DevelopmentTools.default_compiler" - DevelopmentTools.default_compiler + odisabled "MacOS.default_compiler", "DevelopmentTools.default_compiler" end def gcc_40_build_version - odeprecated "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_4_0_build_version" - DevelopmentTools.gcc_4_0_build_version + odisabled "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_4_0_build_version" end def gcc_4_0_build_version - odeprecated "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_4_0_build_version" - DevelopmentTools.gcc_4_0_build_version + odisabled "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_4_0_build_version" end def gcc_42_build_version - odeprecated "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_4_2_build_version" - DevelopmentTools.gcc_4_2_build_version + odisabled "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_4_2_build_version" end def gcc_build_version - odeprecated "MacOS.gcc_build_version", "DevelopmentTools.gcc_4_2_build_version" - DevelopmentTools.gcc_4_2_build_version + odisabled "MacOS.gcc_build_version", "DevelopmentTools.gcc_4_2_build_version" end def llvm_build_version - odeprecated "MacOS.llvm_build_version" + odisabled "MacOS.llvm_build_version" end def clang_version - odeprecated "MacOS.clang_version", "DevelopmentTools.clang_version" - DevelopmentTools.clang_version + odisabled "MacOS.clang_version", "DevelopmentTools.clang_version" end def clang_build_version - odeprecated "MacOS.clang_build_version", "DevelopmentTools.clang_build_version" - DevelopmentTools.clang_build_version + odisabled "MacOS.clang_build_version", "DevelopmentTools.clang_build_version" end def has_apple_developer_tools? - odeprecated "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?" - DevelopmentTools.installed? + odisabled "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?" end def release - odeprecated "MacOS.release", "MacOS.version" - version + odisabled "MacOS.release", "MacOS.version" end end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/pathname.rb
@@ -1,17 +1,9 @@ class Pathname - def cp(dst) - odeprecated "Pathname#cp", "FileUtils.cp" - if file? - FileUtils.cp to_s, dst - else - FileUtils.cp_r to_s, dst - end - dst + def cp(_) + odisabled "Pathname#cp", "FileUtils.cp" end - def chmod_R(perms) - odeprecated "Pathname#chmod_R", "FileUtils.chmod_R" - require "fileutils" - FileUtils.chmod_R perms, to_s + def chmod_R(_) + odisabled "Pathname#chmod_R", "FileUtils.chmod_R" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/software_spec.rb
@@ -1,6 +1,5 @@ class BottleSpecification - def revision(*args) - odeprecated "BottleSpecification.revision", "BottleSpecification.rebuild" - rebuild(*args) + def revision(*) + odisabled "BottleSpecification.revision", "BottleSpecification.rebuild" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/tab.rb
@@ -1,6 +1,5 @@ class Tab < OpenStruct def build_32_bit? - odeprecated "Tab.build_32_bit?" - include?("32-bit") + odisabled "Tab.build_32_bit?" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/tap.rb
@@ -2,7 +2,6 @@ class Tap def core_formula_repository? - odeprecated "Tap#core_formula_repository?", "Tap#core_tap?" - core_tap? + odisabled "Tap#core_formula_repository?", "Tap#core_tap?" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/utils.rb
@@ -2,17 +2,14 @@ module Tty module_function def white - odeprecated "Tty.white", "Tty.reset.bold" - reset.bold + odisabled "Tty.white", "Tty.reset.bold" end end -def puts_columns(items) - odeprecated "puts_columns", "puts Formatter.columns" - puts Formatter.columns(items) +def puts_columns(_) + odisabled "puts_columns", "puts Formatter.columns" end -def plural(n, s = "s") - odeprecated "#plural", "Formatter.pluralize" - (n == 1) ? "" : s +def plural(_, _) + odisabled "#plural", "Formatter.pluralize" end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/version.rb
@@ -1,6 +1,5 @@ class Version - def slice(*args) - odeprecated "Version#slice", "Version#to_s.slice" - to_s.slice(*args) + def slice(*) + odisabled "Version#slice", "Version#to_s.slice" end end
true
Other
Homebrew
brew
2cbce1fbf0a7a361f2be8b3545998f1a36ab3588.json
Add more deprecations, disable some existing ones. Add more `odeprecated` calls to places that have been deprecated for a while in the wild and move some of the existing `odeprecated` calls to be `odisabled` to allow deleting the compatibility code.
Library/Homebrew/compat/xcode.rb
@@ -4,8 +4,7 @@ module Xcode module_function def provides_autotools? - odeprecated "OS::Mac::Xcode.provides_autotools?" - version < "4.3" + odisabled "OS::Mac::Xcode.provides_autotools?" end end end
true
Other
Homebrew
brew
ef82b188f2a3977b56db463ef2f0cb0c8f5727e9.json
Preserve installed_on_request for dependencies Fixes https://github.com/Homebrew/brew/issues/3642.
Library/Homebrew/formula_installer.rb
@@ -553,18 +553,18 @@ def install_dependency(dep, inherited_options) end fi = FormulaInstaller.new(df) - fi.options |= tab.used_options - fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) - fi.options |= inherited_options - fi.options &= df.options - fi.build_from_source = ARGV.build_formula_from_source?(df) - fi.force_bottle = false - fi.verbose = verbose? - fi.quieter = quieter? - fi.debug = debug? - fi.link_keg = keg_was_linked if keg_had_linked_keg + fi.options |= tab.used_options + fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) + fi.options |= inherited_options + fi.options &= df.options + fi.build_from_source = ARGV.build_formula_from_source?(df) + fi.force_bottle = false + fi.verbose = verbose? + fi.quieter = quieter? + fi.debug = debug? + fi.link_keg = keg_was_linked if keg_had_linked_keg fi.installed_as_dependency = true - fi.installed_on_request = false + fi.installed_on_request = df.any_version_installed? && tab.installed_on_request fi.prelude oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}" fi.install
false
Other
Homebrew
brew
cb3410245960383291e2e81eb5f2406c306e83cf.json
bash completion: add null completion where appropriate
completions/bash/brew
@@ -1,5 +1,10 @@ # Bash completion script for brew(1) +# Indicates there are no completions +__brewcomp_null() { + COMPREPLY="" +} + __brewcomp_words_include() { local i=1 while [[ "$i" -lt "$COMP_CWORD" ]] @@ -399,6 +404,7 @@ _brew_search() { return ;; esac + __brewcomp_null } _brew_style() {
false
Other
Homebrew
brew
913ff483f0223f9423798c379375b7972de45f7c.json
Use hgpath instead of "hg" to fix --HEAD hg builds Fixes #3628. With environment filtering, hg was no longer in the path, so make sure to provide the path when calling hg commands. last_commit was the source of the problem in #3628 but I fixed source_modified_time as well. I didn't see any others with this problem.
Library/Homebrew/download_strategy.rb
@@ -1005,11 +1005,11 @@ def stage end def source_modified_time - Time.parse Utils.popen_read("hg", "tip", "--template", "{date|isodate}", "-R", cached_location.to_s) + Time.parse Utils.popen_read(hgpath, "tip", "--template", "{date|isodate}", "-R", cached_location.to_s) end def last_commit - Utils.popen_read("hg", "parent", "--template", "{node|short}", "-R", cached_location.to_s) + Utils.popen_read(hgpath, "parent", "--template", "{node|short}", "-R", cached_location.to_s) end private
false
Other
Homebrew
brew
1bd7d7df04321ebf39cc39d06486768df7245650.json
Use parser 2.4.0.0 This matches the version that supports Ruby 2.3.3 syntax (which is the version we use).
Library/Homebrew/cmd/style.rb
@@ -70,6 +70,7 @@ def check_style_json(files, options = {}) def check_style_impl(files, output_type, options = {}) fix = options[:fix] + Homebrew.install_gem_setup_path! "parser", HOMEBREW_RUBOCOP_PARSER_VERSION, "ruby-parse" Homebrew.install_gem_setup_path! "rubocop", HOMEBREW_RUBOCOP_VERSION require "rubocop" require_relative "../rubocops"
true
Other
Homebrew
brew
1bd7d7df04321ebf39cc39d06486768df7245650.json
Use parser 2.4.0.0 This matches the version that supports Ruby 2.3.3 syntax (which is the version we use).
Library/Homebrew/constants.rb
@@ -2,4 +2,5 @@ # RuboCop version used for `brew style` and `brew cask style` HOMEBREW_RUBOCOP_VERSION = "0.51.0" +HOMEBREW_RUBOCOP_PARSER_VERSION = "2.4.0.0" # for Ruby 2.3.3 HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.15.1" # has to be updated when RuboCop version changes
true
Other
Homebrew
brew
1bd7d7df04321ebf39cc39d06486768df7245650.json
Use parser 2.4.0.0 This matches the version that supports Ruby 2.3.3 syntax (which is the version we use).
Library/Homebrew/test/Gemfile
@@ -3,6 +3,7 @@ source "https://rubygems.org" require_relative "../constants" gem "parallel_tests" +gem "parser", HOMEBREW_RUBOCOP_PARSER_VERSION gem "rspec" gem "rspec-its", require: false gem "rspec-wait", require: false
true
Other
Homebrew
brew
1bd7d7df04321ebf39cc39d06486768df7245650.json
Use parser 2.4.0.0 This matches the version that supports Ruby 2.3.3 syntax (which is the version we use).
Library/Homebrew/test/Gemfile.lock
@@ -58,11 +58,12 @@ PLATFORMS DEPENDENCIES codecov parallel_tests + parser (= 2.4.0.0) rspec rspec-its rspec-wait rubocop (= 0.51.0) simplecov BUNDLED WITH - 1.15.4 + 1.16.0
true
Other
Homebrew
brew
4e29152603ed192e90b83b66f0ad92a676549c43.json
formula_cop: use undeprecated add_offense form.
Library/Homebrew/rubocops/extend/formula_cop.rb
@@ -467,7 +467,7 @@ def formula_tap end def problem(msg) - add_offense(@offensive_node, @offense_source_range, msg) + add_offense(@offensive_node, location: @offense_source_range, message: msg) end private
false
Other
Homebrew
brew
8a419b47426728c03c3835c1aafa72b5ecf56f4f.json
audit: pass explicit sort to handle APFS
Library/Homebrew/dev-cmd/audit.rb
@@ -102,7 +102,7 @@ def audit # Check style in a single batch run up front for performance style_results = check_style_json(files, options) - ff.each do |f| + ff.sort.each do |f| options = { new_formula: new_formula, strict: strict, online: online } options[:style_offenses] = style_results.file_offenses(f.path) fa = FormulaAuditor.new(f, options)
false
Other
Homebrew
brew
60362605dee22d863ade2788650f26ef41d75473.json
scm/git: hide prefix cd failure warning. This may happen with certain checkout configurations (such as on our CI boxes). Also, rename the variables to be clearer about what they reference.
Library/Homebrew/shims/scm/git
@@ -92,11 +92,11 @@ case "$(lowercase "$SCM_FILE")" in ;; esac -brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" && pwd -P)/$SCM_FILE" -safe_exec "$brew_version" "$@" +brew_prefix_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" 2>/dev/null && pwd -P)/$SCM_FILE" +safe_exec "$brew_prefix_version" "$@" -brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" -safe_exec "$brew_version" "$@" +brew_repo_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" +safe_exec "$brew_repo_version" "$@" IFS=$'\n' for path in $(/usr/bin/which -a "$SCM_FILE" 2>/dev/null)
false
Other
Homebrew
brew
7f54c83911a494b592e412d2f99119530cebf458.json
audit: remove unneeded mercurial check.
Library/Homebrew/dev-cmd/audit.rb
@@ -380,8 +380,6 @@ def audit_deps case dep.name when "git" problem "Don't use git as a dependency" - when "mercurial" - problem "Use `depends_on :hg` instead of `depends_on 'mercurial'`" when "gfortran" problem "Use `depends_on :fortran` instead of `depends_on 'gfortran'`" when "ruby"
false
Other
Homebrew
brew
51114139e1c6b442890adec620ffc42975e8fd30.json
formula: require gpg and make it a module.
Library/Homebrew/formula.rb
@@ -13,6 +13,7 @@ require "tap" require "keg" require "migrator" +require "gpg" require "extend/ENV" # A formula provides instructions and metadata for Homebrew to install a piece
true
Other
Homebrew
brew
51114139e1c6b442890adec620ffc42975e8fd30.json
formula: require gpg and make it a module.
Library/Homebrew/gpg.rb
@@ -1,6 +1,6 @@ require "utils" -class Gpg +module Gpg module_function def executable
true
Other
Homebrew
brew
6fe261bc5c1da9cd3629c03fd47810f743d532a4.json
utils: stop debug exploding when zsh is used
Library/Homebrew/utils.rb
@@ -154,6 +154,7 @@ def interactive_shell(f = nil) end if ENV["SHELL"].include?("zsh") && ENV["HOME"].start_with?(HOMEBREW_TEMP.resolved_path.to_s) + FileUtils.mkdir_p ENV["HOME"] FileUtils.touch "#{ENV["HOME"]}/.zshrc" end
false
Other
Homebrew
brew
b40484e87cdf184e8d835dbc589c6f9efbdf2778.json
Revert "Revert "shims/scm/git: Fix the search for brewed git""
Library/Homebrew/shims/scm/git
@@ -92,6 +92,9 @@ case "$(lowercase "$SCM_FILE")" in ;; esac +brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" && pwd -P)/$SCM_FILE" +safe_exec "$brew_version" "$@" + brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" safe_exec "$brew_version" "$@"
false
Other
Homebrew
brew
0dabb464dd082e6df264bc0654e6e32973467893.json
Revert "shims/scm/git: Fix the search for brewed git"
Library/Homebrew/shims/scm/git
@@ -92,9 +92,6 @@ case "$(lowercase "$SCM_FILE")" in ;; esac -brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" && pwd -P)/$SCM_FILE" -safe_exec "$brew_version" "$@" - brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" safe_exec "$brew_version" "$@"
false
Other
Homebrew
brew
5c7d2d0bb5ac51b6d089f96b974d530fe814a678.json
shims/scm/git: Fix the search for brewed git Search for brewed git in both locations: $HOMEBREW_PREFIX/Homebrew/Library/Homebrew/shims/scm/../../../../../bin/git $HOMEBREW_PREFIX/Library/Homebrew/shims/scm/../../../../bin/git
Library/Homebrew/shims/scm/git
@@ -92,6 +92,9 @@ case "$(lowercase "$SCM_FILE")" in ;; esac +brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" && pwd -P)/$SCM_FILE" +safe_exec "$brew_version" "$@" + brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" safe_exec "$brew_version" "$@"
false
Other
Homebrew
brew
cf27117c4638ff37b0803a15500d742fb5edad75.json
brew.sh: Use shims/scm/git for HOMEBREW_VERSION Move the use of git to determine HOMEBREW_VERSION below the definition of the function git.
Library/Homebrew/brew.sh
@@ -19,14 +19,6 @@ case "$*" in --repository|--repo) echo "$HOMEBREW_REPOSITORY"; exit 0 ;; esac -HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)" -HOMEBREW_USER_AGENT_VERSION="$HOMEBREW_VERSION" -if [[ -z "$HOMEBREW_VERSION" ]] -then - HOMEBREW_VERSION=">=1.4.0 (shallow or no git repository)" - HOMEBREW_USER_AGENT_VERSION="1.X.Y" -fi - # A depth of 1 means this command was directly invoked by a user. # Higher depths mean this command was invoked by another Homebrew command. export HOMEBREW_COMMAND_DEPTH=$((HOMEBREW_COMMAND_DEPTH + 1)) @@ -63,6 +55,14 @@ git() { "$HOMEBREW_LIBRARY/Homebrew/shims/scm/git" "$@" } +HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)" +HOMEBREW_USER_AGENT_VERSION="$HOMEBREW_VERSION" +if [[ -z "$HOMEBREW_VERSION" ]] +then + HOMEBREW_VERSION=">=1.4.0 (shallow or no git repository)" + HOMEBREW_USER_AGENT_VERSION="1.X.Y" +fi + if [[ "$HOMEBREW_PREFIX" = "/" || "$HOMEBREW_PREFIX" = "/usr" ]] then # it may work, but I only see pain this route and don't want to support it
false
Other
Homebrew
brew
67c4402634e24400accdb59fa81cde9020dd0386.json
README: add tdsmith to significant contribution list.
README.md
@@ -42,7 +42,7 @@ Homebrew/homebrew-core's lead maintainer is [ilovezfs](https://github.com/ilovez Homebrew's other current maintainers are [Alyssa Ross](https://github.com/alyssais), [Andrew Janke](https://github.com/apjanke), [Alex Dunn](https://github.com/dunn), [FX Coudert](https://github.com/fxcoudert), [Josh Hagins](https://github.com/jawshooah), [JCount](https://github.com/jcount), [Misty De Meo](https://github.com/mistydemeo), [neutric](https://github.com/neutric), [Tomasz Pajor](https://github.com/nijikon), [Markus Reiter](https://github.com/reitermarkus), [Tom Schoonjans](https://github.com/tschoonj), [Uladzislau Shablinski](https://github.com/vladshablinsky) and [William Woodruff](https://github.com/woodruffw). -Former maintainers with significant contributions include [Baptiste Fontaine](https://github.com/bfontaine), [Xu Cheng](https://github.com/xu-cheng), [Martin Afanasjew](https://github.com/UniqMartin), [Dominyk Tiller](https://github.com/DomT4), [Brett Koonce](https://github.com/asparagui), [Charlie Sharpsteen](https://github.com/Sharpie), [Jack Nagel](https://github.com/jacknagel), [Adam Vandenberg](https://github.com/adamv) and Homebrew's creator: [Max Howell](https://github.com/mxcl). +Former maintainers with significant contributions include [Tim Smith](https://github.com/tdsmith), [Baptiste Fontaine](https://github.com/bfontaine), [Xu Cheng](https://github.com/xu-cheng), [Martin Afanasjew](https://github.com/UniqMartin), [Dominyk Tiller](https://github.com/DomT4), [Brett Koonce](https://github.com/asparagui), [Charlie Sharpsteen](https://github.com/Sharpie), [Jack Nagel](https://github.com/jacknagel), [Adam Vandenberg](https://github.com/adamv) and Homebrew's creator: [Max Howell](https://github.com/mxcl). ## Community - [discourse.brew.sh (forum)](https://discourse.brew.sh)
true
Other
Homebrew
brew
67c4402634e24400accdb59fa81cde9020dd0386.json
README: add tdsmith to significant contribution list.
docs/Manpage.md
@@ -1119,7 +1119,7 @@ Homebrew/homebrew-core's lead maintainer is ilovezfs. Homebrew's other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tom Schoonjans, Uladzislau Shablinski and William Woodruff. -Former maintainers with significant contributions include Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew's creator: Max Howell. +Former maintainers with significant contributions include Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew's creator: Max Howell. ## BUGS
true
Other
Homebrew
brew
67c4402634e24400accdb59fa81cde9020dd0386.json
README: add tdsmith to significant contribution list.
manpages/brew.1
@@ -1162,7 +1162,7 @@ Homebrew/homebrew\-core\'s lead maintainer is ilovezfs\. Homebrew\'s other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tom Schoonjans, Uladzislau Shablinski and William Woodruff\. . .P -Former maintainers with significant contributions include Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew\'s creator: Max Howell\. +Former maintainers with significant contributions include Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew\'s creator: Max Howell\. . .SH "BUGS" See our issues on GitHub:
true
Other
Homebrew
brew
e504caa5a367ffa48321aa1f599aed951bde50bf.json
README: remove tdsmith from maintainers.
README.md
@@ -40,7 +40,7 @@ Homebrew's lead maintainer is [Mike McQuaid](https://github.com/mikemcquaid). Homebrew/homebrew-core's lead maintainer is [ilovezfs](https://github.com/ilovezfs). -Homebrew's other current maintainers are [Alyssa Ross](https://github.com/alyssais), [Andrew Janke](https://github.com/apjanke), [Alex Dunn](https://github.com/dunn), [FX Coudert](https://github.com/fxcoudert), [Josh Hagins](https://github.com/jawshooah), [JCount](https://github.com/jcount), [Misty De Meo](https://github.com/mistydemeo), [neutric](https://github.com/neutric), [Tomasz Pajor](https://github.com/nijikon), [Markus Reiter](https://github.com/reitermarkus), [Tim Smith](https://github.com/tdsmith), [Tom Schoonjans](https://github.com/tschoonj), [Uladzislau Shablinski](https://github.com/vladshablinsky) and [William Woodruff](https://github.com/woodruffw). +Homebrew's other current maintainers are [Alyssa Ross](https://github.com/alyssais), [Andrew Janke](https://github.com/apjanke), [Alex Dunn](https://github.com/dunn), [FX Coudert](https://github.com/fxcoudert), [Josh Hagins](https://github.com/jawshooah), [JCount](https://github.com/jcount), [Misty De Meo](https://github.com/mistydemeo), [neutric](https://github.com/neutric), [Tomasz Pajor](https://github.com/nijikon), [Markus Reiter](https://github.com/reitermarkus), [Tom Schoonjans](https://github.com/tschoonj), [Uladzislau Shablinski](https://github.com/vladshablinsky) and [William Woodruff](https://github.com/woodruffw). Former maintainers with significant contributions include [Baptiste Fontaine](https://github.com/bfontaine), [Xu Cheng](https://github.com/xu-cheng), [Martin Afanasjew](https://github.com/UniqMartin), [Dominyk Tiller](https://github.com/DomT4), [Brett Koonce](https://github.com/asparagui), [Charlie Sharpsteen](https://github.com/Sharpie), [Jack Nagel](https://github.com/jacknagel), [Adam Vandenberg](https://github.com/adamv) and Homebrew's creator: [Max Howell](https://github.com/mxcl).
true
Other
Homebrew
brew
e504caa5a367ffa48321aa1f599aed951bde50bf.json
README: remove tdsmith from maintainers.
docs/Manpage.md
@@ -1117,7 +1117,7 @@ Homebrew's lead maintainer is Mike McQuaid. Homebrew/homebrew-core's lead maintainer is ilovezfs. -Homebrew's other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tim Smith, Tom Schoonjans, Uladzislau Shablinski and William Woodruff. +Homebrew's other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tom Schoonjans, Uladzislau Shablinski and William Woodruff. Former maintainers with significant contributions include Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew's creator: Max Howell.
true
Other
Homebrew
brew
e504caa5a367ffa48321aa1f599aed951bde50bf.json
README: remove tdsmith from maintainers.
manpages/brew.1
@@ -1159,7 +1159,7 @@ Homebrew\'s lead maintainer is Mike McQuaid\. Homebrew/homebrew\-core\'s lead maintainer is ilovezfs\. . .P -Homebrew\'s other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tim Smith, Tom Schoonjans, Uladzislau Shablinski and William Woodruff\. +Homebrew\'s other current maintainers are Alyssa Ross, Andrew Janke, Alex Dunn, FX Coudert, Josh Hagins, JCount, Misty De Meo, neutric, Tomasz Pajor, Markus Reiter, Tom Schoonjans, Uladzislau Shablinski and William Woodruff\. . .P Former maintainers with significant contributions include Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Dominyk Tiller, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg and Homebrew\'s creator: Max Howell\.
true
Other
Homebrew
brew
7a8f61c28cb55a1b170c585c2e76e71619999662.json
gist-logs: use full path to brew. This fixes the command with environment filtering enabled.
Library/Homebrew/cmd/gist-logs.rb
@@ -27,7 +27,7 @@ def gistify_logs(f) # Dummy summary file, asciibetically first, to control display title of gist files["# #{f.name} - #{timestamp}.txt"] = { content: brief_build_info(f) } files["00.config.out"] = { content: s.string } - files["00.doctor.out"] = { content: `brew doctor 2>&1` } + files["00.doctor.out"] = { content: Utils.popen_read("#{HOMEBREW_PREFIX}/bin/brew", "doctor", err: :out) } unless f.core_formula? tap = <<~EOS Formula: #{f.name}
false
Other
Homebrew
brew
b085da91c37e3002f6c5eea8e97d5ce0eabb97bf.json
postinstall: add HOMEBREW_PREFIX/{,s}bin to PATH. This avoids the need for workarounds such as: https://github.com/Homebrew/homebrew-core/pull/21688
Library/Homebrew/formula.rb
@@ -956,12 +956,16 @@ def run_post_install @prefix_returns_versioned_prefix = true build = self.build self.build = Tab.for_formula(self) + path_with_prefix = PATH.new(ENV["PATH"]) + .append(HOMEBREW_PREFIX/"bin") + .append(HOMEBREW_PREFIX/"sbin") new_env = { "TMPDIR" => HOMEBREW_TEMP, "TEMP" => HOMEBREW_TEMP, "TMP" => HOMEBREW_TEMP, "HOMEBREW_PATH" => nil, + "PATH" => path_with_prefix, } with_env(new_env) do
false
Other
Homebrew
brew
e5853f4eaac8f4fb64b36f4d7c6ef0de80b53a83.json
New-Maintainer-Checklist: make some tweaks. - there are obligations on becoming a maintainer so firm these up a bit - make clear there's a trial period after being invited to be a maintainer.
docs/New-Maintainer-Checklist.md
@@ -2,19 +2,24 @@ **This is a guide used by existing maintainers to invite new maintainers. You might find it interesting but there's nothing here users should have to know.** -So, there's someone who has been making consistently high-quality contributions to Homebrew for a long time and shown themselves able to make slightly more advanced contributions than just e.g. formula updates? Let's invite them to be a maintainer! +There's someone who has been making consistently high-quality contributions to Homebrew for a long time and shown themselves able to make slightly more advanced contributions than just e.g. formula updates? Let's invite them to be a maintainer! First, send them the invitation email: ``` The Homebrew team and I really appreciate your help on issues, pull requests and your contributions around $THEIR_CONTRIBUTIONS. -We would like to invite you to have commit access. There are no obligations, -but we'd appreciate your continuing help in keeping on top of contributions. -The easiest way to do this is to watch the Homebrew/brew and -Homebrew/homebrew-core repositories on GitHub to provide help and code review -and to pull suitable changes. +We would like to invite you to have commit access and be a Homebrew maintainer. +If you agree to be a maintainer, you should spend a significant proportion of +the time you are working on Homebrew fixing user-reported issues, resolving any +issues that arise from your code in a timely fashion and reviewing user +contributions. You should also be making contributions to Homebrew every month +unless you are ill or on vacation (and please let another maintainer know if +that's the case so we're aware you won't be able to help while you are out). +You will need to watch Homebrew/brew and/or Homebrew/homebrew-core. If you're +no longer able to perform all of these tasks, please continue to contribute to +Homebrew, but we will ask you to step down as a maintainer. A few requests: @@ -36,7 +41,7 @@ A few requests: - please read: - https://docs.brew.sh/Brew-Test-Bot-For-Core-Contributors.html - https://docs.brew.sh/Maintainer-Guidelines.html - - possibly everything else on https://docs.brew.sh + - anything else you haven't read on https://docs.brew.sh How does that sound? @@ -53,8 +58,7 @@ If they accept, follow a few steps to get them set up: - Invite them to the [`machomebrew` private maintainers Slack](https://machomebrew.slack.com/admin/invites) - Invite them to the [`homebrew` private maintainers 1Password](https://homebrew.1password.com/signin) - Invite them to [Google Analytics](https://analytics.google.com/analytics/web/?authuser=1#management/Settings/a76679469w115400090p120682403/%3Fm.page%3DAccountUsers/) -- Add them to [Homebrew's README](https://github.com/Homebrew/brew/edit/master/README.md) -After a few weeks/months with no problems consider making them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people). +After a month-long trial period with no problems make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) and add them to [Homebrew's README](https://github.com/Homebrew/brew/edit/master/README.md). If there are problems, ask them to step down as a maintainer and revoke their access to the above. Now sit back, relax and let the new maintainers handle more of our contributions.
false
Other
Homebrew
brew
d6ebdf1e6253a76cbbe38588a1a16e497afbbfa2.json
python: handle env filtering on pth check Since ENV filtering became the default this has been chucking erroneous warnings from both `brew doctor` and things like `brew install pygobject` about needing to run: ``` echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> /Users/xyz/Library/Python/2.7/lib/python/site-packages/homebrew.pth ``` even though I had Homebrew's `python` installed.
Library/Homebrew/language/python.rb
@@ -35,7 +35,7 @@ def self.reads_brewed_pth_files?(python) probe_file = homebrew_site_packages(version)/"homebrew-pth-probe.pth" begin probe_file.atomic_write("import site; site.homebrew_was_here = True") - quiet_system python, "-c", "import site; assert(site.homebrew_was_here)" + with_homebrew_path { quiet_system python, "-c", "import site; assert(site.homebrew_was_here)" } ensure probe_file.unlink if probe_file.exist? end
false
Other
Homebrew
brew
5f471ee289ae9db2f20b42160a80233f556004e1.json
doctor: tell people not to file issues. This stuff doesn't matter.
Library/Homebrew/cmd/doctor.rb
@@ -1,6 +1,9 @@ #: * `doctor`: #: Check your system for potential problems. Doctor exits with a non-zero status -#: if any problems are found. +#: if any potential problems are found. Please note that these warnings are just +#: used to help the Homebrew maintainers with debugging if you file an issue. If +#: everything you use Homebrew for is working fine: please don't worry or file +#: an issue; just ignore this. # Undocumented options: # -D activates debugging and profiling of the audit methods (not the same as --debug) @@ -46,7 +49,7 @@ def doctor $stderr.puts <<~EOS #{Tty.bold}Please note that these warnings are just used to help the Homebrew maintainers with debugging if you file an issue. If everything you use Homebrew for is - working fine: please don't worry and just ignore them. Thanks!#{Tty.reset} + working fine: please don't worry or file an issue; just ignore this. Thanks!#{Tty.reset} EOS end
true
Other
Homebrew
brew
5f471ee289ae9db2f20b42160a80233f556004e1.json
doctor: tell people not to file issues. This stuff doesn't matter.
docs/Manpage.md
@@ -144,7 +144,10 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note * `doctor`: Check your system for potential problems. Doctor exits with a non-zero status - if any problems are found. + if any potential problems are found. Please note that these warnings are just + used to help the Homebrew maintainers with debugging if you file an issue. If + everything you use Homebrew for is working fine: please don't worry or file + an issue; just ignore this. * `fetch` [`--force`] [`--retry`] [`-v`] [`--devel`|`--HEAD`] [`--deps`] [`--build-from-source`|`--force-bottle`] `formulae`: Download the source packages for the given `formulae`.
true
Other
Homebrew
brew
5f471ee289ae9db2f20b42160a80233f556004e1.json
doctor: tell people not to file issues. This stuff doesn't matter.
manpages/brew.1
@@ -152,7 +152,7 @@ The options \fB\-\-name=\fR\fIname\fR and \fB\-\-version=\fR\fIversion\fR each t . .TP \fBdoctor\fR -Check your system for potential problems\. Doctor exits with a non\-zero status if any problems are found\. +Check your system for potential problems\. Doctor exits with a non\-zero status if any potential problems are found\. Please note that these warnings are just used to help the Homebrew maintainers with debugging if you file an issue\. If everything you use Homebrew for is working fine: please don\'t worry or file an issue; just ignore this\. . .TP \fBfetch\fR [\fB\-\-force\fR] [\fB\-\-retry\fR] [\fB\-v\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] [\fB\-\-deps\fR] [\fB\-\-build\-from\-source\fR|\fB\-\-force\-bottle\fR] \fIformulae\fR
true
Other
Homebrew
brew
55d97500565c02a70feb68dc747d9e4ef673068e.json
caveats: fix fish caveats under env filtering
Library/Homebrew/caveats.rb
@@ -76,7 +76,7 @@ def keg_only_text def function_completion_caveats(shell) return unless keg - return unless which(shell.to_s) + return unless which(shell.to_s, ENV["HOMEBREW_PATH"]) completion_installed = keg.completion_installed?(shell) functions_installed = keg.functions_installed?(shell)
false
Other
Homebrew
brew
1babfb679d1ff94acc778a0588418ae2ae6f3f74.json
bump-formula-pr: improve error messages. - Be clearer about how URLs/tags/revisions/versions are specified in error messages. - Give a better error message if `hub` isn't configured.
Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -180,9 +180,9 @@ def bump_formula_pr elsif new_tag && new_revision false elsif !hash_type - odie "#{formula}: no tag/revision specified!" + odie "#{formula}: no --tag=/--revision= arguments specified!" elsif !new_url - odie "#{formula}: no url specified!" + odie "#{formula}: no --url= argument specified!" else rsrc_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu" @@ -194,15 +194,15 @@ def bump_formula_pr rsrc.download_strategy = CurlDownloadStrategy rsrc.owner = Resource.new(formula.name) rsrc.version = forced_version if forced_version - odie "No version specified!" unless rsrc.version + odie "No --version= argument specified!" unless rsrc.version rsrc_path = rsrc.fetch gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar" gnu_tar_gtar = gnu_tar_gtar_path if gnu_tar_gtar_path.executable? tar = which("gtar") || gnu_tar_gtar || which("tar") if Utils.popen_read(tar, "-tf", rsrc_path) =~ %r{/.*\.} new_hash = rsrc_path.sha256 elsif new_url.include? ".tar" - odie "#{formula}: no url/#{hash_type} specified!" + odie "#{formula}: no --url=/--#{hash_type}= arguments specified!" end end @@ -338,7 +338,13 @@ def bump_formula_pr if reply.to_s.include? "username:" formula.path.atomic_write(backup_file) unless ARGV.dry_run? - odie "Please authentify with hub (eg. by typing 'cd $(brew --repo) && hub issue') and try again." + git_path = "$(brew --repo #{formula.tap})" if formula.tap + git_path ||= formula.path.parent + odie <<~EOS + Retry after configuring hub by running: + hub -C "#{git_path}" fork + Or setting HOMEBREW_GITHUB_TOKEN with at least 'public_repo' scope. + EOS end remote = reply[/remote:? (\S+)/, 1]
false
Other
Homebrew
brew
4fa16c942845c86160264416b451d2d289a1cb17.json
formula_assertions: remove Ruby 2.0 compatibility. We only support Ruby 2.3, now.
Library/Homebrew/formula_assertions.rb
@@ -3,11 +3,6 @@ module Assertions require "test/unit/assertions" include ::Test::Unit::Assertions - # TODO: remove this when we no longer support Ruby 2.0. - unless defined?(Test::Unit::AssertionFailedError) - Test::Unit::AssertionFailedError = MiniTest::Assertion - end - # Returns the output of running cmd, and asserts the exit status def shell_output(cmd, result = 0) ohai cmd
false
Other
Homebrew
brew
301bb1d5dd55415f154271fd8c9fc520b6974c85.json
.simplecov: filter more filters/folders. This is stuff that can never be exercised by our test suite but is exercised by `brew test-bot` so remove it from the coverage checks.
Library/Homebrew/.simplecov
@@ -38,11 +38,22 @@ SimpleCov.start do track_files "#{SimpleCov.root}/{#{subdirs},*.rb}" end + add_filter %r{^/build.rb$} + add_filter %r{^/config.rb$} + add_filter %r{^/constants.rb$} + add_filter %r{^/postinstall.rb$} + add_filter %r{^/test.rb$} add_filter %r{^/compat/} add_filter %r{^/dev-cmd/tests.rb$} add_filter %r{^/test/} add_filter %r{^/vendor/} + require "rbconfig" + add_filter %r{^/os/mac/} unless RbConfig::CONFIG["host_os"].include?("darwin") + unless RbConfig::CONFIG["host_os"].include?("linux") + add_filter %r{^/os/linux/} + end + # Add groups and the proper project name to the output. project_name "Homebrew" add_group "Cask", %r{^/cask/}
false
Other
Homebrew
brew
804393efc466e72ea07b3e38b09d39a5a64d1b78.json
Implement X11Requirement for Linux Move the XQuartz implementation to extend/os/mac/requirements.
Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb
@@ -0,0 +1,42 @@ +require "requirement" + +class XQuartzRequirement < Requirement + include Comparable + + fatal true + cask "xquartz" + download "https://xquartz.macosforge.org" + + env { ENV.x11 } + + def initialize(name = "x11", tags = []) + @name = name + # no-op on version specified as a tag argument + tags.shift if /(\d\.)+\d/ =~ tags.first + super(tags) + end + + def min_version + MacOS::XQuartz.minimum_version + end + + satisfy build_env: false do + next false unless MacOS::XQuartz.installed? + min_version <= MacOS::XQuartz.version + end + + def message + "XQuartz #{min_version} (or newer) is required to install this formula. #{super}" + end + + def <=>(other) + return unless other.is_a? X11Requirement + 0 + end + + def inspect + "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>" + end +end + +X11Requirement = XQuartzRequirement
true
Other
Homebrew
brew
804393efc466e72ea07b3e38b09d39a5a64d1b78.json
Implement X11Requirement for Linux Move the XQuartz implementation to extend/os/mac/requirements.
Library/Homebrew/extend/os/requirements/x11_requirement.rb
@@ -0,0 +1 @@ +require "extend/os/mac/requirements/x11_requirement" if OS.mac?
true
Other
Homebrew
brew
804393efc466e72ea07b3e38b09d39a5a64d1b78.json
Implement X11Requirement for Linux Move the XQuartz implementation to extend/os/mac/requirements.
Library/Homebrew/requirements/x11_requirement.rb
@@ -4,8 +4,6 @@ class X11Requirement < Requirement include Comparable fatal true - cask "xquartz" - download "https://xquartz.macosforge.org" env { ENV.x11 } @@ -17,24 +15,33 @@ def initialize(name = "x11", tags = []) end def min_version - # TODO: remove in https://github.com/Homebrew/brew/pull/3483 - return Version::NULL unless OS.mac? + "1.12.2" + end - MacOS::XQuartz.minimum_version + def min_xdpyinfo_version + "1.3.0" end satisfy build_env: false do - # TODO: remove in https://github.com/Homebrew/brew/pull/3483 - next false unless OS.mac? - - next false unless MacOS::XQuartz.installed? - min_version <= MacOS::XQuartz.version + if which_xorg = which("Xorg") + version = Utils.popen_read which_xorg, "-version", err: :out + next false unless $CHILD_STATUS.success? + version = version[/X Server (\d+\.\d+\.\d+)/, 1] + next false unless version + Version.new(version) >= min_version + elsif which_xdpyinfo = which("xdpyinfo") + version = Utils.popen_read which_xdpyinfo, "-version" + next false unless $CHILD_STATUS.success? + version = version[/^xdpyinfo (\d+\.\d+\.\d+)/, 1] + next false unless version + Version.new(version) >= min_xdpyinfo_version + else + false + end end def message - s = "XQuartz #{min_version} (or newer) is required to install this formula." - s += super - s + "X11 is required to install this formula, either Xorg #{min_version} or xdpyinfo #{min_xdpyinfo_version}, or newer. #{super}" end def <=>(other) @@ -46,3 +53,5 @@ def inspect "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>" end end + +require "extend/os/requirements/x11_requirement"
true
Other
Homebrew
brew
4ca9831da6c1b16f7ea28e32c7c21cf37845c26d.json
formula_installer: handle nil req_dependency. Closes #3538.
Library/Homebrew/formula_installer.rb
@@ -449,7 +449,7 @@ def expand_requirements if (req.optional? || req.recommended?) && build.without?(req) Requirement.prune - elsif req.build? && use_default_formula && req_dependency.installed? + elsif req.build? && use_default_formula && req_dependency&.installed? Requirement.prune elsif install_requirement_formula?(req_dependency, req, install_bottle_for_dependent) deps.unshift(req_dependency)
false
Other
Homebrew
brew
b9cf7b2bbc9439080ad397574381b1e8bf1e1f9a.json
formula_installer: avoid irrelevant build deps. If dependents are already installed ensure their build dependencies (and requirements) don't end up in the dependency/requirement tree. Fixes #3033.
Library/Homebrew/formula_installer.rb
@@ -417,8 +417,9 @@ def check_requirements(req_map) raise UnsatisfiedRequirements, fatals end - def install_requirement_formula?(req_dependency, req, install_bottle_for_dependent) + def install_requirement_formula?(req_dependency, req, dependent, install_bottle_for_dependent) return false unless req_dependency + return false if req.build? && dependent.installed? return true unless req.satisfied? return false if req.run? return true if build_bottle? @@ -451,7 +452,7 @@ def expand_requirements Requirement.prune elsif req.build? && use_default_formula && req_dependency.installed? Requirement.prune - elsif install_requirement_formula?(req_dependency, req, install_bottle_for_dependent) + elsif install_requirement_formula?(req_dependency, req, dependent, install_bottle_for_dependent) deps.unshift(req_dependency) formulae.unshift(req_dependency.to_formula) Requirement.prune @@ -485,6 +486,8 @@ def expand_dependencies(deps) Dependency.prune elsif dep.build? && install_bottle_for?(dependent, build) Dependency.prune + elsif dep.build? && dependent.installed? + Dependency.prune elsif dep.satisfied?(inherited_options[dep.name]) Dependency.skip end
true
Other
Homebrew
brew
b9cf7b2bbc9439080ad397574381b1e8bf1e1f9a.json
formula_installer: avoid irrelevant build deps. If dependents are already installed ensure their build dependencies (and requirements) don't end up in the dependency/requirement tree. Fixes #3033.
Library/Homebrew/test/formula_installer_spec.rb
@@ -140,40 +140,54 @@ class #{Formulary.class_s(dep_name)} < Formula @install_bottle_for_dependent = false allow(@requirement).to receive(:satisfied?).and_return(satisfied?) allow(@requirement).to receive(:satisfied_by_formula?).and_return(satisfied_by_formula?) + allow(@requirement).to receive(:build?).and_return(build?) @dependent = formula do url "foo" version "0.1" depends_on :python3 end + allow(@dependent).to receive(:installed?).and_return(installed?) @fi = FormulaInstaller.new(@dependent) end - subject { @fi.install_requirement_formula?(@requirement_dependency, @requirement, @install_bottle_for_dependent) } + subject { @fi.install_requirement_formula?(@requirement_dependency, @requirement, @dependent, @install_bottle_for_dependent) } context "it returns false when requirement is satisfied" do let(:satisfied?) { true } let(:satisfied_by_formula?) { false } + let(:build?) { false } let(:installed?) { false } it { is_expected.to be false } end context "it returns false when requirement is satisfied but default formula is installed" do let(:satisfied?) { true } let(:satisfied_by_formula?) { false } + let(:build?) { false } + let(:installed?) { false } + it { is_expected.to be false } + end + + context "it returns false when requirement is :build and dependent is installed" do + let(:satisfied?) { false } + let(:satisfied_by_formula?) { false } + let(:build?) { true } let(:installed?) { true } it { is_expected.to be false } end context "it returns true when requirement isn't satisfied" do let(:satisfied?) { false } let(:satisfied_by_formula?) { false } + let(:build?) { false } let(:installed?) { false } it { is_expected.to be true } end context "it returns true when requirement is satisfied by a formula" do let(:satisfied?) { true } let(:satisfied_by_formula?) { true } + let(:build?) { false } let(:installed?) { false } it { is_expected.to be true } end
true
Other
Homebrew
brew
0245b2cfea973c849f3bd7a8d4ab973dc466fe5f.json
formula_installer: fix default formula prune. Only prune it if it's not already installed. Fixes bug with https://github.com/Homebrew/brew/pull/3479 Closes https://github.com/Homebrew/brew/pull/3535.
Library/Homebrew/formula_installer.rb
@@ -449,7 +449,7 @@ def expand_requirements if (req.optional? || req.recommended?) && build.without?(req) Requirement.prune - elsif req.build? && use_default_formula + elsif req.build? && use_default_formula && req_dependency.installed? Requirement.prune elsif install_requirement_formula?(req_dependency, req, install_bottle_for_dependent) deps.unshift(req_dependency)
false
Other
Homebrew
brew
b1328adaa9030a3a7ed6127fe0662b0ae51f270b.json
Use cask.url.user_agent when available
Library/Homebrew/cask/lib/hbc/audit.rb
@@ -278,13 +278,13 @@ def core_formula_url end def check_https_availability - check_url_for_https_availability(cask.url) unless cask.url.to_s.empty? + check_url_for_https_availability(cask.url, user_agents: [cask.url.user_agent]) unless cask.url.to_s.empty? check_url_for_https_availability(cask.appcast) unless cask.appcast.to_s.empty? check_url_for_https_availability(cask.homepage) unless cask.homepage.to_s.empty? end - def check_url_for_https_availability(url_to_check) - problem = curl_check_http_content(url_to_check.to_s) + def check_url_for_https_availability(url_to_check, user_agents: [:default]) + problem = curl_check_http_content(url_to_check.to_s, user_agents: user_agents) add_error problem unless problem.nil? end
false
Other
Homebrew
brew
d79c5ade1abaad0fb1ea88f2b949def8dcfddb81.json
Implement linkage for Linux
Library/Homebrew/extend/pathname.rb
@@ -470,6 +470,10 @@ def inspect end } end + + def mach_o_bundle? + false + end end require "extend/os/pathname"
true
Other
Homebrew
brew
d79c5ade1abaad0fb1ea88f2b949def8dcfddb81.json
Implement linkage for Linux
Library/Homebrew/os/mac/linkage_checker.rb
@@ -23,7 +23,7 @@ def initialize(keg, formula = nil) def check_dylibs @keg.find do |file| next if file.symlink? || file.directory? - next unless file.dylib? || file.mach_o_executable? || file.mach_o_bundle? + next unless file.dylib? || file.binary_executable? || file.mach_o_bundle? # weakly loaded dylibs may not actually exist on disk, so skip them # when checking for broken linkage
true
Other
Homebrew
brew
d79c5ade1abaad0fb1ea88f2b949def8dcfddb81.json
Implement linkage for Linux
Library/Homebrew/os/mac/mach.rb
@@ -103,6 +103,8 @@ def mach_o_executable? mach_data.any? { |m| m.fetch(:type) == :executable } end + alias binary_executable? mach_o_executable? + # @private def mach_o_bundle? mach_data.any? { |m| m.fetch(:type) == :bundle }
true
Other
Homebrew
brew
8b9ac2b2e030a70bd6ee99ac8b0c9b9f92fd621b.json
x11_requirement: remove custom minimum version. This isn't desired or needed. Ensure older code still works, though.
Library/Homebrew/os/mac/xquartz.rb
@@ -51,6 +51,15 @@ def detect_version end end + def minimum_version + version = guess_system_version + return version unless version == "dunno" + + # Update this a little later than latest_version to give people + # time to upgrade. + "2.7.11" + end + # https://xquartz.macosforge.org/trac/wiki # https://xquartz.macosforge.org/trac/wiki/Releases def latest_version
true
Other
Homebrew
brew
8b9ac2b2e030a70bd6ee99ac8b0c9b9f92fd621b.json
x11_requirement: remove custom minimum version. This isn't desired or needed. Ensure older code still works, though.
Library/Homebrew/requirements/x11_requirement.rb
@@ -2,7 +2,6 @@ class X11Requirement < Requirement include Comparable - attr_reader :min_version fatal true cask "xquartz" @@ -12,36 +11,38 @@ class X11Requirement < Requirement def initialize(name = "x11", tags = []) @name = name - if /(\d\.)+\d/ =~ tags.first - @min_version = Version.create(tags.shift) - @min_version_string = " #{@min_version}" - else - @min_version = Version.create("0.0.0") - @min_version_string = "" - end + # no-op on version specified as a tag argument + tags.shift if /(\d\.)+\d/ =~ tags.first super(tags) end + def min_version + # TODO: remove in https://github.com/Homebrew/brew/pull/3483 + return Version::NULL unless OS.mac? + + MacOS::XQuartz.minimum_version + end + satisfy build_env: false do - MacOS::XQuartz.installed? && min_version <= Version.create(MacOS::XQuartz.version) + # TODO: remove in https://github.com/Homebrew/brew/pull/3483 + next false unless OS.mac? + + next false unless MacOS::XQuartz.installed? + min_version <= MacOS::XQuartz.version end def message - s = "XQuartz#{@min_version_string} is required to install this formula." + s = "XQuartz #{min_version} (or newer) is required to install this formula." s += super s end def <=>(other) return unless other.is_a? X11Requirement - min_version <=> other.min_version - end - - def eql?(other) - super && min_version == other.min_version + 0 end def inspect - "#<#{self.class.name}: #{name.inspect} #{tags.inspect} min_version=#{min_version}>" + "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>" end end
true
Other
Homebrew
brew
8b9ac2b2e030a70bd6ee99ac8b0c9b9f92fd621b.json
x11_requirement: remove custom minimum version. This isn't desired or needed. Ensure older code still works, though.
Library/Homebrew/test/dependency_collector_spec.rb
@@ -49,20 +49,20 @@ def find_requirement(klass) expect(find_requirement(X11Requirement).tags).to be_empty end - specify "x11 with minimum version" do + specify "x11 with (ignored) minimum version" do subject.add x11: "2.5.1" - expect(find_requirement(X11Requirement).min_version.to_s).to eq("2.5.1") + expect(find_requirement(X11Requirement).min_version.to_s).to_not eq("2.5.1") end specify "x11 with tag" do subject.add x11: :optional expect(find_requirement(X11Requirement)).to be_optional end - specify "x11 with minimum version and tag" do + specify "x11 with (ignored) minimum version and tag" do subject.add x11: ["2.5.1", :optional] dep = find_requirement(X11Requirement) - expect(dep.min_version.to_s).to eq("2.5.1") + expect(dep.min_version.to_s).to_not eq("2.5.1") expect(dep).to be_optional end
true