From 359ae379d3e1d30fad047f2453406127df5da668 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 12 Dec 2023 16:36:08 +0000 Subject: [PATCH] docs: updates from Homebrew/brew --- docs/Homebrew.html | 140 ++--- docs/Homebrew/Cleanup.html | 2 +- docs/Homebrew/Diagnostic/Checks.html | 372 ++++++------- docs/SystemConfig.html | 285 ++++------ docs/method_list.html | 756 +++++++++++++-------------- 5 files changed, 659 insertions(+), 896 deletions(-) diff --git a/docs/Homebrew.html b/docs/Homebrew.html index 4c7b2f76c..a1cda9034 100644 --- a/docs/Homebrew.html +++ b/docs/Homebrew.html @@ -21359,30 +21359,16 @@
-215 -216 -217 -218 -219 -220 -221 -222 -223 -224 -225+207 +208 +209 +210
# File 'utils/gems.rb', line 215 +# File 'utils/gems.rb', line 207 def forget_user_gem_groups! - if GEM_GROUPS_FILE.exist? - GEM_GROUPS_FILE.truncate(0) - elsif RUBY_VERSION < "2.7" - # Backwards compatibility. This else block can be removed by the end of 2023. - # We will not support this in Ruby >=2.7. - require "settings" - Homebrew::Settings.delete(:gemgroups) - end + GEM_GROUPS_FILE.truncate(0) if GEM_GROUPS_FILE.exist? @user_gem_groups = [] end
+220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 235 236 237 @@ -25818,34 +25819,10 @@+347344 345 346 -347 -348 -349 -350 -351 -352 -353 -354 -355 -356 -357 -358 -359 -360 -361 -362 -363 -364 -365 -366 -367 -368 -369 -370 -371
# File 'utils/gems.rb', line 235 +# File 'utils/gems.rb', line 220 def install_bundler_gems!(only_warn_on_failure: false, setup_path: true, groups: []) old_path = ENV.fetch("PATH", nil) @@ -25854,7 +25831,6 @@old_bundle_gemfile = ENV.fetch("BUNDLE_GEMFILE", nil) old_bundle_with = ENV.fetch("BUNDLE_WITH", nil) old_bundle_frozen = ENV.fetch("BUNDLE_FROZEN", nil) - old_sdkroot = ENV.fetch("SDKROOT", nil) invalid_groups = groups - valid_gem_groups raise ArgumentError, "Invalid gem groups: #{invalid_groups.join(", ")}" unless invalid_groups.empty? @@ -25882,13 +25858,6 @@
ENV["BUNDLE_WITH"] = groups.join(" ") ENV["BUNDLE_FROZEN"] = "true" - # System Ruby does not pick up the correct SDK by default. - if ENV["HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH"] - macos_major = ENV.fetch("HOMEBREW_MACOS_VERSION").partition(".").first - sdkroot = "/Library/Developer/CommandLineTools/SDKs/MacOSX#{macos_major}.sdk" - ENV["SDKROOT"] = sdkroot if Dir.exist?(sdkroot) - end - if @bundle_installed_groups != groups bundle = File.join(find_in_path("bundle"), "bundle") bundle_check_output = `#{bundle} check 2>&1` @@ -25982,7 +25951,6 @@
ENV["BUNDLE_WITH"] = old_bundle_with ENV["BUNDLE_FROZEN"] = old_bundle_frozen end - ENV["SDKROOT"] = old_sdkroot end
# File 'utils/gems.rb', line 177 @@ -45273,14 +45233,6 @@def user_gem_groups @user_gem_groups ||= if GEM_GROUPS_FILE.exist? GEM_GROUPS_FILE.readlines(chomp: true) - elsif RUBY_VERSION < "2.7" - # Backwards compatibility. This elsif block removed by the end of 2023. - # We will not support this in Ruby >=2.7. - require "settings" - groups = Homebrew::Settings.read(:gemgroups)&.split(";") || [] - write_user_gem_groups(groups) - Homebrew::Settings.delete(:gemgroups) - groups else [] end @@ -45305,16 +45257,16 @@
-227 -228 -229 -230 -231 -232 -233+212 +213 +214 +215 +216 +217 +218
# File 'utils/gems.rb', line 227 +# File 'utils/gems.rb', line 212 def user_vendor_version @user_vendor_version ||= if VENDOR_VERSION_FILE.exist? @@ -45688,10 +45640,7 @@+9087 88 89 -90 -91 -92 -93
# File 'dev-cmd/vendor-gems.rb', line 29 @@ -45703,9 +45652,6 @@ENV["BUNDLE_WITH"] = Homebrew.valid_gem_groups.join(":") - # System Ruby does not pick up the correct SDK by default. - ENV["SDKROOT"] = MacOS.sdk_path if ENV["HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH"] - ohai "cd #{HOMEBREW_LIBRARY_PATH}" HOMEBREW_LIBRARY_PATH.cd do if args.update @@ -46172,6 +46118,14 @@
+185 +186 +187 +188 +189 +190 +191 +192 193 194 195 @@ -46184,18 +46138,10 @@+205202 203 204 -205 -206 -207 -208 -209 -210 -211 -212 -213
# File 'utils/gems.rb', line 193 +# File 'utils/gems.rb', line 185 def write_user_gem_groups(groups) return if @user_gem_groups == groups && GEM_GROUPS_FILE.exist? diff --git a/docs/Homebrew/Cleanup.html b/docs/Homebrew/Cleanup.html index 93c66ee32..1e016eca9 100644 --- a/docs/Homebrew/Cleanup.html +++ b/docs/Homebrew/Cleanup.html @@ -3682,7 +3682,7 @@def use_system_ruby? return false if Homebrew::EnvConfig.force_vendor_ruby? - ENV["HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH"].present? + Homebrew::EnvConfig.developer? && ENV["HOMEBREW_USE_RUBY_FROM_PATH"].present? end
+429 +430 +431 +432 +433 +434 +435 +436 +437 +438 +439 +440 +441 442 443 444 @@ -2871,23 +2862,10 @@+458455 456 457 -458 -459 -460 -461 -462 -463 -464 -465 -466 -467 -468 -469 -470 -471
# File 'extend/os/mac/diagnostic.rb', line 442 +# File 'extend/os/mac/diagnostic.rb', line 429 def check_broken_sdks locator = MacOS.sdk_locator @@ -3822,20 +3800,20 @@
-400 -401 -402 -403 -404 -405 -406 -407 -408 -409 -410+387 +388 +389 +390 +391 +392 +393 +394 +395 +396 +397
# File 'extend/os/mac/diagnostic.rb', line 400 +# File 'extend/os/mac/diagnostic.rb', line 387 def check_deprecated_caskroom_taps tapped_caskroom_taps = Tap.select { |t| t.user == "caskroom" || t.name == "phinze/cask" } @@ -4063,6 +4041,19 @@
+256 +257 +258 +259 +260 +261 +262 +263 +264 +265 +266 +267 +268 269 270 271 @@ -4081,23 +4072,10 @@+287284 285 286 -287 -288 -289 -290 -291 -292 -293 -294 -295 -296 -297 -298 -299 -300
# File 'extend/os/mac/diagnostic.rb', line 269 +# File 'extend/os/mac/diagnostic.rb', line 256 def check_filesystem_case_sensitive dirs_to_check = [ @@ -4313,6 +4291,19 @@
+289 +290 +291 +292 +293 +294 +295 +296 +297 +298 +299 +300 +301 302 303 304 @@ -4333,23 +4324,10 @@+322319 320 321 -322 -323 -324 -325 -326 -327 -328 -329 -330 -331 -332 -333 -334 -335
# File 'extend/os/mac/diagnostic.rb', line 302 +# File 'extend/os/mac/diagnostic.rb', line 289 def check_for_gettext find_relative_paths("lib/libgettextlib.dylib", @@ -4464,6 +4442,19 @@
+324 +325 +326 +327 +328 +329 +330 +331 +332 +333 +334 +335 +336 337 338 339 @@ -4479,23 +4470,10 @@+352349 350 351 -352 -353 -354 -355 -356 -357 -358 -359 -360 -361 -362 -363 -364 -365
# File 'extend/os/mac/diagnostic.rb', line 337 +# File 'extend/os/mac/diagnostic.rb', line 324 def check_for_iconv find_relative_paths("lib/libiconv.dylib", "include/iconv.h") @@ -4601,6 +4579,19 @@
+354 +355 +356 +357 +358 +359 +360 +361 +362 +363 +364 +365 +366 367 368 369 @@ -4619,23 +4610,10 @@+385382 383 384 -385 -386 -387 -388 -389 -390 -391 -392 -393 -394 -395 -396 -397 -398
# File 'extend/os/mac/diagnostic.rb', line 367 +# File 'extend/os/mac/diagnostic.rb', line 354 def check_for_multiple_volumes return unless HOMEBREW_CELLAR.exist? @@ -6342,6 +6320,19 @@
+399 +400 +401 +402 +403 +404 +405 +406 +407 +408 +409 +410 +411 412 413 414 @@ -6354,23 +6345,10 @@+424421 422 423 -424 -425 -426 -427 -428 -429 -430 -431 -432 -433 -434 -435 -436 -437
# File 'extend/os/mac/diagnostic.rb', line 412 +# File 'extend/os/mac/diagnostic.rb', line 399 def check_if_supported_sdk_available return unless DevelopmentTools.installed? @@ -6709,54 +6687,6 @@
- - - -207 -208 -209 -210 -211 -212 -213 -214 -215 -216 -217 -218- |
-
- # File 'extend/os/mac/diagnostic.rb', line 207 - -def check_ruby_version - return unless ENV["HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH"] - return if RUBY_VERSION == HOMEBREW_REQUIRED_RUBY_VERSION - return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease? - - <<~EOS - Ruby version #{RUBY_VERSION} is unsupported on macOS #{MacOS.version}. Homebrew - is developed and tested on Ruby #{HOMEBREW_REQUIRED_RUBY_VERSION}, and may not work correctly - on other Rubies. Patches are accepted as long as they don't cause breakage - on supported Rubies. - EOS -end- |
-
-256 -257 -258 -259 -260 -261 -262 -263 -264 -265 -266 -267+243 +244 +245 +246 +247 +248 +249 +250 +251 +252 +253 +254
# File 'extend/os/mac/diagnostic.rb', line 256 +# File 'extend/os/mac/diagnostic.rb', line 243 def check_xcode_license_approved # If the user installs Xcode-only, they have to approve the @@ -7465,19 +7395,19 @@
-220 -221 -222 -223 -224 -225 -226 -227 -228 -229+207 +208 +209 +210 +211 +212 +213 +214 +215 +216
# File 'extend/os/mac/diagnostic.rb', line 220 +# File 'extend/os/mac/diagnostic.rb', line 207 def check_xcode_prefix prefix = MacOS::Xcode.prefix @@ -7509,19 +7439,19 @@
-231 -232 -233 -234 -235 -236 -237 -238 -239 -240+218 +219 +220 +221 +222 +223 +224 +225 +226 +227
# File 'extend/os/mac/diagnostic.rb', line 231 +# File 'extend/os/mac/diagnostic.rb', line 218 def check_xcode_prefix_exists prefix = MacOS::Xcode.prefix @@ -7553,22 +7483,22 @@
-242 -243 -244 -245 -246 -247 -248 -249 -250 -251 -252 -253 -254+229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 +241
# File 'extend/os/mac/diagnostic.rb', line 242 +# File 'extend/os/mac/diagnostic.rb', line 229 def check_xcode_select_path return if MacOS::CLT.installed? diff --git a/docs/SystemConfig.html b/docs/SystemConfig.html index d798d2800..f7c7c6023 100644 --- a/docs/SystemConfig.html +++ b/docs/SystemConfig.html @@ -397,28 +397,6 @@- - -
-- - - - - -
-37 -38 -39+28 +29 +30
# File 'extend/os/mac/system_config.rb', line 37 +# File 'extend/os/mac/system_config.rb', line 28 def clt @clt ||= MacOS::CLT.version if MacOS::CLT.installed? @@ -1025,23 +1003,23 @@
+131 +132 +133 +134 +135 +136 +137 +138 +139 +140 141 142 143 -144 -145 -146 -147 -148 -149 -150 -151 -152 -153 -154+144
# File 'system_config.rb', line 141 +# File 'system_config.rb', line 131 def core_tap_config(out = $stdout) if CoreTap.instance.installed? @@ -1274,15 +1252,15 @@
-22 -23 -24 -25 -26 -27+13 +14 +15 +16 +17 +18
# File 'extend/os/mac/system_config.rb', line 22 +# File 'extend/os/mac/system_config.rb', line 13 def describe_clang return "N/A" if clang.null? @@ -1338,19 +1316,19 @@
-130 -131 -132 -133 -134 -135 -136 -137 -138 -139+120 +121 +122 +123 +124 +125 +126 +127 +128 +129
# File 'system_config.rb', line 130 +# File 'system_config.rb', line 120 def describe_curl out, = system_command(Utils::Curl.curl_executable, args: ["--version"], verbose: false) @@ -1410,14 +1388,14 @@
-123 -124 -125 -126 -127+113 +114 +115 +116 +117
# File 'system_config.rb', line 123 +# File 'system_config.rb', line 113 def describe_git return "N/A" unless Utils::Git.available? @@ -1438,71 +1416,6 @@-
--- - - --
- - - -12 -13 -14 -15 -16 -17 -18 -19 -20- |
-
- # File 'extend/os/mac/system_config.rb', line 12 - -def describe_homebrew_ruby - s = describe_homebrew_ruby_version - - if RUBY_PATH.to_s.match?(%r{^/System/Library/Frameworks/Ruby\.framework/Versions/[12]\.[089]/usr/bin/ruby}) - s - else - "#{s} => #{RUBY_PATH}" - end -end- |
-
@@ -1539,23 +1452,13 @@
# File 'system_config.rb', line 96 -def describe_homebrew_ruby_version - case RUBY_VERSION - when /^1\.[89]/, /^2\.0/ - "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}" - else - RUBY_VERSION - end +def describe_homebrew_ruby + "#{RUBY_VERSION} => #{RUBY_PATH}" end
-41 -42 -43 -44 -45 -46 -47+32 +33 +34 +35 +36 +37 +38
# File 'extend/os/mac/system_config.rb', line 41 +# File 'extend/os/mac/system_config.rb', line 32 def dump_verbose_config(out = $stdout) dump_generic_verbose_config(out) @@ -1759,14 +1662,14 @@
-111 -112 -113 -114 -115+101 +102 +103 +104 +105
# File 'system_config.rb', line 111 +# File 'system_config.rb', line 101 def hardware return if Hardware::CPU.type == :dunno @@ -1866,15 +1769,15 @@
-156 -157 -158 -159 -160 -161+146 +147 +148 +149 +150 +151
# File 'system_config.rb', line 156 +# File 'system_config.rb', line 146 def homebrew_config(out = $stdout) out.puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}" @@ -1917,6 +1820,16 @@
+153 +154 +155 +156 +157 +158 +159 +160 +161 +162 163 164 165 @@ -1936,20 +1849,10 @@+182179 180 181 -182 -183 -184 -185 -186 -187 -188 -189 -190 -191 -192
# File 'system_config.rb', line 163 +# File 'system_config.rb', line 153 def homebrew_env_config(out = $stdout) out.puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}" @@ -2182,14 +2085,14 @@
-194 -195 -196 -197 -198+184 +185 +186 +187 +188
# File 'system_config.rb', line 194 +# File 'system_config.rb', line 184 def host_software_config(out = $stdout) out.puts "Clang: #{describe_clang}" @@ -2244,12 +2147,12 @@
-118 -119 -120+108 +109 +110
# File 'system_config.rb', line 118 +# File 'system_config.rb', line 108 def kernel `uname -m`.chomp @@ -2390,16 +2293,16 @@
-29 -30 -31 -32 -33 -34 -35+20 +21 +22 +23 +24 +25 +26
# File 'extend/os/mac/system_config.rb', line 29 +# File 'extend/os/mac/system_config.rb', line 20 def xcode @xcode ||= if MacOS::Xcode.installed? diff --git a/docs/method_list.html b/docs/method_list.html index 1f161ddd7..63cb2b070 100644 --- a/docs/method_list.html +++ b/docs/method_list.html @@ -5373,14 +5373,6 @@Method List