hound fixess

Author: Sumit Jamgade

chef/cookbooks/barclamp/libraries/barclamp_library.rb

@@ -420,11 +420,12 @@ def self.size_to_bytes(s)
     class DependsOn
       class << self
         def add(dependency)
-            @recipe_depedancies ||= Mash.new
-            @recipe_depedancies.merge!(dependency)
+          @recipe_depedencies ||= Mash.new
+          @recipe_depedencies.merge!(dependency)
         end
+
         def get(recipe)
-            @recipe_depedancies.fetch(recipe, [])
+          @recipe_depedencies.fetch(recipe, [])
         end
       end
     end
@@ -440,28 +441,26 @@ def last_two_configs(group, barclamp, instance)
         end
 
         def loadattr(hash, attrlist)
-          i=0
+          i = 0
+          return hash unless attlist.length > 0
           while hash.is_a?(Hash)
-            if hash.key?(attrlist[i])
-              hash = hash[attrlist[i]]
-              Chef::Log.debug("smart loadattr #{attrlist[i]}, #{hash}")
-              i+=1
-              return hash if attrlist.length == i
-            else
-              return nil
-            end
+            return nil unless hash.key?(attrlist[i])
+            hash = hash[attrlist[i]]
+            Chef::Log.debug("smart loadattr #{attrlist[i]}, #{hash}")
+            i += 1
+            return hash if attrlist.length == i
           end
         end
 
-        def has_changes_to_apply(depedency, group="openstack" ,instance = nil)
+        def changes_to_apply?(depedency, group = "openstack", instance = nil)
           barclamp = depedency.shift
           prev_cfg, curr_cfg = Barclamp::Config.last_two_configs(group, barclamp, instance)
           old = loadattr(prev_cfg, depedency)
           new = loadattr(curr_cfg, depedency)
           Chef::Log.debug("smart loadattr prev #{depedency}, #{prev_cfg}")
           Chef::Log.debug("smart loadattr curr #{depedency}, #{curr_cfg.inspect}")
           Chef::Log.debug("smart comparisoin #{old}, #{new}")
-          return old != new
+          old != new
         end
 
         def load(group, barclamp, instance = nil)

chef/cookbooks/barclamp/libraries/smartroles.rb

@@ -1,24 +1,22 @@
-require 'chef/mixin/language_include_recipe'
+require "chef/mixin/language_include_recipe"
 
 class Chef
   module Mixin
     module LanguageIncludeRecipe
       def include_recipe_smartly(*list_of_recipes)
-        for recipe in list_of_recipes
-          included=false
-          for dependency in BarclampLibrary::Barclamp::DependsOn.get(recipe)
-            if BarclampLibrary::Barclamp::Config.has_changes_to_apply(dependency)
-              Chef::Log.info("smart including recipe: #{recipe}")
-              Chef::Log.debug("due to change in: #{dependency}")
-              include_recipe recipe
-              included=true
-              break
-            end # if
-          end # for
+        list_of_recipes.each do |recipe|
+          included = false
+          BarclampLibrary::Barclamp::DependsOn.get(recipe).each do |dependency|
+            next unless BarclampLibrary::Barclamp::Config.changes_to_apply?(dependency)
+            Chef::Log.info("smart including recipe: #{recipe}")
+            Chef::Log.debug("due to change in: #{dependency}")
+            include_recipe recipe
+            included = true
+            break
+          end # each
           Chef::Log.info("recipe excluded: #{recipe}") unless included
-        end # for
+        end # each
       end # def include_recipe_smartly
     end
   end
 end
-