chef 0.7.10 → 0.7.12

data/distro/redhat/etc/init.d/chef-server

@@ -0,0 +1,77 @@
+#!/bin/bash
+# Startup script for chef-server
+#
+# chkconfig: - 65 35
+# description: Server component of the Chef systems integration framework.
+# processname: chef-server
+#
+# config: /etc/sysconfig/chef-server
+# pidfile: /var/run/chef/chef-server.pid
+
+# Source function library
+. /etc/init.d/functions
+
+[ -f /etc/sysconfig/chef-server ] && . /etc/sysconfig/chef-server
+
+prog="chef-server"
+PIDFILE=/var/run/chef/chef-server.pid
+LOCKFILE=/var/lock/subsys/$prog
+CONFIG=/etc/chef/server.rb
+USER="chef"
+GROUP="chef"
+CLUSTER_NODES=2
+LOGFILE=/var/log/chef/chef-server-merb.log
+OPTIONS=
+
+start() {
+    echo -n "Starting $prog:"
+    daemon chef-server -d -c "$CLUSTER_NODES" -C "$CONFIG" -u "$USER" -G "$GROUP" -L "$LOGFILE" -P "$PIDFILE" "$OPTIONS" ">/dev/null"
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch ${LOCKFILE}
+    return $RETVAL
+}
+
+stop() {
+    echo -n "Stopping $prog: "
+    if [ -f $PIDFILE ]; then
+        killproc chef-server
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+            failure;
+        fi;
+    else
+        RETVAL=1
+        failure;
+    fi
+    rm -f $LOCKFILE
+    echo
+    return $RETVAL
+}
+
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  restart)
+        stop
+        start
+        ;;
+  condrestart)
+        if [ -f $LOCKFILE ]; then
+            stop
+            start
+        fi
+        ;;
+  status)
+        status chef-server
+        ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
+esac
+
+exit $RETVAL

data/lib/chef.rb

@@ -27,7 +27,7 @@ require 'chef/config'
 Dir[File.join(File.dirname(__FILE__), 'chef/mixin/**/*.rb')].sort.each { |lib| require lib }
 
 class Chef
-  VERSION = '0.7.10'
+  VERSION = '0.7.12'
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat

data/lib/chef/client.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -56,6 +57,10 @@ class Chef
     #  * build_node - Get the last known state, merge with local changes
     #  * register - Make sure we have an openid
     #  * authenticate - Authenticate with our openid
+    #  * sync_library_files - Populate the local cache with all the library files
+    #  * sync_provider_files - Populate the local cache with all the provider files
+    #  * sync_resource_files - Populate the local cache with all the resource files
+    #  * sync_attribute_files - Populate the local cache with all the attribute files
     #  * sync_definitions - Populate the local cache with all the definitions
     #  * sync_recipes - Populate the local cache with all the recipes
     #  * do_attribute_files - Populate the local cache with all attributes, and execute them
@@ -75,6 +80,8 @@ class Chef
       build_node(@node_name)
       save_node
       sync_library_files
+      sync_provider_files
+      sync_resource_files
       sync_attribute_files
       sync_definitions
       sync_recipes
@@ -97,7 +104,7 @@ class Chef
     def run_solo
       start_time = Time.now
       Chef::Log.info("Starting Chef Solo Run")
-      
+
       determine_node_name
       build_node(@node_name, true)
       converge(true)
@@ -117,7 +124,7 @@ class Chef
 
     def determine_node_name
       run_ohai
-      unless @safe_name && @node_name
+      unless safe_name && node_name
         @node_name ||= @ohai[:fqdn] ? @ohai[:fqdn] : @ohai[:hostname]
         @safe_name = @node_name.gsub(/\./, '_')
       end
@@ -324,7 +331,29 @@ class Chef
       update_file_cache("libraries", @rest.get_rest("cookbooks/_library_files?node=#{@node.name}"))
       true
     end
+
+    # Gets all the provider files included in all the cookbooks available on the server,
+    # and loads them.
+    #
+    # === Returns
+    # true:: Always returns true
+    def sync_provider_files
+      Chef::Log.debug("Synchronizing providers") 
+      update_file_cache("providers", @rest.get_rest("cookbooks/_provider_files?node=#{@node.name}"))
+      true
+    end
     
+    # Gets all the resource files included in all the cookbooks available on the server,
+    # and loads them.
+    #
+    # === Returns
+    # true:: Always returns true
+    def sync_resource_files
+      Chef::Log.debug("Synchronizing resources")
+      update_file_cache("resources", @rest.get_rest("cookbooks/_resource_files?node=#{@node.name}"))
+      true
+    end
+
     # Gets all the definition files included in all the cookbooks available on the server,
     # and loads them.
     #
@@ -372,13 +401,9 @@ class Chef
         Chef::Config[:cookbook_path] = File.join(Chef::Config[:file_cache_path], "cookbooks")
       end
       compile = Chef::Compile.new(@node)
-      compile.load_libraries
-      compile.load_attributes
-      compile.load_definitions
-      compile.load_recipes
-
+      
       Chef::Log.debug("Converging node #{@safe_name}")
-      cr = Chef::Runner.new(@node, compile.collection)
+      cr = Chef::Runner.new(@node, compile.collection, compile.definitions, compile.cookbook_loader)
       cr.converge
       true
     end

data/lib/chef/compile.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -27,8 +28,8 @@ class Chef
       
     attr_accessor :node, :cookbook_loader, :collection, :definitions
     
-    # Creates a new Chef::Compile object.  This object gets used by the Chef Server to generate
-    # a fully compiled recipe list for a node.
+    # Creates a new Chef::Compile object and populates its fields. This object gets
+    # used by the Chef Server to generate a fully compiled recipe list for a node.
     #
     # === Returns
     # object<Chef::Compile>:: Duh. :)
@@ -40,6 +41,13 @@ class Chef
       @recipes = Array.new
       @default_attributes = Array.new
       @override_attributes = Array.new
+
+      load_libraries
+      load_providers
+      load_resources
+      load_attributes
+      load_definitions
+      load_recipes
     end
     
     # Looks up the node via the "name" argument, first from CouchDB, then by calling
@@ -97,6 +105,30 @@ class Chef
       end
       true
     end
+
+    # Load all the providers, from every cookbook, so they are available when we process
+    # the recipes.
+    #
+    # === Returns
+    # true:: Always returns true
+    def load_providers()
+      @cookbook_loader.each do |cookbook|
+        cookbook.load_providers
+      end
+      true
+    end
+
+    # Load all the resources, from every cookbook, so they are available when we process
+    # the recipes.
+    #
+    # === Returns
+    # true:: Always returns true
+    def load_resources()
+      @cookbook_loader.each do |cookbook|
+        cookbook.load_resources
+      end
+      true
+    end
     
     # Load all the recipes specified in the node data (loaded via load_node, above.)
     # 

data/lib/chef/cookbook.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -19,12 +20,14 @@ require 'chef/log'
 require 'chef/node'
 require 'chef/resource_definition'
 require 'chef/recipe'
+require 'chef/mixin/convert_to_class_name'
 
 class Chef
   class Cookbook
+    include Chef::Mixin::ConvertToClassName
     
     attr_accessor :attribute_files, :definition_files, :template_files, :remote_files, 
-                  :lib_files, :name
+                  :lib_files, :resource_files, :provider_files, :name
     attr_reader :recipe_files
     
     # Creates a new Chef::Cookbook object.  
@@ -40,6 +43,8 @@ class Chef
       @recipe_files = Array.new
       @recipe_names = Hash.new
       @lib_files = Array.new
+      @resource_files = Array.new
+      @provider_files = Array.new
     end
     
     # Loads all the library files in this cookbook via require.
@@ -89,6 +94,28 @@ class Chef
       end
       results
     end
+
+    # Loads all the resources in this cookbook.
+    #
+    # === Returns
+    # true:: Always returns true
+    def load_resources
+      @resource_files.each do |file|
+        Chef::Log.debug("Loading cookbook #{name}'s resources from #{file}")
+        Chef::Resource.build_from_file(name, file)
+      end
+    end
+    
+    # Loads all the providers in this cookbook.
+    #
+    # === Returns
+    # true:: Always returns true
+    def load_providers
+      @provider_files.each do |file|
+        Chef::Log.debug("Loading cookbook #{name}'s providers from #{file}")
+        Chef::Provider.build_from_file(name, file)
+      end
+    end
     
     def recipe_files=(*args)
       @recipe_files = args.flatten
@@ -141,4 +168,4 @@ class Chef
     end
     
   end
-end
+end

data/lib/chef/cookbook_loader.rb

@@ -1,6 +1,9 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2009 Daniel DeLeo
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,74 +32,86 @@ class Chef
     def initialize()
       @cookbook = Hash.new
       @metadata = Hash.new
+      @ignore_regexes = Hash.new { |hsh, key| hsh[key] = Array.new }
       load_cookbooks
     end
     
     def load_cookbooks
       cookbook_settings = Hash.new
-      Chef::Config.cookbook_path.each do |cb_path|
+      [Chef::Config.cookbook_path].flatten.reverse.each do |cb_path|
         Dir[File.join(cb_path, "*")].each do |cookbook|
           next unless File.directory?(cookbook)          
           cookbook_name = File.basename(cookbook).to_sym
           unless cookbook_settings.has_key?(cookbook_name)
             cookbook_settings[cookbook_name] = { 
-              :ignore_regexes => Array.new,
-              :attribute_files => Array.new,
-              :definition_files => Array.new,
-              :recipe_files => Array.new,
-              :template_files => Array.new,
-              :remote_files => Array.new,
-              :lib_files => Array.new,
-              :metadata_files => Array.new
+              :attribute_files  => Hash.new,
+              :definition_files => Hash.new,
+              :recipe_files     => Hash.new,
+              :template_files   => Hash.new,
+              :remote_files     => Hash.new,
+              :lib_files        => Hash.new,
+              :resource_files   => Hash.new,
+              :provider_files   => Hash.new,
+              :metadata_files   => Array.new
             }
           end
           ignore_regexes = load_ignore_file(File.join(cookbook, "ignore"))
-          cookbook_settings[cookbook_name][:ignore_regexes].concat(ignore_regexes)
+          @ignore_regexes[cookbook_name].concat(ignore_regexes)
+          
           load_files_unless_basename(
             File.join(cookbook, "attributes", "*.rb"), 
-            cookbook_settings[cookbook_name][:attribute_files],
-            cookbook_settings[cookbook_name][:ignore_regexes]
+            cookbook_settings[cookbook_name][:attribute_files]
           )
           load_files_unless_basename(
             File.join(cookbook, "definitions", "*.rb"), 
-            cookbook_settings[cookbook_name][:definition_files],
-            cookbook_settings[cookbook_name][:ignore_regexes]
+            cookbook_settings[cookbook_name][:definition_files]
           )
           load_files_unless_basename(
             File.join(cookbook, "recipes", "*.rb"), 
-            cookbook_settings[cookbook_name][:recipe_files],
-            cookbook_settings[cookbook_name][:ignore_regexes]
+            cookbook_settings[cookbook_name][:recipe_files]
           )
           load_files_unless_basename(
             File.join(cookbook, "libraries", "*.rb"),               
-            cookbook_settings[cookbook_name][:lib_files],
-            cookbook_settings[cookbook_name][:ignore_regexes]
+            cookbook_settings[cookbook_name][:lib_files]
           )
           load_cascading_files(
             "*.erb",
             File.join(cookbook, "templates"),
-            cookbook_settings[cookbook_name][:template_files],
-            cookbook_settings[cookbook_name][:ignore_regexes]
+            cookbook_settings[cookbook_name][:template_files]
           )
           load_cascading_files(
             "*",
             File.join(cookbook, "files"),
-            cookbook_settings[cookbook_name][:remote_files],
-            cookbook_settings[cookbook_name][:ignore_regexes]
+            cookbook_settings[cookbook_name][:remote_files]
           )
+          load_cascading_files(
+            "*.rb",
+            File.join(cookbook, "resources"),
+            cookbook_settings[cookbook_name][:resource_files]
+          )
+          load_cascading_files(
+            "*.rb",
+            File.join(cookbook, "providers"),
+            cookbook_settings[cookbook_name][:provider_files]
+          )
+
           if File.exists?(File.join(cookbook, "metadata.json"))
             cookbook_settings[cookbook_name][:metadata_files] << File.join(cookbook, "metadata.json")
           end
         end
       end
+      remove_ignored_files_from(cookbook_settings)
+      
       cookbook_settings.each_key do |cookbook|
         @cookbook[cookbook] = Chef::Cookbook.new(cookbook)
-        @cookbook[cookbook].attribute_files = cookbook_settings[cookbook][:attribute_files]
-        @cookbook[cookbook].definition_files = cookbook_settings[cookbook][:definition_files]
-        @cookbook[cookbook].recipe_files = cookbook_settings[cookbook][:recipe_files]
-        @cookbook[cookbook].template_files = cookbook_settings[cookbook][:template_files]
-        @cookbook[cookbook].remote_files = cookbook_settings[cookbook][:remote_files]
-        @cookbook[cookbook].lib_files = cookbook_settings[cookbook][:lib_files]
+        @cookbook[cookbook].attribute_files = cookbook_settings[cookbook][:attribute_files].values
+        @cookbook[cookbook].definition_files = cookbook_settings[cookbook][:definition_files].values
+        @cookbook[cookbook].recipe_files = cookbook_settings[cookbook][:recipe_files].values
+        @cookbook[cookbook].template_files = cookbook_settings[cookbook][:template_files].values
+        @cookbook[cookbook].remote_files = cookbook_settings[cookbook][:remote_files].values
+        @cookbook[cookbook].lib_files = cookbook_settings[cookbook][:lib_files].values
+        @cookbook[cookbook].resource_files = cookbook_settings[cookbook][:resource_files].values
+        @cookbook[cookbook].provider_files = cookbook_settings[cookbook][:provider_files].values
         @metadata[cookbook] = Chef::Cookbook::Metadata.new(@cookbook[cookbook])
         cookbook_settings[cookbook][:metadata_files].each do |meta_json|
           @metadata[cookbook].from_json(IO.read(meta_json))
@@ -133,35 +148,32 @@ class Chef
         results
       end
       
-      def load_cascading_files(file_glob, base_path, result_array, ignore_regexes)
-        # To handle dotfiles like .ssh
-        Dir.glob(File.join(base_path, "**/#{file_glob}"), File::FNM_DOTMATCH).each do |file|
-          next if skip_file(file, ignore_regexes)
-          file =~ /^#{base_path}\/(.+)$/
-          singlecopy = $1
-          unless result_array.detect { |f| f =~ /#{singlecopy}$/ }
-            result_array << file
+      def remove_ignored_files_from(cookbook_settings)
+        file_types_to_inspect = [ :attribute_files, :definition_files, :recipe_files, :template_files, 
+                                  :remote_files, :lib_files, :resource_files, :provider_files]
+        
+        @ignore_regexes.each do |cookbook_name, regexes|
+          regexes.each do |regex|
+            settings = cookbook_settings[cookbook_name]
+            file_types_to_inspect.each do |file_type|
+              settings[file_type].delete_if { |uniqname, fullpath| fullpath.match(regex) }
+            end
           end
         end
       end
       
-      def load_files_unless_basename(file_glob, result_array, ignore_regexes)
-        Dir[file_glob].each do |file|
-          next if skip_file(file, ignore_regexes)
-          file_basename = File.basename(file)
-          # If we've seen a file with this basename before, skip it.
-          unless result_array.detect { |f| File.basename(f) == file_basename }  
-            result_array << file
-          end
+      def load_cascading_files(file_glob, base_path, result_hash)
+        rm_base_path = /^#{base_path}\/(.+)$/
+        # To handle dotfiles like .ssh
+        Dir.glob(File.join(base_path, "**/#{file_glob}"), File::FNM_DOTMATCH).each do |file|
+          result_hash[rm_base_path.match(file)[1]] = file
         end
       end
       
-      def skip_file(file, ignore_regexes)
-        skip = false
-        ignore_regexes.each do |exp|
-          skip = true if exp.match(file)
+      def load_files_unless_basename(file_glob, result_hash)
+        Dir[file_glob].each do |file|
+          result_hash[File.basename(file)] = file
         end
-        skip
       end
       
   end