Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deprecations #7579

Merged
merged 1 commit into from May 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Library/Homebrew/cleanup.rb
Expand Up @@ -84,7 +84,7 @@ def stale_formula?(scrub)
return true
end

return true if scrub && !formula.installed?
return true if scrub && !formula.latest_version_installed?

return true if Utils::Bottles.file_outdated?(formula, self)

Expand Down
6 changes: 1 addition & 5 deletions Library/Homebrew/cli/args.rb
Expand Up @@ -84,11 +84,7 @@ def formulae
require "formula"

@formulae ||= (downcased_unique_named - casks).map do |name|
if name.include?("/") || File.exist?(name)
Formulary.factory(name, spec)
else
Formulary.find_with_priority(name, spec)
end
Formulary.factory(name, spec)
end.uniq(&:name).freeze
end

Expand Down
6 changes: 1 addition & 5 deletions Library/Homebrew/cli/parser.rb
Expand Up @@ -359,11 +359,7 @@ def formulae
named_args.map do |arg|
next if arg.match?(HOMEBREW_CASK_TAP_CASK_REGEX)

if arg.include?("/") || arg.end_with?(".tar.gz") || File.exist?(arg)
Formulary.factory(arg, spec)
else
Formulary.find_with_priority(arg.downcase, spec)
end
Formulary.factory(arg, spec)
end.compact.uniq(&:name)
end
end
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/cmd/--env.rb
Expand Up @@ -36,7 +36,6 @@ def __env
shell = if args.plain?
nil
elsif args.shell.nil?
# legacy behavior
:bash unless $stdout.tty?
elsif args.shell == "auto"
Utils::Shell.parent || Utils::Shell.preferred
Expand Down
6 changes: 1 addition & 5 deletions Library/Homebrew/cmd/info.rb
Expand Up @@ -105,11 +105,7 @@ def print_info
args.named.each_with_index do |f, i|
puts unless i.zero?
begin
formula = if f.include?("/") || File.exist?(f)
Formulary.factory(f)
else
Formulary.find_with_priority(f)
end
Formulary.factory(f)
if args.analytics?
Utils::Analytics.formula_output(formula)
else
Expand Down
18 changes: 0 additions & 18 deletions Library/Homebrew/cmd/tap-pin.rb

This file was deleted.

18 changes: 0 additions & 18 deletions Library/Homebrew/cmd/tap-unpin.rb

This file was deleted.

2 changes: 1 addition & 1 deletion Library/Homebrew/cmd/upgrade.rb
Expand Up @@ -216,7 +216,7 @@ def upgrade_formula(f)
ensure
# restore previous installation state if build failed
begin
linked_kegs.each(&:link) unless f.installed?
linked_kegs.each(&:link) unless f.latest_version_installed?
rescue
nil
end
Expand Down
6 changes: 3 additions & 3 deletions Library/Homebrew/compat.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require "compat/cask/dsl/version"
require "compat/language/python"
require "compat/requirements/macos_requirement"
require "compat/extend/nil"
require "compat/extend/string"
require "compat/formula"
require "compat/language/python"
require "compat/os/mac" if OS.mac?
23 changes: 0 additions & 23 deletions Library/Homebrew/compat/cask/dsl/version.rb

This file was deleted.

11 changes: 11 additions & 0 deletions Library/Homebrew/compat/extend/nil.rb
@@ -0,0 +1,11 @@
# frozen_string_literal: true

class NilClass
module Compat
def chuzzle
odeprecated "chuzzle", "chomp.presence"
end
end

prepend Compat
end
15 changes: 15 additions & 0 deletions Library/Homebrew/compat/extend/string.rb
@@ -0,0 +1,15 @@
# frozen_string_literal: true

class String
module Compat
# String.chomp, but if result is empty: returns nil instead.
# Allows `chuzzle || foo` short-circuits.
def chuzzle
odeprecated "chuzzle", "chomp.presence"
s = chomp
s unless s.empty?
end
end

prepend Compat
end
13 changes: 11 additions & 2 deletions Library/Homebrew/compat/formula.rb
Expand Up @@ -3,10 +3,19 @@
class Formula
module Compat
def installed?
# odeprecated "Formula#installed?",
# "Formula#latest_version_installed? (or Formula#any_version_installed? )"
odeprecated "Formula#installed?",
"Formula#latest_version_installed? (or Formula#any_version_installed? )"
latest_version_installed?
end

def prepare_patches
if respond_to?(:patches)
active_spec.add_legacy_patches(patches)
odeprecated "patches", "patch do"
end

super
end
end

prepend Compat
Expand Down
16 changes: 8 additions & 8 deletions Library/Homebrew/compat/language/haskell.rb
Expand Up @@ -5,7 +5,7 @@ module Haskell
module Cabal
module Compat
def cabal_sandbox(options = {})
# odeprecated "Language::Haskell::Cabal.cabal_sandbox"
odeprecated "Language::Haskell::Cabal.cabal_sandbox"

pwd = Pathname.pwd
home = options[:home] || pwd
Expand Down Expand Up @@ -41,14 +41,14 @@ def cabal_sandbox(options = {})
end

def cabal_sandbox_add_source(*args)
# odeprecated "Language::Haskell::Cabal.cabal_sandbox_add_source"
odeprecated "Language::Haskell::Cabal.cabal_sandbox_add_source"

system "cabal", "v1-sandbox", "add-source", *args
end

def cabal_install(*args)
# odeprecated "Language::Haskell::Cabal.cabal_install",
# "cabal v2-install directly with std_cabal_v2_args"
odeprecated "Language::Haskell::Cabal.cabal_install",
"cabal v2-install directly with std_cabal_v2_args"

# cabal hardcodes 64 as the maximum number of parallel jobs
# https://github.com/Homebrew/legacy-homebrew/issues/49509
Expand All @@ -64,13 +64,13 @@ def cabal_install(*args)
end

def cabal_configure(flags)
# odeprecated "Language::Haskell::Cabal.cabal_configure"
odeprecated "Language::Haskell::Cabal.cabal_configure"

system "cabal", "v1-configure", flags
end

def cabal_install_tools(*tools)
# odeprecated "Language::Haskell::Cabal.cabal_install_tools"
odeprecated "Language::Haskell::Cabal.cabal_install_tools"

# install tools sequentially, as some tools can depend on other tools
tools.each { |tool| cabal_install tool }
Expand All @@ -81,8 +81,8 @@ def cabal_install_tools(*tools)
end

def install_cabal_package(*args, **options)
# odeprecated "Language::Haskell::Cabal.install_cabal_package",
# "cabal v2-update directly followed by v2-install with std_cabal_v2_args"
odeprecated "Language::Haskell::Cabal.install_cabal_package",
"cabal v2-update directly followed by v2-install with std_cabal_v2_args"

cabal_sandbox do
cabal_install_tools(*options[:using]) if options[:using]
Expand Down
2 changes: 2 additions & 0 deletions Library/Homebrew/compat/language/python.rb
Expand Up @@ -5,6 +5,8 @@ module Python
class << self
module Compat
def rewrite_python_shebang(python_path)
odeprecated "Language::Python.rewrite_python_shebang",
"Utils::Shebang.rewrite_shebang and Shebang.python_shebang_rewrite_info(python_path)"
Pathname.pwd.find do |f|
Utils::Shebang.rewrite_shebang(Shebang.python_shebang_rewrite_info(python_path), f)
end
Expand Down
6 changes: 3 additions & 3 deletions Library/Homebrew/compat/os/mac.rb
Expand Up @@ -5,7 +5,7 @@ module Mac
class << self
module Compat
def preferred_arch
# odeprecated "MacOS.preferred_arch", "Hardware::CPU.arch (or ideally let the compiler handle it)"
odeprecated "MacOS.preferred_arch", "Hardware::CPU.arch (or ideally let the compiler handle it)"
if Hardware::CPU.is_64_bit?
Hardware::CPU.arch_64_bit
else
Expand All @@ -14,12 +14,12 @@ def preferred_arch
end

def tcc_db
# odeprecated "MacOS.tcc_db"
odeprecated "MacOS.tcc_db"
@tcc_db ||= Pathname.new("/Library/Application Support/com.apple.TCC/TCC.db")
end

def pre_mavericks_accessibility_dotfile
# odeprecated "MacOS.pre_mavericks_accessibility_dotfile"
odeprecated "MacOS.pre_mavericks_accessibility_dotfile"
@pre_mavericks_accessibility_dotfile ||= Pathname.new("/private/var/db/.AccessibilityAPIEnabled")
end
end
Expand Down
35 changes: 0 additions & 35 deletions Library/Homebrew/compat/requirements/macos_requirement.rb

This file was deleted.

15 changes: 2 additions & 13 deletions Library/Homebrew/dev-cmd/audit.rb
Expand Up @@ -134,19 +134,8 @@ def audit
end
end

created_pr_comment = false
if new_formula && !new_formula_problem_lines.empty?
begin
created_pr_comment = true if GitHub.create_issue_comment(new_formula_problem_lines.join("\n"))
rescue *GitHub.api_errors => e
opoo "Unable to create issue comment: #{e.message}"
end
end

unless created_pr_comment
new_formula_problem_count += new_formula_problem_lines.size
puts new_formula_problem_lines.map { |s| " #{s}" }
end
new_formula_problem_count += new_formula_problem_lines.size
puts new_formula_problem_lines.map { |s| " #{s}" }

total_problems_count = problem_count + new_formula_problem_count
problem_plural = "#{total_problems_count} #{"problem".pluralize(total_problems_count)}"
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/dev-cmd/irb.rb
Expand Up @@ -38,7 +38,7 @@ def irb

if args.examples?
puts "'v8'.f # => instance of the v8 formula"
puts ":hub.f.installed?"
puts ":hub.f.latest_version_installed?"
puts ":lua.f.methods - 1.methods"
puts ":mpd.f.recursive_dependencies.reject(&:installed?)"
return
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/dev-cmd/pr-pull.rb
Expand Up @@ -60,7 +60,7 @@ def setup_git_environment!
rescue FormulaUnavailableError
nil
else
if gnupg.installed?
if gnupg.any_version_installed?
path = PATH.new(ENV.fetch("PATH"))
path.prepend(gnupg.installed_prefix/"bin")
ENV["PATH"] = path
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/dev-cmd/pull.rb
Expand Up @@ -56,7 +56,7 @@ def pull
gnupg = Formula["gnupg"]
rescue FormulaUnavailableError # rubocop:disable Lint/SuppressedException
else
if gnupg.installed?
if gnupg.any_version_installed?
path = PATH.new(ENV.fetch("PATH"))
path.prepend(gnupg.installed_prefix/"bin")
ENV["PATH"] = path
Expand Down
9 changes: 0 additions & 9 deletions Library/Homebrew/extend/pathname.rb
Expand Up @@ -398,15 +398,6 @@ def ds_store?
basename.to_s == ".DS_Store"
end

# https://bugs.ruby-lang.org/issues/9915
if RUBY_VERSION == "2.0.0"
prepend Module.new {
def inspect
super.force_encoding(@path.encoding)
end
}
end

def binary_executable?
false
end
Expand Down
15 changes: 0 additions & 15 deletions Library/Homebrew/extend/string.rb
Expand Up @@ -2,21 +2,6 @@

require "active_support/core_ext/object/blank"

class String
# String.chomp, but if result is empty: returns nil instead.
# Allows `chuzzle || foo` short-circuits.
# TODO: Deprecate.
def chuzzle
s = chomp
s unless s.empty?
end
end

class NilClass
# TODO: Deprecate.
def chuzzle; end
end

# Used by the inreplace function (in `utils.rb`).
module StringInreplaceExtension
attr_accessor :errors
Expand Down