From fc418fd3333c6ea1a3b77ca4f49cfc100ef59a1c Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 24 Oct 2018 10:00:49 +0100 Subject: [PATCH] More deprecated/disabled updates - remove odisabled - move odeprecated to odisabled --- Library/Homebrew/cmd/tap.rb | 2 - Library/Homebrew/compat.rb | 6 +- Library/Homebrew/compat/cask/cask_loader.rb | 2 + Library/Homebrew/compat/cask/cmd/--version.rb | 4 +- Library/Homebrew/compat/cask/cmd/cleanup.rb | 13 +--- Library/Homebrew/compat/cask/cmd/search.rb | 3 +- Library/Homebrew/compat/cask/dsl.rb | 7 +- Library/Homebrew/compat/dependable.rb | 10 --- .../Homebrew/compat/dependency_collector.rb | 12 --- Library/Homebrew/compat/fileutils.rb | 12 +-- Library/Homebrew/compat/formula_support.rb | 75 ------------------- Library/Homebrew/compat/os/mac.rb | 14 ---- Library/Homebrew/formula.rb | 1 - Library/Homebrew/requirement.rb | 4 - Library/Homebrew/software_spec.rb | 1 - 15 files changed, 15 insertions(+), 151 deletions(-) delete mode 100644 Library/Homebrew/compat/dependable.rb delete mode 100644 Library/Homebrew/compat/dependency_collector.rb delete mode 100644 Library/Homebrew/compat/formula_support.rb delete mode 100644 Library/Homebrew/compat/os/mac.rb diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb index 3b723a73ec..9539faee61 100644 --- a/Library/Homebrew/cmd/tap.rb +++ b/Library/Homebrew/cmd/tap.rb @@ -38,8 +38,6 @@ module Homebrew def tap if ARGV.include? "--repair" Tap.each(&:link_completions_and_manpages) - elsif ARGV.include? "--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/compat.rb b/Library/Homebrew/compat.rb index b860f73d03..7a66d256d2 100644 --- a/Library/Homebrew/compat.rb +++ b/Library/Homebrew/compat.rb @@ -1,10 +1,6 @@ -require "compat/os/mac" require "compat/requirements/x11_requirement" require "compat/requirements/xcode_requirement" -require "compat/dependable" -require "compat/dependency_collector" +require "compat/cask" require "compat/download_strategy" require "compat/fileutils" -require "compat/formula_support" -require "compat/cask" require "compat/tap" diff --git a/Library/Homebrew/compat/cask/cask_loader.rb b/Library/Homebrew/compat/cask/cask_loader.rb index 2ef242c150..d0119b4ef1 100644 --- a/Library/Homebrew/compat/cask/cask_loader.rb +++ b/Library/Homebrew/compat/cask/cask_loader.rb @@ -6,6 +6,8 @@ module Cask module Compat private + # TODO: can't delete this code until the merge of + # https://github.com/Homebrew/brew/pull/4730 or an equivalent. def cask(header_token, **options, &block) if header_token.is_a?(Hash) && header_token.key?(:v1) odisabled %q("cask :v1 => 'token'"), %q("cask 'token'") diff --git a/Library/Homebrew/compat/cask/cmd/--version.rb b/Library/Homebrew/compat/cask/cmd/--version.rb index 700d9ac11a..a42c941956 100644 --- a/Library/Homebrew/compat/cask/cmd/--version.rb +++ b/Library/Homebrew/compat/cask/cmd/--version.rb @@ -16,9 +16,7 @@ module Cask end def run - odeprecated "`brew cask --version`", "`brew --version`", disable_on: Time.new(2018, 10, 31) - ARGV.clear - Homebrew.__version + odisabled "`brew cask --version`", "`brew --version`" end def self.help diff --git a/Library/Homebrew/compat/cask/cmd/cleanup.rb b/Library/Homebrew/compat/cask/cmd/cleanup.rb index f7f6d9082d..39cb2db10d 100644 --- a/Library/Homebrew/compat/cask/cmd/cleanup.rb +++ b/Library/Homebrew/compat/cask/cmd/cleanup.rb @@ -22,18 +22,7 @@ module Cask end def run - odeprecated "`brew cask cleanup`", "`brew cleanup`", disable_on: Time.new(2018, 9, 30) - - cleanup = Homebrew::Cleanup.new - - casks(alternative: -> { Cask.to_a }).each do |cask| - cleanup.cleanup_cask(cask) - end - - return if cleanup.disk_cleanup_size.zero? - - disk_space = disk_usage_readable(cleanup.disk_cleanup_size) - ohai "This operation has freed approximately #{disk_space} of disk space." + odisabled "`brew cask cleanup`", "`brew cleanup`" end end end diff --git a/Library/Homebrew/compat/cask/cmd/search.rb b/Library/Homebrew/compat/cask/cmd/search.rb index 8e0ae4f43e..f333255867 100644 --- a/Library/Homebrew/compat/cask/cmd/search.rb +++ b/Library/Homebrew/compat/cask/cmd/search.rb @@ -6,8 +6,7 @@ module Cask module Compat class Search < AbstractCommand def run - odeprecated "`brew cask search`", "`brew search`", disable_on: Time.new(2018, 9, 30) - Homebrew.search(args.empty? ? "--casks" : args) + odisabled "`brew cask search`", "`brew search`" end def self.visible diff --git a/Library/Homebrew/compat/cask/dsl.rb b/Library/Homebrew/compat/cask/dsl.rb index 114b6d83bc..646af08364 100644 --- a/Library/Homebrew/compat/cask/dsl.rb +++ b/Library/Homebrew/compat/cask/dsl.rb @@ -1,8 +1,11 @@ module Cask class DSL module Compat + # TODO: can't delete this code until the merge of + # https://github.com/Homebrew/brew/pull/4730 or an equivalent. + def gpg(*) - odeprecated "the `gpg` stanza", disable_on: Time.new(2018, 12, 31) + odisabled "the `gpg` stanza" end def license(*) @@ -10,7 +13,7 @@ module Cask end def accessibility_access(*) - odeprecated "the `accessibility_access` stanza" + odisabled "the `accessibility_access` stanza" end end diff --git a/Library/Homebrew/compat/dependable.rb b/Library/Homebrew/compat/dependable.rb deleted file mode 100644 index 63195686a5..0000000000 --- a/Library/Homebrew/compat/dependable.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Dependable - module Compat - def run? - odisabled "Dependable#run?" - tags.include? :run - end - end - - prepend Compat -end diff --git a/Library/Homebrew/compat/dependency_collector.rb b/Library/Homebrew/compat/dependency_collector.rb deleted file mode 100644 index 5acfc8f5f5..0000000000 --- a/Library/Homebrew/compat/dependency_collector.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "dependency_collector" - -class DependencyCollector - module Compat - def parse_string_spec(spec, tags) - odisabled "'depends_on ... => :run'" if tags.include?(:run) - super - end - end - - prepend Compat -end diff --git a/Library/Homebrew/compat/fileutils.rb b/Library/Homebrew/compat/fileutils.rb index 0304956aef..72b3c783f9 100644 --- a/Library/Homebrew/compat/fileutils.rb +++ b/Library/Homebrew/compat/fileutils.rb @@ -2,16 +2,12 @@ require "fileutils" module FileUtils module Compat - def ruby(*args) - odeprecated "ruby", 'system "ruby"' - system RUBY_PATH, *args + def ruby(*) + odisabled "ruby", 'system "ruby"' end - def mktemp(prefix = name, opts = {}) - odeprecated("FileUtils.mktemp", "mktemp") - Mktemp.new(prefix, opts).run do |staging| - yield staging - end + def mktemp(*) + odisabled("FileUtils.mktemp", "mktemp") end module_function :mktemp end diff --git a/Library/Homebrew/compat/formula_support.rb b/Library/Homebrew/compat/formula_support.rb deleted file mode 100644 index 7cce3a80b2..0000000000 --- a/Library/Homebrew/compat/formula_support.rb +++ /dev/null @@ -1,75 +0,0 @@ -require "formula_support" - -class KegOnlyReason - module Compat - def valid? - case @reason - when :provided_pre_mountain_lion - odisabled "keg_only :provided_pre_mountain_lion" - MacOS.version < :mountain_lion - when :provided_pre_mavericks - odisabled "keg_only :provided_pre_mavericks" - MacOS.version < :mavericks - when :provided_pre_el_capitan - odisabled "keg_only :provided_pre_el_capitan" - MacOS.version < :el_capitan - when :provided_pre_high_sierra - odisabled "keg_only :provided_pre_high_sierra" - MacOS.version < :high_sierra - when :provided_until_xcode43 - odisabled "keg_only :provided_until_xcode43" - MacOS::Xcode.version < "4.3" - when :provided_until_xcode5 - odisabled "keg_only :provided_until_xcode5" - MacOS::Xcode.version < "5.0" - else - super - end - end - - def to_s - case @reason - when :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 - odisabled "keg_only :provided_pre_mavericks" - - <<~EOS - macOS already provides this software in versions before Mavericks - EOS - when :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 - odisabled "keg_only :provided_pre_high_sierra" - - <<~EOS - macOS already provides this software in versions before High Sierra - EOS - when :provided_until_xcode43 - odisabled "keg_only :provided_until_xcode43" - - <<~EOS - Xcode provides this software prior to version 4.3 - EOS - when :provided_until_xcode5 - odisabled "keg_only :provided_until_xcode5" - - <<~EOS - Xcode provides this software prior to version 5 - EOS - else - super - end.to_s.strip - end - end - - prepend Compat -end diff --git a/Library/Homebrew/compat/os/mac.rb b/Library/Homebrew/compat/os/mac.rb deleted file mode 100644 index a9389acaff..0000000000 --- a/Library/Homebrew/compat/os/mac.rb +++ /dev/null @@ -1,14 +0,0 @@ -module OS - module Mac - class << self - module Compat - def release - odisabled "MacOS.release", "MacOS.version" - version - end - end - - prepend Compat - end - end -end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 83d7c7e876..655eca1860 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -2532,7 +2532,6 @@ class Formula # version '4.8.1' # end def fails_with(compiler, &block) - odisabled "fails_with :llvm" if compiler == :llvm specs.each { |spec| spec.fails_with(compiler, &block) } end diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index f9e8bf9581..97c6fe6cb5 100644 --- a/Library/Homebrew/requirement.rb +++ b/Library/Homebrew/requirement.rb @@ -150,10 +150,6 @@ class Requirement attr_reader :env_proc, :build attr_rw :fatal, :cask, :download - def default_formula(_val = nil) - odisabled "Requirement.default_formula" - end - def satisfy(options = nil, &block) return @satisfied if options.nil? && !block_given? diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 59a351a1b5..49b9e49f8c 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -212,7 +212,6 @@ class SoftwareSpec end def fails_with(compiler, &block) - odisabled "fails_with :llvm" if compiler == :llvm compiler_failures << CompilerFailure.create(compiler, &block) end