hound fixes and refactor

crowbar · Jan 22, 2019 · e8a34bf · e8a34bf
1 parent 319518b
commit e8a34bf
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/chef/cookbooks/barclamp/libraries/barclamp_library.rb b/chef/cookbooks/barclamp/libraries/barclamp_library.rb
@@ -444,17 +444,17 @@ def last_two_configs(group, barclamp, instance)
 
         def loadattr(hash, attrlist)
           i = 0
-          return hash unless attrlist.length > 0
+          return hash if attrlist.empty?
           while hash.respond_to?(:[])
-            unless hash.has_key?(attrlist[i])
-               Chef::Log.debug("[smart] hash is missing #{attrlist[i]}")
-               return nil
+            unless hash.key?(attrlist[i])
+              Chef::Log.debug("[smart] hash is missing #{attrlist[i]}")
+              return nil
             end
             hash = hash[attrlist[i]]
             i += 1
             if attrlist.length == i
-                # Chef::Log.debug("[smart] loadattr return #{hash}")
-                return hash
+              # Chef::Log.debug("[smart] loadattr return #{hash}")
+              return hash
             end
           end
           Chef::Log.debug("[smart] hash does not respond to []")