Homebrew · MikeMcQuaid · Jul 15, 2018 · Jul 9, 2018 · Jul 14, 2018
diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
@@ -39,7 +39,7 @@ def tap
     if ARGV.include? "--repair"
       Tap.each(&:link_completions_and_manpages)
     elsif ARGV.include? "--list-official"
-      odeprecated("brew tap --list-official")
+      odisabled("brew tap --list-official")
     elsif ARGV.include? "--list-pinned"
       puts Tap.select(&:pinned?).map(&:name)
     elsif ARGV.named.empty?

diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
@@ -31,8 +31,6 @@ def upgrade
 
     Install.perform_preinstall_checks
 
-    odisabled "'brew upgrade --all'", "'brew upgrade'" if ARGV.include?("--all")
-
     if ARGV.named.empty?
       outdated = Formula.installed.select do |f|
         f.outdated?(fetch_head: ARGV.fetch_head?)

diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb
@@ -1,12 +1,7 @@
-require "compat/hbc"
-require "compat/formula"
-require "compat/formula_support"
-require "compat/requirements"
-require "compat/download_strategy"
-require "compat/dependency_collector"
-require "compat/ENV/shared"
-require "compat/extend/string"
-require "compat/gpg"
-require "compat/dependable"
 require "compat/os/mac"
+require "compat/dependable"
+require "compat/dependency_collector"
+require "compat/fileutils"
+require "compat/formula_support"
+require "compat/hbc"
 require "compat/tap"
diff --git a/Library/Homebrew/compat/ENV/shared.rb b/Library/Homebrew/compat/ENV/shared.rb
diff --git a/Library/Homebrew/compat/dependable.rb b/Library/Homebrew/compat/dependable.rb
@@ -1,7 +1,7 @@
 module Dependable
   module Compat
     def run?
-      odeprecated "Dependable#run?"
+      odisabled "Dependable#run?"
       tags.include? :run
     end
   end

diff --git a/Library/Homebrew/compat/dependency_collector.rb b/Library/Homebrew/compat/dependency_collector.rb
@@ -2,60 +2,10 @@
 
 class DependencyCollector
   module Compat
-    # Define the languages that we can handle as external dependencies.
-    LANGUAGE_MODULES = Set[
-      :lua, :lua51, :perl, :python, :python3, :ruby
-    ].freeze
-
     def parse_string_spec(spec, tags)
-      if (tag = tags.first) && LANGUAGE_MODULES.include?(tag)
-        odisabled "'depends_on ... => #{tag.inspect}'"
-      end
-
-      if tags.include?(:run)
-        odeprecated "'depends_on ... => :run'"
-      end
-
+      odisabled "'depends_on ... => :run'" if tags.include?(:run)
       super
     end
-
-    def parse_symbol_spec(spec, tags)
-      case spec
-      when :clt
-        odisabled "'depends_on :clt'"
-      when :tex
-        odisabled "'depends_on :tex'"
-      when :libltdl
-        output_disabled(spec, "libtool")
-      when :apr
-        output_disabled(spec, "apr-util")
-      when :fortran
-        output_disabled(spec, "gcc")
-      when :gpg
-        output_disabled(spec, "gnupg")
-      when :hg
-        output_disabled(spec, "mercurial")
-      when :mpi
-        output_disabled(spec, "open-mpi")
-      when :python, :python2
-        output_disabled(spec, "python@2")
-      when :python3
-        output_disabled(spec, "python")
-      when :ant, :autoconf, :automake, :bsdmake, :cairo, :emacs, :expat,
-           :fontconfig, :freetype, :libtool, :libpng, :mysql, :perl, :pixman,
-           :postgresql, :rbenv, :ruby
-        output_disabled(spec)
-      else
-        super
-      end
-    end
-
-    private
-
-    def output_disabled(dependency, new_dependency = dependency)
-      odisabled "'depends_on :#{dependency}'",
-                "'depends_on \"#{new_dependency}\"'"
-    end
   end
 
   prepend Compat

diff --git a/Library/Homebrew/compat/download_strategy.rb b/Library/Homebrew/compat/download_strategy.rb
diff --git a/Library/Homebrew/compat/extend/string.rb b/Library/Homebrew/compat/extend/string.rb
diff --git a/Library/Homebrew/compat/fileutils.rb b/Library/Homebrew/compat/fileutils.rb
@@ -2,8 +2,13 @@
 
 module FileUtils
   module Compat
+    def ruby(*args)
+      odeprecated "ruby", 'system "ruby"'
+      system RUBY_PATH, *args
+    end
+
     def mktemp(prefix = name, opts = {})
-      # odeprecated("FileUtils.mktemp", "mktemp")
+      odeprecated("FileUtils.mktemp", "mktemp")
       Mktemp.new(prefix, opts).run do |staging|
         yield staging
       end

diff --git a/Library/Homebrew/compat/formula.rb b/Library/Homebrew/compat/formula.rb
diff --git a/Library/Homebrew/compat/formula_support.rb b/Library/Homebrew/compat/formula_support.rb
@@ -4,27 +4,23 @@ class KegOnlyReason
   module Compat
     def valid?
       case @reason
-      when :provided_by_osx
-        odisabled "keg_only :provided_by_osx", "keg_only :provided_by_macos"
-      when :shadowed_by_osx
-        odisabled "keg_only :shadowed_by_osx", "keg_only :shadowed_by_macos"
       when :provided_pre_mountain_lion
-        odeprecated "keg_only :provided_pre_mountain_lion"
+        odisabled "keg_only :provided_pre_mountain_lion"
         MacOS.version < :mountain_lion
       when :provided_pre_mavericks
-        odeprecated "keg_only :provided_pre_mavericks"
+        odisabled "keg_only :provided_pre_mavericks"
         MacOS.version < :mavericks
       when :provided_pre_el_capitan
-        odeprecated "keg_only :provided_pre_el_capitan"
+        odisabled "keg_only :provided_pre_el_capitan"
         MacOS.version < :el_capitan
       when :provided_pre_high_sierra
-        odeprecated "keg_only :provided_pre_high_sierra"
+        odisabled "keg_only :provided_pre_high_sierra"
         MacOS.version < :high_sierra
       when :provided_until_xcode43
-        odeprecated "keg_only :provided_until_xcode43"
+        odisabled "keg_only :provided_until_xcode43"
         MacOS::Xcode.version < "4.3"
       when :provided_until_xcode5
-        odeprecated "keg_only :provided_until_xcode5"
+        odisabled "keg_only :provided_until_xcode5"
         MacOS::Xcode.version < "5.0"
       else
         super
@@ -33,42 +29,38 @@ def valid?
 
     def to_s
       case @reason
-      when :provided_by_osx
-        odisabled "keg_only :provided_by_osx", "keg_only :provided_by_macos"
-      when :shadowed_by_osx
-        odisabled "keg_only :shadowed_by_osx", "keg_only :shadowed_by_macos"
       when :provided_pre_mountain_lion
-        odeprecated "keg_only :provided_pre_mountain_lion"
+        odisabled "keg_only :provided_pre_mountain_lion"
 
         <<~EOS
           macOS already provides this software in versions before Mountain Lion
         EOS
       when :provided_pre_mavericks
-        odeprecated "keg_only :provided_pre_mavericks"
+        odisabled "keg_only :provided_pre_mavericks"
 
         <<~EOS
           macOS already provides this software in versions before Mavericks
         EOS
       when :provided_pre_el_capitan
-        odeprecated "keg_only :provided_pre_el_capitan"
+        odisabled "keg_only :provided_pre_el_capitan"
 
         <<~EOS
           macOS already provides this software in versions before El Capitan
         EOS
       when :provided_pre_high_sierra
-        odeprecated "keg_only :provided_pre_high_sierra"
+        odisabled "keg_only :provided_pre_high_sierra"
 
         <<~EOS
           macOS already provides this software in versions before High Sierra
         EOS
       when :provided_until_xcode43
-        odeprecated "keg_only :provided_until_xcode43"
+        odisabled "keg_only :provided_until_xcode43"
 
         <<~EOS
           Xcode provides this software prior to version 4.3
         EOS
       when :provided_until_xcode5
-        odeprecated "keg_only :provided_until_xcode5"
+        odisabled "keg_only :provided_until_xcode5"
 
         <<~EOS
           Xcode provides this software prior to version 5

diff --git a/Library/Homebrew/compat/gpg.rb b/Library/Homebrew/compat/gpg.rb
diff --git a/Library/Homebrew/compat/hbc.rb b/Library/Homebrew/compat/hbc.rb
@@ -1,9 +1,7 @@
 require "compat/hbc/cask_loader"
 require "compat/hbc/cli/search"
-require "compat/hbc/cli/update"
 require "compat/hbc/cache"
 require "compat/hbc/caskroom"
-require "compat/hbc/cli"
 require "compat/hbc/dsl"
 
 module Hbc

diff --git a/Library/Homebrew/compat/hbc/cask_loader.rb b/Library/Homebrew/compat/hbc/cask_loader.rb
@@ -8,7 +8,7 @@ module Compat
 
         def cask(header_token, **options, &block)
           if header_token.is_a?(Hash) && header_token.key?(:v1)
-            odeprecated %q("cask :v1 => 'token'"), %q("cask 'token'")
+            odisabled %q("cask :v1 => 'token'"), %q("cask 'token'")
             header_token = header_token[:v1]
           end
 

diff --git a/Library/Homebrew/compat/hbc/cli.rb b/Library/Homebrew/compat/hbc/cli.rb
diff --git a/Library/Homebrew/compat/hbc/cli/update.rb b/Library/Homebrew/compat/hbc/cli/update.rb
diff --git a/Library/Homebrew/compat/hbc/dsl.rb b/Library/Homebrew/compat/hbc/dsl.rb
@@ -2,7 +2,7 @@ module Hbc
   class DSL
     module Compat
       def license(*)
-        odeprecated "Hbc::DSL#license"
+        odisabled "Hbc::DSL#license"
       end
     end
 

diff --git a/Library/Homebrew/compat/os/mac.rb b/Library/Homebrew/compat/os/mac.rb
@@ -3,7 +3,7 @@ module Mac
     class << self
       module Compat
         def release
-          odeprecated "MacOS.release", "MacOS.version"
+          odisabled "MacOS.release", "MacOS.version"
           version
         end
       end