Merge pull request #1243 from reitermarkus/rename-deprecation-exception

Rename FormulaMethodDeprecatedError to  MethodDeprecatedError.
This commit is contained in:
Markus Reiter 2016-10-08 17:16:29 +02:00 committed by GitHub
commit c78d1e6bb5
4 changed files with 4 additions and 4 deletions

View File

@ -56,7 +56,7 @@ end
class FormulaSpecificationError < StandardError; end
class FormulaMethodDeprecatedError < StandardError; end
class MethodDeprecatedError < StandardError; end
class FormulaUnavailableError < RuntimeError
attr_reader :name

View File

@ -4,7 +4,7 @@ class FormulaVersions
IGNORED_EXCEPTIONS = [
ArgumentError, NameError, SyntaxError, TypeError,
FormulaSpecificationError, FormulaValidationError,
ErrorDuringExecution, LoadError, FormulaMethodDeprecatedError
ErrorDuringExecution, LoadError, MethodDeprecatedError
].freeze
attr_reader :name, :path, :repository, :entry_name

View File

@ -249,7 +249,7 @@ class UtilTests < Homebrew::TestCase
def test_odeprecated
ARGV.stubs(:homebrew_developer?).returns false
e = assert_raises(FormulaMethodDeprecatedError) do
e = assert_raises(MethodDeprecatedError) do
odeprecated("method", "replacement",
caller: ["#{HOMEBREW_LIBRARY}/Taps/homebrew/homebrew-core/"],
die: true)

View File

@ -83,7 +83,7 @@ def odeprecated(method, replacement = nil, options = {})
if ARGV.homebrew_developer? || options[:die] ||
Homebrew.raise_deprecation_exceptions?
raise FormulaMethodDeprecatedError, message
raise MethodDeprecatedError, message
else
opoo "#{message}\n"
end