Merge pull request #16463 from dduugg/no-active-support

Remove ActiveSupport from runtime

.gitignore

@@ -53,25 +53,6 @@
 !**/vendor/bundle/ruby/*/gems/*/lib
 !**/vendor/bundle/ruby/*/gems/addressable-*/data
 !**/vendor/bundle/ruby/*/gems/public_suffix-*/data
-!**/vendor/bundle/ruby/*/gems/rubocop-performance-*/config
-!**/vendor/bundle/ruby/*/gems/rubocop-rails-*/config
-!**/vendor/bundle/ruby/*/gems/rubocop-rspec-*/config
-!**/vendor/bundle/ruby/*/gems/rubocop-sorbet-*/config
-
-# Ignore activesupport, except the ones we need.
-**/vendor/bundle/ruby/*/gems/activesupport-*/lib/**/*
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/*/
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/array/access.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/enumerable.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/file/atomic.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/hash/deep_merge.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/hash/deep_transform_values.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/hash/keys.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/object/deep_dup.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/object/duplicable.rb
-!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/string/exclude.rb
 
 # Ignore partially included gems where we don't need all files
 **/vendor/gems/mechanize-*/.*
@@ -89,6 +70,7 @@
 **/vendor/gems/mechanize-*/test/
 
 # Ignore dependencies we don't wish to vendor
+**/vendor/bundle/ruby/*/gems/activesupport-*/
 **/vendor/bundle/ruby/*/gems/ast-*/
 **/vendor/bundle/ruby/*/gems/bootsnap-*/
 **/vendor/bundle/ruby/*/gems/bundler-*/

Library/Homebrew/cask/artifact/abstract_artifact.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "attrable"
-require "active_support/core_ext/object/deep_dup"
+require "extend/object/deep_dup"
 
 module Cask
   module Artifact

Library/Homebrew/cask/artifact/abstract_uninstall.rb

@@ -6,6 +6,7 @@
 require "utils/user"
 require "cask/artifact/abstract_artifact"
 require "cask/pkg"
+require "extend/hash/keys"
 
 module Cask
   module Artifact

Library/Homebrew/cask/artifact/installer.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_artifact"
+require "extend/hash/keys"
 
 module Cask
   module Artifact

Library/Homebrew/cask/artifact/pkg.rb

@@ -5,6 +5,7 @@
 
 require "utils/user"
 require "cask/artifact/abstract_artifact"
+require "extend/hash/keys"
 
 module Cask
   module Artifact

Library/Homebrew/cask/artifact/relocated.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_artifact"
+require "extend/hash/keys"
 
 module Cask
   module Artifact

Library/Homebrew/cask/cask_loader.rb

@@ -5,6 +5,7 @@
 require "cask/cask"
 require "uri"
 require "utils/curl"
+require "extend/hash/keys"
 
 module Cask
   # Loads a cask from various sources.

Library/Homebrew/cask/config.rb

@@ -5,6 +5,7 @@
 
 require "lazy_object"
 require "locale"
+require "extend/hash/keys"
 
 module Cask
   # Configuration for installing casks.

Library/Homebrew/cask/dsl/conflicts_with.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "delegate"
+require "extend/hash/keys"
 
 module Cask
   class DSL

Library/Homebrew/cli/parser.rb

@@ -126,9 +126,9 @@ def initialize(&block)
         # Filter out Sorbet runtime type checking method calls.
         cmd_location = T.must(caller_locations).select do |location|
           T.must(location.path).exclude?("/gems/sorbet-runtime-")
-        end.second
-        @command_name = cmd_location.label.chomp("_args").tr("_", "-")
-        @is_dev_cmd = cmd_location.absolute_path.start_with?(Commands::HOMEBREW_DEV_CMD_PATH)
+        end.fetch(1)
+        @command_name = T.must(cmd_location.label).chomp("_args").tr("_", "-")
+        @is_dev_cmd = T.must(cmd_location.absolute_path).start_with?(Commands::HOMEBREW_DEV_CMD_PATH)
 
         @constraints = []
         @conflicts = []

Library/Homebrew/dev-cmd/bottle.rb

@@ -11,6 +11,7 @@
 require "erb"
 require "utils/gzip"
 require "api"
+require "extend/hash/deep_merge"
 
 BOTTLE_ERB = <<-EOS.freeze
   bottle do

Library/Homebrew/dev-cmd/pr-upload.rb

@@ -5,6 +5,7 @@
 require "formula"
 require "github_packages"
 require "github_releases"
+require "extend/hash/deep_merge"
 
 module Homebrew
   module_function

Library/Homebrew/download_strategy.rb

@@ -360,7 +360,7 @@ def parse_basename(url, search_query: true)
       end
 
       if search_query && (uri_query = uri.query.presence)
-        components[:query] = URI.decode_www_form(uri_query).map(&:second)
+        components[:query] = URI.decode_www_form(uri_query).map { _2 }
       end
     else
       components[:path] = [url]

Library/Homebrew/extend/array.rb

@@ -1,7 +1,27 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 class Array
+  # Equal to <tt>self[1]</tt>.
+  #
+  #   %w( a b c d e ).second # => "b"
+  def second = self[1]
+
+  # Equal to <tt>self[2]</tt>.
+  #
+  #   %w( a b c d e ).third # => "c"
+  def third = self[2]
+
+  # Equal to <tt>self[3]</tt>.
+  #
+  #   %w( a b c d e ).fourth # => "d"
+  def fourth = self[3]
+
+  # Equal to <tt>self[4]</tt>.
+  #
+  #   %w( a b c d e ).fifth # => "e"
+  def fifth = self[4]
+
   # Converts the array to a comma-separated sentence where the last element is
   # joined by the connector word.
   #
@@ -48,6 +68,7 @@ class Array
   # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
   # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  sig { params(words_connector: String, two_words_connector: String, last_word_connector: String).returns(String) }
   def to_sentence(words_connector: ", ", two_words_connector: " and ", last_word_connector: " and ")
     case length
     when 0

Library/Homebrew/extend/array.rbi

@@ -0,0 +1,15 @@
+# typed: strict
+
+class Array
+  sig { returns(T.nilable(Elem)) }
+  def second; end
+
+  sig { returns(T.nilable(Elem)) }
+  def third; end
+
+  sig { returns(T.nilable(Elem)) }
+  def fourth; end
+
+  sig { returns(T.nilable(Elem)) }
+  def fifth; end
+end

Library/Homebrew/extend/enumerable.rb

@@ -0,0 +1,30 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Enumerable
+  # The negative of the <tt>Enumerable#include?</tt>. Returns +true+ if the
+  # collection does not include the object.
+  sig { params(object: T.untyped).returns(T::Boolean) }
+  def exclude?(object) = !include?(object)
+
+  # Returns a new +Array+ without the blank items.
+  # Uses Object#blank? for determining if an item is blank.
+  #
+  #   [1, "", nil, 2, " ", [], {}, false, true].compact_blank
+  #   # =>  [1, 2, true]
+  #
+  #   Set.new([nil, "", 1, false]).compact_blank
+  #   # => [1]
+  #
+  # When called on a +Hash+, returns a new +Hash+ without the blank values.
+  #
+  #   { a: "", b: 1, c: nil, d: [], e: false, f: true }.compact_blank
+  #   # => { b: 1, f: true }
+  sig { returns(T.self_type) }
+  def compact_blank = T.unsafe(self).reject(&:blank?)
+end
+
+class Hash
+  # Hash#reject has its own definition, so this needs one too.
+  def compact_blank = reject { |_k, v| T.unsafe(v).blank? }
+end

Library/Homebrew/extend/enumerable.rbi

@@ -0,0 +1,6 @@
+# typed: strict
+
+class Hash
+  sig { returns(T::Hash[Hash::K, Hash::V]) }
+  def compact_blank; end
+end

Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/activesupport-6.1.7.6/lib/active_support/core_ext/file/atomic.rb → Library/Homebrew/extend/file/atomic.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "fileutils"
@@ -18,7 +19,14 @@ class File
   #   File.atomic_write('/data/something.important', '/data/tmp') do |file|
   #     file.write('hello')
   #   end
-  def self.atomic_write(file_name, temp_dir = dirname(file_name))
+  sig {
+    type_parameters(:out).params(
+      file_name: T.any(Pathname, String),
+      temp_dir:  String,
+      _block:    T.proc.params(arg0: Tempfile).returns(T.type_parameter(:out)),
+    ).returns(T.type_parameter(:out))
+  }
+  def self.atomic_write(file_name, temp_dir = dirname(file_name), &_block)
     require "tempfile" unless defined?(Tempfile)
 
     Tempfile.open(".#{basename(file_name)}", temp_dir) do |temp_file|
@@ -38,32 +46,35 @@ def self.atomic_write(file_name, temp_dir = dirname(file_name))
       if old_stat
         # Set correct permissions on new file
         begin
-          chown(old_stat.uid, old_stat.gid, temp_file.path)
+          chown(old_stat.uid, old_stat.gid, T.must(temp_file.path))
           # This operation will affect filesystem ACL's
-          chmod(old_stat.mode, temp_file.path)
+          chmod(old_stat.mode, T.must(temp_file.path))
         rescue Errno::EPERM, Errno::EACCES
           # Changing file ownership failed, moving on.
         end
       end
 
       # Overwrite original file with temp file
-      rename(temp_file.path, file_name)
+      rename(T.must(temp_file.path), file_name)
       return_val
     end
   end
 
   # Private utility method.
-  def self.probe_stat_in(dir) #:nodoc:
+  sig { params(dir: String).returns(T.nilable(File::Stat)) }
+  private_class_method def self.probe_stat_in(dir) # :nodoc:
     basename = [
       ".permissions_check",
       Thread.current.object_id,
       Process.pid,
-      rand(1000000)
+      rand(1_000_000),
     ].join(".")
 
     file_name = join(dir, basename)
     FileUtils.touch(file_name)
     stat(file_name)
+  rescue Errno::ENOENT
+    file_name = nil
   ensure
     FileUtils.rm_f(file_name) if file_name
   end

Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/activesupport-6.1.7.6/lib/active_support/core_ext/hash/deep_merge.rb → Library/Homebrew/extend/hash/deep_merge.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 class Hash
@@ -22,10 +23,10 @@ def deep_merge(other_hash, &block)
   # Same as +deep_merge+, but modifies +self+.
   def deep_merge!(other_hash, &block)
     merge!(other_hash) do |key, this_val, other_val|
-      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
-        this_val.deep_merge(other_val, &block)
-      elsif block_given?
-        block.call(key, this_val, other_val)
+      if T.unsafe(this_val).is_a?(Hash) && other_val.is_a?(Hash)
+        T.unsafe(this_val).deep_merge(other_val, &block)
+      elsif block
+        yield(key, this_val, other_val)
       else
         other_val
       end

Library/Homebrew/extend/hash/deep_merge.rbi

@@ -0,0 +1,20 @@
+# typed: strict
+# frozen_string_literal: true
+
+class Hash
+  sig do
+    type_parameters(:k2).params(
+      other_hash: T::Hash[T.type_parameter(:k2), T.untyped],
+      block: T.nilable(T.proc.params(k: T.untyped, v1: T.untyped, v2: T.untyped).returns(T.untyped))
+    ).returns(T::Hash[T.any(Hash::K, T.type_parameter(:k2)), T.untyped])
+  end
+  def deep_merge(other_hash, &block); end
+
+  sig do
+    type_parameters(:k2).params(
+      other_hash: T::Hash[T.type_parameter(:k2), T.untyped],
+      block: T.nilable(T.proc.params(k: T.untyped, v1: T.untyped, v2: T.untyped).returns(T.untyped))
+    ).returns(T::Hash[T.any(Hash::K, T.type_parameter(:k2)), T.untyped])
+  end
+  def deep_merge!(other_hash, &block); end
+end

Library/Homebrew/extend/hash/deep_transform_values.rb

@@ -0,0 +1,46 @@
+# typed: strict
+# frozen_string_literal: true
+
+class Hash
+  # Returns a new hash with all values converted by the block operation.
+  # This includes the values from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #  hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #  hash.deep_transform_values{ |value| value.to_s.upcase }
+  #  # => {person: {name: "ROB", age: "28"}}
+  def deep_transform_values(&block) = _deep_transform_values_in_object(self, &block)
+
+  # Destructively converts all values by using the block operation.
+  # This includes the values from the root hash and from all
+  # nested hashes and arrays.
+  def deep_transform_values!(&block) = _deep_transform_values_in_object!(self, &block)
+
+  private
+
+  # Support methods for deep transforming nested hashes and arrays.
+  sig { params(object: T.anything, block: T.proc.params(v: T.untyped).returns(T.untyped)).returns(T.untyped) }
+  def _deep_transform_values_in_object(object, &block)
+    case object
+    when Hash
+      object.transform_values { |value| _deep_transform_values_in_object(value, &block) }
+    when Array
+      object.map { |e| _deep_transform_values_in_object(e, &block) }
+    else
+      yield(object)
+    end
+  end
+
+  sig { params(object: T.anything, block: T.proc.params(v: T.untyped).returns(T.untyped)).returns(T.untyped) }
+  def _deep_transform_values_in_object!(object, &block)
+    case object
+    when Hash
+      object.transform_values! { |value| _deep_transform_values_in_object!(value, &block) }
+    when Array
+      object.map! { |e| _deep_transform_values_in_object!(e, &block) }
+    else
+      yield(object)
+    end
+  end
+end

Library/Homebrew/extend/hash/deep_transform_values.rbi

@@ -0,0 +1,17 @@
+# typed: strict
+
+class Hash
+  sig {
+    type_parameters(:out).params(
+      block: T.proc.params(o: Hash::V).returns(T.type_parameter(:out))
+    ).returns(T::Hash[Hash::K, T.type_parameter(:out)])
+  }
+  def deep_transform_values(&block); end
+
+  sig {
+    type_parameters(:out).params(
+      block: T.proc.params(o: Hash::V).returns(T.type_parameter(:out))
+    ).returns(T::Hash[Hash::K, T.type_parameter(:out)])
+  }
+  def deep_transform_values!(&block); end
+end