chef_util.rb in cloud-toaster-1.1.5

- old
+ new

@@ -159,13 +159,12 @@
       root_dir = Util.project_root_dir()
       puts "DEBUG: Writing Chef configuration (cookbook_path) to '#{solo_file}'"
       Util.write(solo_file, (<<-EOF
       cookbook_path [
         "#{File.expand_path(File.join(Dir.pwd, "cookbooks"))}",
-        "#{File.expand_path(Dir.pwd)}",
-        "#{File.join(root_dir, "chef", "cookbooks")}",
-        "#{@@DEFAULT_COOKBOOKS_DIR}"
+        "#{@@DEFAULT_COOKBOOKS_DIR}",
+        "#{File.join(root_dir, "chef", "cookbooks")}"
       ]
     EOF
     ), true)
     end
 
@@ -807,10 +806,9 @@
           code = read_sourcecode_from_line(recipe_file, line + 1)
           if !code
             puts "WARN: Could not parse code file #{recipe_file} : #{line + 1}"
           else
             resource_obj = ResourceInspector.get_resource_from_source(code, attributes_source)
-            puts "received resource_obj: #{resource_obj}"
             result[cookbook][recipe_name]["resources"][line] = code
             result[cookbook][recipe_name]["resource_objs"][line] = resource_obj
             if !code.match(/not_if\s*/) && !code.match(/only_if\s*/)
               resource_type = code.split("\n")[0].gsub(/^\s*([a-zA-Z0-9_\-]*)\s+(.*)\s+((do)|\{).*$/, '\1')
               if script_resource_names.include?(resource_type)