Merge branch 'master' of git@github.com:hjkp/chef

Author: Ezra Zygmuntowicz

chef-server/lib/controllers/application.rb

@@ -18,7 +18,6 @@
 
 require "chef" / "mixin" / "checksum"
 
-
 class Application < Merb::Controller
 
   def fix_up_node_id

chef-server/lib/controllers/cookbook_files.rb

@@ -42,6 +42,7 @@ def load_cookbook_files()
         :file => full,
       }
     end
+    Chef::Log.debug("Remote files found: #{@remote_files.inspect}")
     @remote_files
   end
 
@@ -72,7 +73,6 @@ def show
   end
 
   def show_directory
-    Chef::Log.info("totally rocking hte show_directory")
     dir_to_send = find_preferred_file
     unless (dir_to_send && File.directory?(dir_to_send))
       raise NotFound, "Cannot find a suitable directory"

chef-server/lib/controllers/openid_register.rb

@@ -41,7 +41,7 @@ def show
         raise e
       end
     end
-     Merb.logger.debug(@registered_node.inspect)
+     Chef::Log.debug(@registered_node.inspect)
      display @registered_node
   end
 

chef-server/lib/controllers/openid_server.rb

@@ -141,7 +141,7 @@ def decision
     session[:last_oidreq] = nil
 
     if params.has_key?(:cancel)
-      Merb.logger.info("Cancelling OpenID Authentication")
+      Chef::Log.info("Cancelling OpenID Authentication")
       return(redirect(oidreq.cancel_url))
     else      
       identity = oidreq.identity

chef-server/lib/init.rb

@@ -151,7 +151,7 @@
   c[:log_stream] = STDOUT
 end
 
-Merb.logger.info("Compiling routes...")
+Chef::Log.info("Compiling routes...")
 Merb::Router.prepare do |r|
   # RESTful routes
   # r.resources :posts
@@ -169,7 +169,7 @@
   match("/cookbooks/_attribute_files").to(:controller => "cookbooks", :action => "attribute_files")
   match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "recipe_files")
   match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "definition_files")
-  Merb.logger.info("Seriously, what the fuck")
+  Chef::Log.info("Seriously, what the fuck")
   match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "library_files")
 
 #  r.match("/cookbooks/:cookbook_id/templates").to(:controller => "cookbook_templates", :action => "index")
@@ -208,5 +208,3 @@
   # Change this for your home page to be available at /
   match('/').to(:controller => 'nodes', :action =>'index').name(:top)
 end
-
-puts "I have loaded my app?"

chef/lib/chef/client.rb

@@ -61,10 +61,10 @@ def run
       build_node
       register
       authenticate
+      sync_library_files
+      sync_attribute_files
       sync_definitions
       sync_recipes
-      do_library_files
-      do_attribute_files
       save_node
       converge
       save_node
@@ -75,9 +75,15 @@ def run
     end
 
     def run_solo
+      start_time = Time.now
+      Chef::Log.info("Starting Chef Solo Run")
+      
       build_node
       do_attribute_files
       converge
+      
+      end_time = Time.now
+      Chef::Log.info("Chef Run complete in #{end_time - start_time} seconds")
       true
     end
 
@@ -246,15 +252,9 @@ def update_file_cache(segment, remote_list)
     #
     # === Returns
     # true:: Always returns true
-    def do_attribute_files
+    def sync_attribute_files
       Chef::Log.debug("Synchronizing attributes")
       update_file_cache("attributes", @rest.get_rest('cookbooks/_attribute_files'))
-      Chef::FileCache.list.sort.each do |cache_file|
-        if cache_file.match("cookbooks/.+?/attributes")
-          Chef::Log.debug("Executing #{cache_file}")
-          @node.from_file(Chef::FileCache.load(cache_file, false))
-        end
-      end
       true
     end
 
@@ -263,15 +263,9 @@ def do_attribute_files
     #
     # === Returns
     # true:: Always returns true
-    def do_library_files
+    def sync_library_files
       Chef::Log.debug("Synchronizing libraries")
       update_file_cache("libraries", @rest.get_rest('cookbooks/_library_files'))
-      Chef::FileCache.list.each do |cache_file|
-        if cache_file.match("cookbooks/.+?/libraries")
-          Chef::Log.debug("Requiring #{cache_file}")
-          require Chef::FileCache.load(cache_file, false)
-        end
-      end
       true
     end
 
@@ -305,10 +299,12 @@ def converge
       Chef::Config[:cookbook_path] = File.join(Chef::Config[:file_cache_path], "cookbooks")
       compile = Chef::Compile.new()
       compile.node = @node
+      compile.load_libraries
+      compile.load_attributes
       compile.load_definitions
       compile.load_recipes
 
-      Chef::Log.debug("Executing recipes for node #{@safe_name}")
+      Chef::Log.debug("Converging node #{@safe_name}")
       cr = Chef::Runner.new(@node, compile.collection)
       cr.converge
       true

chef/lib/chef/compile.rb

@@ -41,6 +41,14 @@ def load_node(name)
       @node
     end
 
+    # Load all the attributes, from every cookbook
+    def load_attributes()
+      @cookbook_loader.each do |cookbook|
+        cookbook.load_attributes(@node)
+      end
+      true
+    end
+    
     # Load all the definitions, from every cookbook, so they are available when we process
     # the recipes.
     #
@@ -52,12 +60,23 @@ def load_definitions()
       end
     end
 
+    # Load all the libraries, from every cookbook, so they are available when we process
+    # the recipes.
+    #
+    def load_libraries()
+      @cookbook_loader.each do |cookbook|
+        cookbook.load_libraries
+      end
+      true
+    end
+    
     # Load all the recipes specified in the node data (loaded via load_node, above.)
     # 
     # The results are available via the collection accessor (which returns a Chef::ResourceCollection 
     # object)
     def load_recipes
       @node.recipes.each do |recipe|
+        Chef::Log.debug("Loading Recipe #{recipe}")
         rmatch = recipe.match(/(.+?)::(.+)/)
         if rmatch
          cookbook = @cookbook_loader[rmatch[1]]

chef/lib/chef/cookbook.rb

@@ -31,10 +31,9 @@ def initialize(name)
       @recipe_files = Array.new
       @recipe_names = Hash.new
       @lib_files = Array.new
-      @loaded_attributes = false
     end
 
-    def load_libs
+    def load_libraries
       @lib_files.each do |file|
         Chef::Log.debug("Loading cookbook #{name} library file: #{file}")
         require file
@@ -46,9 +45,9 @@ def load_attributes(node)
         raise ArgumentError, "You must pass a Chef::Node to load_attributes!"
       end
       @attribute_files.each do |file|
+        Chef::Log.debug("Loading attributes from #{file}")
         node.from_file(file)
       end
-      @loaded_atributes = true
       node
     end
 
@@ -107,9 +106,6 @@ def load_recipe(name, node, collection=nil, definitions=nil, cookbook_loader=nil
         raise ArgumentError, "Cannot find a recipe matching #{recipe_name} in cookbook #{@name}"
       end
       Chef::Log.debug("Found recipe #{recipe_name} in cookbook #{cookbook_name}") if Chef::Log.debug?
-      unless @loaded_attributes
-        load_attributes(node)
-      end
       recipe = Chef::Recipe.new(cookbook_name, recipe_name, node, 
                                 collection, definitions, cookbook_loader)
       recipe.from_file(@recipe_files[@recipe_names[recipe_name]])

chef/lib/chef/log.rb

@@ -23,7 +23,7 @@ class Log
     @logger = nil
 
     class << self
-      attr_reader :logger #:nodoc
+      attr_accessor :logger #:nodoc
 
       # Use Chef::Logger.init when you want to set up the logger manually.  Arguments to this method
       # get passed directly to Logger.new, so check out the documentation for the standard Logger class

chef/lib/chef/node.rb

@@ -179,14 +179,14 @@ def method_missing(symbol, *args)
 
     def to_index
       index_hash = {
-        :index_name => "node",
-        :id => "node_#{@name}",
-        :name => @name,
+        "index_name" => "node",
+        "id" => "node_#{@name}",
+        "name" => @name,
       }
       @attribute.each do |key, value|
         index_hash[key] = value
       end
-      index_hash[:recipe] = @recipe_list if @recipe_list.length > 0
+      index_hash["recipe"] = @recipe_list if @recipe_list.length > 0
       index_hash
     end