chef 0.8.16 → 0.9.0.a3

data/lib/chef/config.rb

@@ -103,13 +103,15 @@ class Chef
     client_registration_retries 5
     cookbook_path [ "/var/chef/cookbooks", "/var/chef/site-cookbooks" ]
     cookbook_tarball_path "/var/chef/cookbook-tarballs"
+    sandbox_path "/var/chef/sandboxes"
+    checksum_path "/var/chef/checksums"
     couchdb_database "chef"
     couchdb_url "http://localhost:5984"
     couchdb_version nil
     delay 0
     executable_path ENV['PATH'] ? ENV['PATH'].split(File::PATH_SEPARATOR) : []
     file_cache_path "/var/chef/cache"
-    file_backup_path nil
+    file_backup_path "/var/chef/backup"
     group nil
     http_retry_count 5
     http_retry_delay 5
@@ -191,6 +193,12 @@ class Chef
     signing_ca_domain "opensource.opscode.com"
     signing_ca_email "opensource-cert@opscode.com"
 
+    # Report Handlers
+    report_handlers []
+
+    # Exception Handlers
+    exception_handlers []
+
     # Checksum Cache
     # Uses Moneta on the back-end
     cache_type "BasicFile"

data/lib/chef/cookbook/cookbook_collection.rb

@@ -0,0 +1,43 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'extlib'
+
+# This class is the consistent interface for a node to obtain its
+# cookbooks by name.
+#
+# This class is basically a glorified Hash, but since there are
+# several ways this cookbook information is collected,
+# (e.g. CookbookLoader for solo, hash of auto-vivified Cookbook
+# objects for lazily-loaded remote cookbooks), it gets transformed
+# into this.
+class Chef
+  class CookbookCollection < Mash
+
+    # The input is a mapping of cookbook name to CookbookVersion objects. We
+    # simply extract them
+    def initialize(cookbook_versions={})
+      super() do |hash, key|
+        raise Chef::Exceptions::CookbookNotFound, "Cookbook #{key} not found"
+      end
+      cookbook_versions.each{ |cookbook_name, cookbook_version| self[cookbook_name] = cookbook_version }
+    end
+    
+  end
+end

data/lib/chef/cookbook/file_system_file_vendor.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/cookbook/file_vendor'
+
+# This FileVendor loads files from Chef::Config.cookbook_path. The
+# thing that's sort of janky about this FileVendor implementation is
+# that it basically takes only the cookbook's name from the manifest
+# and throws the rest away then re-builds the list of files on the
+# disk. This is due to the manifest not having the on-disk file
+# locations, since in the chef-client case, that information is
+# non-sensical.
+class Chef
+  class Cookbook
+    class FileSystemFileVendor < FileVendor
+      
+      def initialize(manifest)
+        @cookbook_name = manifest[:cookbook_name]
+      end
+      
+      # Implements abstract base's requirement. It looks in the
+      # Chef::Config.cookbook_path file hierarchy for the requested
+      # file.
+      def get_filename(filename)
+        location = Array(Chef::Config.cookbook_path).inject(nil) do |memo, basepath|
+          candidate_location = File.join(basepath, @cookbook_name, filename)
+          memo = candidate_location if File.exist?(candidate_location)
+          memo
+        end
+        raise "File #{filename} does not exist for cookbook #{@cookbook_name}" unless location
+        
+        location
+      end
+      
+    end
+  end
+end

data/lib/chef/cookbook/file_vendor.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+# This class handles fetching of cookbook files based on specificity.
+class Chef
+  class Cookbook
+    class FileVendor
+
+      def self.on_create(&block)
+        @instance_creator = block
+      end
+      
+      # Factory method that creates the appropriate kind of
+      # Cookbook::FileVendor to serve the contents of the manifest
+      def self.create_from_manifest(manifest)
+        raise "Must call Chef::Cookbook::FileVendor.on_create before calling create_from_manifest factory" unless defined?(@instance_creator)
+        @instance_creator.call(manifest)
+      end
+      
+      # Gets the on-disk location for the given cookbook file.
+      #
+      # Subclasses are responsible for determining exactly how the
+      # files are obtained and where they are stored.
+      def get_filename(filename)
+        raise NotImplemented, "Subclasses must implement this method"
+      end
+      
+    end
+  end
+end

data/lib/chef/cookbook/metadata.rb

@@ -31,7 +31,7 @@ class Chef
       include Chef::Mixin::ParamsValidate
       include Chef::Mixin::FromFile
 
-      attr_accessor :cookbook, 
+      attr_reader   :cookbook, 
                     :platforms,
                     :dependencies,
                     :recommendations,
@@ -74,7 +74,7 @@ class Chef
         @recipes = Mash.new
         @version = Version.new "0.0.0"
         if cookbook
-          @recipes = cookbook.recipes.inject({}) do |r, e| 
+          @recipes = cookbook.fully_qualified_recipe_names.inject({}) do |r, e| 
             e = self.name if e =~ /::default$/ 
             r[e] = ""
             self.provides e
@@ -367,23 +367,23 @@ class Chef
 
       def to_json(*a)
         result = {
-          :name => self.name,
-          :description => self.description,
+          :name             => self.name,
+          :description      => self.description,
           :long_description => self.long_description,
-          :maintainer => self.maintainer,
+          :maintainer       => self.maintainer,
           :maintainer_email => self.maintainer_email,
-          :license => self.license,
-          :platforms => self.platforms,
-          :dependencies => self.dependencies,
-          :recommendations => self.recommendations,
-          :suggestions => self.suggestions,
-          :conflicting => self.conflicting,
-          :providing => self.providing,
-          :replacing => self.replacing,
-          :attributes => self.attributes,
-          :groupings => self.groupings,
-          :recipes => self.recipes,
-          :version => self.version
+          :license          => self.license,
+          :platforms        => self.platforms,
+          :dependencies     => self.dependencies,
+          :recommendations  => self.recommendations,
+          :suggestions      => self.suggestions,
+          :conflicting      => self.conflicting,
+          :providing        => self.providing,
+          :replacing        => self.replacing,
+          :attributes       => self.attributes,
+          :groupings        => self.groupings,
+          :recipes          => self.recipes,
+          :version          => self.version
         }
         result.to_json(*a)
       end
@@ -395,24 +395,23 @@ class Chef
       end
 
       def from_hash(o)
-        self.name o['name'] if o.has_key?('name')
-        self.description o['description'] if o.has_key?('description')
-        self.long_description o['long_description'] if o.has_key?('long_description')
-        self.maintainer o['maintainer'] if o.has_key?('maintainer')
-        self.maintainer_email o['maintainer_email'] if o.has_key?('maintainer_email')
-        self.license o['license'] if o.has_key?('license')
-        self.version o['version'] if o.has_key?('version')
-        self.platforms = o['platforms'] if o.has_key?('platforms')
-        self.dependencies = o['dependencies'] if o.has_key?('dependencies')
-        self.recommendations = o['recommendations'] if o.has_key?('recommendations')
-        self.suggestions = o['suggestions'] if o.has_key?('suggestions')
-        self.conflicting = o['conflicting'] if o.has_key?('conflicting')
-        self.providing = o['providing'] if o.has_key?('providing')
-        self.replacing = o['replacing'] if o.has_key?('replacing')
-        self.attributes = o['attributes'] if o.has_key?('attributes')
-        self.groupings = o['groupings'] if o.has_key?('groupings')
-        self.recipes = o['recipes'] if o.has_key?('recipes')
-        self.version = o['version'] if o.has_key?('version')
+        @name                         = o['name'] if o.has_key?('name')
+        @description                  = o['description'] if o.has_key?('description')
+        @long_description             = o['long_description'] if o.has_key?('long_description')
+        @maintainer                   = o['maintainer'] if o.has_key?('maintainer')
+        @maintainer_email             = o['maintainer_email'] if o.has_key?('maintainer_email')
+        @license                      = o['license'] if o.has_key?('license')
+        @platforms                    = o['platforms'] if o.has_key?('platforms')
+        @dependencies                 = o['dependencies'] if o.has_key?('dependencies')
+        @recommendations              = o['recommendations'] if o.has_key?('recommendations')
+        @suggestions                  = o['suggestions'] if o.has_key?('suggestions')
+        @conflicting                  = o['conflicting'] if o.has_key?('conflicting')
+        @providing                    = o['providing'] if o.has_key?('providing')
+        @replacing                    = o['replacing'] if o.has_key?('replacing')
+        @attributes                   = o['attributes'] if o.has_key?('attributes')
+        @groupings                    = o['groupings'] if o.has_key?('groupings')
+        @recipes                      = o['recipes'] if o.has_key?('recipes')
+        @version                      = o['version'] if o.has_key?('version')
         self
       end
 

data/lib/chef/cookbook/metadata/version.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/cookbook'
+require 'chef/cookbook_version'
 require 'chef/cookbook/metadata'
 
 class Chef::Cookbook::Metadata

data/lib/chef/cookbook_loader.rb

@@ -19,7 +19,7 @@
 # limitations under the License.
 
 require 'chef/config'
-require 'chef/cookbook'
+require 'chef/cookbook_version'
 require 'chef/cookbook/metadata'
 
 class Chef
@@ -30,7 +30,7 @@ class Chef
     include Enumerable
     
     def initialize()
-      @cookbook = Hash.new
+      @cookbooks_by_name = Hash.new
       @metadata = Hash.new
       @ignore_regexes = Hash.new { |hsh, key| hsh[key] = Array.new }
       load_cookbooks
@@ -39,20 +39,22 @@ class Chef
     def load_cookbooks
       cookbook_settings = Hash.new
       [Chef::Config.cookbook_path].flatten.each do |cb_path|
+        cb_path = File.expand_path(cb_path)
         Dir[File.join(cb_path, "*")].each do |cookbook|
-          next unless File.directory?(cookbook)          
+          next unless File.directory?(cookbook)
           cookbook_name = File.basename(cookbook).to_sym
           unless cookbook_settings.has_key?(cookbook_name)
             cookbook_settings[cookbook_name] = { 
-              :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
+              :attribute_filenames  => Hash.new,
+              :definition_filenames => Hash.new,
+              :recipe_filenames     => Hash.new,
+              :template_filenames   => Hash.new,
+              :file_filenames       => Hash.new,
+              :library_filenames    => Hash.new,
+              :resource_filenames   => Hash.new,
+              :provider_filenames   => Hash.new,
+              :root_filenames       => Hash.new,
+              :metadata_filenames   => Array.new
             }
           end
           ignore_regexes = load_ignore_file(File.join(cookbook, "ignore"))
@@ -60,84 +62,99 @@ class Chef
           
           load_files_unless_basename(
             File.join(cookbook, "attributes", "*.rb"), 
-            cookbook_settings[cookbook_name][:attribute_files]
+            cookbook_settings[cookbook_name][:attribute_filenames]
           )
           load_files_unless_basename(
             File.join(cookbook, "definitions", "*.rb"), 
-            cookbook_settings[cookbook_name][:definition_files]
+            cookbook_settings[cookbook_name][:definition_filenames]
           )
           load_files_unless_basename(
             File.join(cookbook, "recipes", "*.rb"), 
-            cookbook_settings[cookbook_name][:recipe_files]
+            cookbook_settings[cookbook_name][:recipe_filenames]
           )
           load_files_unless_basename(
             File.join(cookbook, "libraries", "*.rb"),               
-            cookbook_settings[cookbook_name][:lib_files]
+            cookbook_settings[cookbook_name][:library_filenames]
           )
           load_cascading_files(
             "*",
             File.join(cookbook, "templates"),
-            cookbook_settings[cookbook_name][:template_files]
+            cookbook_settings[cookbook_name][:template_filenames]
           )
           load_cascading_files(
             "*",
             File.join(cookbook, "files"),
-            cookbook_settings[cookbook_name][:remote_files]
+            cookbook_settings[cookbook_name][:file_filenames]
           )
           load_cascading_files(
             "*.rb",
             File.join(cookbook, "resources"),
-            cookbook_settings[cookbook_name][:resource_files]
+            cookbook_settings[cookbook_name][:resource_filenames]
           )
           load_cascading_files(
             "*.rb",
             File.join(cookbook, "providers"),
-            cookbook_settings[cookbook_name][:provider_files]
+            cookbook_settings[cookbook_name][:provider_filenames]
+          )
+          load_files(
+            "*",
+            cookbook,
+            cookbook_settings[cookbook_name][:root_filenames]
           )
-
           if File.exists?(File.join(cookbook, "metadata.json"))
-            cookbook_settings[cookbook_name][:metadata_files] << File.join(cookbook, "metadata.json")
+            cookbook_settings[cookbook_name][:metadata_filenames] << 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].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|
+        @cookbooks_by_name[cookbook] = Chef::CookbookVersion.new(cookbook)
+        @cookbooks_by_name[cookbook].attribute_filenames = cookbook_settings[cookbook][:attribute_filenames].values
+        @cookbooks_by_name[cookbook].definition_filenames = cookbook_settings[cookbook][:definition_filenames].values
+        @cookbooks_by_name[cookbook].recipe_filenames = cookbook_settings[cookbook][:recipe_filenames].values
+        @cookbooks_by_name[cookbook].template_filenames = cookbook_settings[cookbook][:template_filenames].values
+        @cookbooks_by_name[cookbook].file_filenames = cookbook_settings[cookbook][:file_filenames].values
+        @cookbooks_by_name[cookbook].library_filenames = cookbook_settings[cookbook][:library_filenames].values
+        @cookbooks_by_name[cookbook].resource_filenames = cookbook_settings[cookbook][:resource_filenames].values
+        @cookbooks_by_name[cookbook].provider_filenames = cookbook_settings[cookbook][:provider_filenames].values
+        @cookbooks_by_name[cookbook].root_filenames = cookbook_settings[cookbook][:root_filenames].values
+        @cookbooks_by_name[cookbook].metadata_filenames = cookbook_settings[cookbook][:metadata_filenames]
+        @metadata[cookbook] = Chef::Cookbook::Metadata.new(@cookbooks_by_name[cookbook])
+        cookbook_settings[cookbook][:metadata_filenames].each do |meta_json|
           begin
             @metadata[cookbook].from_json(IO.read(meta_json))
           rescue JSON::ParserError
-            puts "Couldn't parse JSON in " + meta_json
+            Chef::Log.fatal("Couldn't parse JSON in " + meta_json)
             raise
           end
         end
+        @cookbooks_by_name[cookbook].metadata = @metadata[cookbook]
       end
     end
     
     def [](cookbook)
-      if @cookbook.has_key?(cookbook.to_sym)
-        @cookbook[cookbook.to_sym]
+      if @cookbooks_by_name.has_key?(cookbook.to_sym)
+        @cookbooks_by_name[cookbook.to_sym]
       else
         raise ArgumentError, "Cannot find a cookbook named #{cookbook.to_s}; did you forget to add metadata to a cookbook? (http://wiki.opscode.com/display/chef/Metadata)"
       end
     end
+
+    def has_key?(cookbook_name)
+      @cookbooks_by_name.has_key?(cookbook_name)
+    end
     
     def each
-      @cookbook.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |cname|
-        yield @cookbook[cname]
+      @cookbooks_by_name.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |cname|
+        yield(cname, @cookbooks_by_name[cname])
       end
     end
 
+    def values
+      @cookbooks_by_name.values
+    end
+
     private
     
       def load_ignore_file(ignore_file)
@@ -154,8 +171,8 @@ class Chef
       end
       
       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]
+        file_types_to_inspect = [ :attribute_filenames, :definition_filenames, :recipe_filenames, :template_filenames, 
+                                  :file_filenames, :library_filenames, :resource_filenames, :provider_filenames]
         
         @ignore_regexes.each do |cookbook_name, regexes|
           regexes.each do |regex|
@@ -166,15 +183,23 @@ class Chef
           end
         end
       end
-      
-      def load_cascading_files(file_glob, base_path, result_hash)
-        rm_base_path = /^#{base_path}\/(.+)$/
+
+      def load_files(file_glob, base_path, result_hash, recursive=false)
+        rm_base_path = /^#{Regexp.escape(base_path)}\/(.+)$/
+        file_spec = [base_path]
+        file_spec << "**" if recursive
+        file_spec << file_glob
         # To handle dotfiles like .ssh
-        Dir.glob(File.join(base_path, "**/#{file_glob}"), File::FNM_DOTMATCH).each do |file|
+        Dir.glob(File.join(file_spec), File::FNM_DOTMATCH).each do |file|
+          next if File.directory?(file)
           result_hash[rm_base_path.match(file)[1]] = file
         end
       end
       
+      def load_cascading_files(file_glob, base_path, result_hash)
+        load_files(file_glob, base_path, result_hash, true)
+      end
+      
       def load_files_unless_basename(file_glob, result_hash)
         Dir[file_glob].each do |file|
           result_hash[File.basename(file)] = file