diff options
Diffstat (limited to 'lib/chef/mixin/deprecation.rb')
| -rw-r--r-- | lib/chef/mixin/deprecation.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/chef/mixin/deprecation.rb b/lib/chef/mixin/deprecation.rb index 0f059a215f..14414036e7 100644 --- a/lib/chef/mixin/deprecation.rb +++ b/lib/chef/mixin/deprecation.rb @@ -65,7 +65,7 @@ class Chef end def method_missing(method_name, *args, &block) - log_deprecation_msg(caller[0..3]) + deprecated_msg(caller[0..3]) @target.send(method_name, *args, &block) end @@ -75,7 +75,7 @@ class Chef private - def log_deprecation_msg(*called_from) + def deprecated_msg(*called_from) called_from = called_from.flatten log("Accessing #{@ivar_name} by the variable @#{@ivar_name} is deprecated. Support will be removed in a future release.") log("Please update your cookbooks to use #{@ivar_name} in place of @#{@ivar_name}. Accessed from:") @@ -101,20 +101,14 @@ class Chef def deprecated_attr_reader(name, alternative, level = :warn) define_method(name) do - Chef.log_deprecation("#{self.class}.#{name} is deprecated. Support will be removed in a future release.") - Chef.log_deprecation(alternative) - Chef.log_deprecation("Called from:") - caller[0..3].each { |c| Chef.log_deprecation(c) } + Chef.deprecated(:internal_api, "#{self.class}.#{name} is deprecated. Support will be removed in a future release. #{alternative}") instance_variable_get("@#{name}") end end def deprecated_attr_writer(name, alternative, level = :warn) define_method("#{name}=") do |value| - Chef.log_deprecation("Writing to #{self.class}.#{name} with #{name}= is deprecated. Support will be removed in a future release.") - Chef.log_deprecation(alternative) - Chef.log_deprecation("Called from:") - caller[0..3].each { |c| Chef.log_deprecation(c) } + Chef.deprecated(:internal_api, "Writing to #{self.class}.#{name} with #{name}= is deprecated. Support will be removed in a future release. #{alternative}") instance_variable_set("@#{name}", value) end end |