diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-02-13 09:52:10 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-02-13 09:52:10 -0800 |
commit | 404a9bc88be538769c6c80b3b31f39a6582991d2 (patch) | |
tree | 2f8795e5f64153440c22a522d669c235a627f289 /lib/chef/resource.rb | |
parent | b949a48acc21d4b64869bd7b834708d5232b1f2a (diff) | |
download | chef-404a9bc88be538769c6c80b3b31f39a6582991d2.tar.gz |
fix specs: RedundantReturn, RedundantSelf, RedundantBegin
department of redundancy department
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/resource.rb')
-rw-r--r-- | lib/chef/resource.rb | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 0335b6f903..40911cd2cc 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -579,7 +579,7 @@ class Chef def load_from(resource) resource.instance_variables.each do |iv| unless iv == :@source_line || iv == :@action || iv == :@not_if || iv == :@only_if - self.instance_variable_set(iv, resource.instance_variable_get(iv)) + instance_variable_set(iv, resource.instance_variable_get(iv)) end end end @@ -739,7 +739,7 @@ class Chef end def self.json_create(o) - resource = self.new(o["instance_vars"]["@name"]) + resource = new(o["instance_vars"]["@name"]) o["instance_vars"].each do |k, v| resource.instance_variable_set("@#{k}".to_sym, v) end @@ -1049,7 +1049,7 @@ class Chef # A::B::BlahDBlah -> blah_d_blah # def self.use_automatic_resource_name - automatic_name = convert_to_snake_case(self.name.split("::")[-1]) + automatic_name = convert_to_snake_case(name.split("::")[-1]) resource_name automatic_name end @@ -1499,7 +1499,7 @@ class Chef if args.size == 1 args.first else - return *args + args end end @@ -1580,14 +1580,12 @@ class Chef # @api private def lookup_provider_constant(name, action = :nothing) - begin - self.class.provider_base.const_get(convert_to_class_name(name.to_s)) - rescue NameError => e - if e.to_s =~ /#{Regexp.escape(self.class.provider_base.to_s)}/ - raise ArgumentError, "No provider found to match '#{name}'" - else - raise e - end + self.class.provider_base.const_get(convert_to_class_name(name.to_s)) + rescue NameError => e + if e.to_s =~ /#{Regexp.escape(self.class.provider_base.to_s)}/ + raise ArgumentError, "No provider found to match '#{name}'" + else + raise e end end |