chef 0.8.10 → 0.8.14

data/lib/chef/node.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -22,6 +22,7 @@ require 'chef/mixin/check_helper'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/from_file'
 require 'chef/mixin/language_include_attribute'
+require 'chef/mixin/deep_merge'
 require 'chef/couchdb'
 require 'chef/rest'
 require 'chef/run_list'
@@ -32,24 +33,24 @@ require 'json'
 
 class Chef
   class Node
-    
+
     attr_accessor :attribute, :recipe_list, :couchdb, :couchdb_rev, :run_state, :run_list, :override_attrs, :default_attrs, :cookbook_loader
     attr_reader :node
     attr_reader :couchdb_id
-    
+
     include Chef::Mixin::CheckHelper
     include Chef::Mixin::FromFile
     include Chef::Mixin::ParamsValidate
     include Chef::Mixin::LanguageIncludeAttribute
     include Chef::IndexQueue::Indexable
-    
+
     DESIGN_DOCUMENT = {
       "version" => 9,
       "language" => "javascript",
       "views" => {
         "all" => {
           "map" => <<-EOJS
-          function(doc) { 
+          function(doc) {
             if (doc.chef_type == "node") {
               emit(doc.name, doc);
             }
@@ -58,7 +59,7 @@ class Chef
         },
         "all_id" => {
           "map" => <<-EOJS
-          function(doc) { 
+          function(doc) {
             if (doc.chef_type == "node") {
               emit(doc.name, doc.name);
             }
@@ -84,7 +85,7 @@ class Chef
                   to_emit["ohai_time"] = doc["attributes"]["ohai_time"];
                 } else {
                   to_emit["ohai_time"] = "Undefined";
-                } 
+                }
                 if (doc["attributes"]["uptime"]) {
                   to_emit["uptime"] = doc["attributes"]["uptime"];
                 } else {
@@ -125,7 +126,7 @@ class Chef
         }
       },
     }
-    
+
     # Create a new Chef::Node object.
     def initialize(couchdb=nil)
       @name = nil
@@ -153,36 +154,36 @@ class Chef
     end
 
     def chef_server_rest
-      Chef::REST.new(Chef::Config[:chef_server_url])      
+      Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
     def self.chef_server_rest
-      Chef::REST.new(Chef::Config[:chef_server_url])      
+      Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
-    # Find a recipe for this Chef::Node by fqdn.  Will search first for 
+    # Find a recipe for this Chef::Node by fqdn.  Will search first for
     # Chef::Config["node_path"]/fqdn.rb, then hostname.rb, then default.rb.
-    # 
+    #
     # Returns a new Chef::Node object.
     #
-    # Raises an ArgumentError if it cannot find the node. 
+    # Raises an ArgumentError if it cannot find the node.
     def find_file(fqdn)
       host_parts = fqdn.split(".")
       hostname = host_parts[0]
-      
+
       [fqdn, hostname, "default"].each { |fname|
-       node_file = File.join(Chef::Config[:node_path], "#{fname.to_s}.rb")        
+       node_file = File.join(Chef::Config[:node_path], "#{fname.to_s}.rb")
        return self.from_file(node_file) if File.exists?(node_file)
      }
-      
-      raise ArgumentError, "Cannot find a node matching #{fqdn}, not even with default.rb!" 
+
+      raise ArgumentError, "Cannot find a node matching #{fqdn}, not even with default.rb!"
     end
-    
+
     # Set the name of this Node, or return the current name.
     def name(arg=nil)
       if arg != nil
         validate(
-          {:name => arg }, 
+          {:name => arg },
           {:name => { :kind_of => String,
                       :cannot_be => :blank}
           })
@@ -191,17 +192,17 @@ class Chef
         @name
       end
     end
-    
+
     # Return an attribute of this node.  Returns nil if the attribute is not found.
     def [](attrib)
       Chef::Node::Attribute.new(@attribute, @default_attrs, @override_attrs)[attrib]
     end
-    
+
     # Set an attribute of this node
     def []=(attrib, value)
       Chef::Node::Attribute.new(@attribute, @default_attrs, @override_attrs)[attrib] = value
     end
-    
+
     def store(attrib, value)
       self[attrib] = value
     end
@@ -233,12 +234,12 @@ class Chef
     def attribute?(attrib)
       Chef::Node::Attribute.new(@attribute, @default_attrs, @override_attrs).attribute?(attrib)
     end
-  
-    # Yield each key of the top level to the block. 
+
+    # Yield each key of the top level to the block.
     def each(&block)
       Chef::Node::Attribute.new(@attribute, @default_attrs, @override_attrs).each(&block)
     end
-    
+
     # Iterates over each attribute, passing the attribute and value to the block.
     def each_attribute(&block)
       Chef::Node::Attribute.new(@attribute, @default_attrs, @override_attrs).each_attribute(&block)
@@ -250,23 +251,23 @@ class Chef
     def method_missing(symbol, *args)
       Chef::Node::Attribute.new(@attribute, @default_attrs, @override_attrs).send(symbol, *args)
     end
-    
+
     # Returns true if this Node expects a given recipe, false if not.
     def recipe?(recipe_name)
       @run_list.include?(recipe_name) || @run_state[:seen_recipes].include?(recipe_name)
     end
-    
+
     # Returns true if this Node expects a given role, false if not.
     def role?(role_name)
       @run_list.include?("role[#{role_name}]")
     end
 
     # Returns an Array of roles and recipes, in the order they will be applied.
-    # If you call it with arguments, they will become the new list of roles and recipes. 
+    # If you call it with arguments, they will become the new list of roles and recipes.
     def run_list(*args)
       args.length > 0 ? @run_list.reset!(args) : @run_list
     end
-    
+
     def recipes(*args)
       Chef::Log.warn "Chef::Node#recipes method is deprecated.  Please use Chef::Node#run_list"
       run_list(*args)
@@ -276,22 +277,22 @@ class Chef
     def run_list?(item)
       @run_list.detect { |r| r == item } ? true : false
     end
-    
+
     def consume_attributes(attrs)
       attrs ||= {}
       Chef::Log.debug("Adding JSON Attributes")
-      attrs.each do |key, value|
-        if ["recipes", "run_list"].include?(key)
-          run_list(value)
-        else
-          Chef::Log.debug("JSON Attribute: #{key} - #{value.inspect}")
-          store(key, value)
+      if new_run_list = attrs.delete("recipes") || attrs.delete("run_list")
+        if attrs.key?("recipes") || attrs.key?("run_list")
+          raise Chef::Exceptions::AmbiguousRunlistSpecification, "please set the node's run list using the 'run_list' attribute only."
         end
+        Chef::Log.info("Replacing the run_list with #{new_run_list.inspect} from JSON")
+        run_list(new_run_list)
       end
+      Chef::Mixin::DeepMerge.merge(@attribute, attrs)
+
       self[:tags] = Array.new unless attribute?(:tags)
-      
     end
-    
+
     # Transform the node to a Hash
     def to_hash
       index_hash = Hash.new
@@ -305,8 +306,8 @@ class Chef
       index_hash["run_list"] = @run_list.run_list if @run_list.run_list.length > 0
       index_hash
     end
-    
-    # Serialize this object as a hash 
+
+    # Serialize this object as a hash
     def to_json(*a)
       result = {
         "name" => @name,
@@ -320,13 +321,13 @@ class Chef
       result["_rev"] = @couchdb_rev if @couchdb_rev
       result.to_json(*a)
     end
-    
+
     # Create a Chef::Node from JSON
     def self.json_create(o)
       node = new
       node.name(o["name"])
       o["attributes"].each { |k,v| node[k] = v }
-      
+
       node.default_attrs = Mash.new(o["defaults"]) if o.has_key?("defaults")
       node.override_attrs = Mash.new(o["overrides"]) if o.has_key?("overrides")
 
@@ -340,7 +341,7 @@ class Chef
       node.index_id = node.couchdb_id
       node
     end
-    
+
     # List all the Chef::Node objects in the CouchDB.  If inflate is set to true, you will get
     # the full list of all Nodes, fully inflated.
     def self.cdb_list(inflate=false, couchdb=nil)
@@ -360,10 +361,10 @@ class Chef
         Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("nodes")
       end
     end
-    
+
     # Load a node by name from CouchDB
     def self.cdb_load(name, couchdb=nil)
-      (couchdb || Chef::CouchDB.new).load("node", name)      
+      (couchdb || Chef::CouchDB.new).load("node", name)
     end
 
     def self.exists?(nodename, couchdb)
@@ -373,12 +374,12 @@ class Chef
         nil
       end
     end
-    
+
     # Load a node by name
     def self.load(name)
       Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("nodes/#{name}")
     end
-    
+
     # Remove this node from the CouchDB
     def cdb_destroy
       @couchdb.delete("node", @name, @couchdb_rev)
@@ -388,7 +389,7 @@ class Chef
     def destroy
       chef_server_rest.delete_rest("nodes/#{@name}")
     end
-    
+
     # Save this node to the CouchDB
     def cdb_save
       @couchdb_rev = @couchdb.store("node", @name, self)["rev"]
@@ -404,18 +405,18 @@ class Chef
       end
       self
     end
-    
+
     # Create the node via the REST API
     def create
       chef_server_rest.post_rest("nodes", self)
       self
-    end 
+    end
 
     # Set up our CouchDB design document
     def self.create_design_document(couchdb=nil)
       (couchdb || Chef::CouchDB.new).create_design_document("nodes", DESIGN_DOCUMENT)
     end
-    
+
     # As a string
     def to_s
       "node[#{@name}]"

data/lib/chef/openid_registration.rb

@@ -21,7 +21,6 @@ require 'chef/mixin/params_validate'
 require 'chef/couchdb'
 require 'chef/index_queue'
 require 'digest/sha1'
-require 'rubygems'
 require 'json'
 
 class Chef

data/lib/chef/platform.rb

@@ -19,128 +19,162 @@
 require 'chef/config'
 require 'chef/log'
 require 'chef/mixin/params_validate'
-require 'chef/platform'
-require 'chef/resource'
-Dir[File.join(File.dirname(__FILE__), 'provider/**/*.rb')].sort.each { |lib| require lib }
+
+# Actually, this file depends on nearly every provider in chef, but actually
+# requiring them causes circular requires resulting in uninitialized constant
+# errors.
+require 'chef/provider'
+require 'chef/provider/log'
+require 'chef/provider/user'
+require 'chef/provider/group'
+require 'chef/provider/mount'
+require 'chef/provider/service'
+require 'chef/provider/package'
+
 
 class Chef
   class Platform
 
-    @platforms = {
-      :mac_os_x => {
-        :default => {
-          :package => Chef::Provider::Package::Macports,
-          :user => Chef::Provider::User::Dscl,
-          :group => Chef::Provider::Group::Dscl
-        }
-      },
-      :freebsd => {
-        :default => {
-          :group   => Chef::Provider::Group::Pw,
-          :package => Chef::Provider::Package::Freebsd,
-          :service => Chef::Provider::Service::Freebsd,
-          :user    => Chef::Provider::User::Pw,
-          :cron    => Chef::Provider::Cron
-        }
-      },
-      :ubuntu   => {
-        :default => {
-          :package => Chef::Provider::Package::Apt,
-          :service => Chef::Provider::Service::Debian,
-          :cron => Chef::Provider::Cron,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :debian => {
-        :default => {
-          :package => Chef::Provider::Package::Apt,
-          :service => Chef::Provider::Service::Debian,
-          :cron => Chef::Provider::Cron,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :centos   => {
-        :default => {
-          :service => Chef::Provider::Service::Redhat,
-          :cron => Chef::Provider::Cron,
-          :package => Chef::Provider::Package::Yum,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :fedora   => {
-        :default => {
-          :service => Chef::Provider::Service::Redhat,
-          :cron => Chef::Provider::Cron,
-          :package => Chef::Provider::Package::Yum,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :suse     => {
-        :default => {
-          :service => Chef::Provider::Service::Redhat,
-          :cron => Chef::Provider::Cron,
-          :package => Chef::Provider::Package::Zypper
-        }
-      },
-      :redhat   => {
-        :default => {
-          :service => Chef::Provider::Service::Redhat,
-          :cron => Chef::Provider::Cron,
-          :package => Chef::Provider::Package::Yum,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :gentoo   => {
-        :default => {
-          :package => Chef::Provider::Package::Portage,
-          :service => Chef::Provider::Service::Gentoo,
-          :cron => Chef::Provider::Cron,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :arch   => {
-        :default => {
-          :package => Chef::Provider::Package::Pacman,
-          :service => Chef::Provider::Service::Arch,
-          :cron => Chef::Provider::Cron,
-          :mdadm => Chef::Provider::Mdadm
-        }
-      },
-      :solaris  => {},
-      :default  => {
-        :file => Chef::Provider::File,
-        :directory => Chef::Provider::Directory,
-        :link => Chef::Provider::Link,
-        :template => Chef::Provider::Template,
-        :remote_file => Chef::Provider::RemoteFile,
-        :remote_directory => Chef::Provider::RemoteDirectory,
-        :execute => Chef::Provider::Execute,
-        :mount => Chef::Provider::Mount::Mount,
-        :script => Chef::Provider::Script,
-        :service => Chef::Provider::Service::Init,
-        :perl => Chef::Provider::Script,
-        :python => Chef::Provider::Script,
-        :ruby => Chef::Provider::Script,
-        :bash => Chef::Provider::Script,
-        :csh => Chef::Provider::Script,
-        :user => Chef::Provider::User::Useradd,
-        :group => Chef::Provider::Group::Gpasswd,
-        :http_request => Chef::Provider::HttpRequest,
-        :route => Chef::Provider::Route,
-        :ifconfig => Chef::Provider::Ifconfig,
-        :ruby_block => Chef::Provider::RubyBlock,
-        :erl_call => Chef::Provider::ErlCall,
-        :log => Chef::Provider::Log::ChefLog
-      }
-    }
-
     class << self
-      attr_accessor :platforms
+      attr_writer :platforms
+
+      def platforms
+        @platforms ||= {
+          :mac_os_x => {
+            :default => {
+              :package => Chef::Provider::Package::Macports,
+              :user => Chef::Provider::User::Dscl,
+              :group => Chef::Provider::Group::Dscl
+            }
+          },
+          :freebsd => {
+            :default => {
+              :group   => Chef::Provider::Group::Pw,
+              :package => Chef::Provider::Package::Freebsd,
+              :service => Chef::Provider::Service::Freebsd,
+              :user    => Chef::Provider::User::Pw,
+              :cron    => Chef::Provider::Cron
+            }
+          },
+          :ubuntu   => {
+            :default => {
+              :package => Chef::Provider::Package::Apt,
+              :service => Chef::Provider::Service::Debian,
+              :cron => Chef::Provider::Cron,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :debian => {
+            :default => {
+              :package => Chef::Provider::Package::Apt,
+              :service => Chef::Provider::Service::Debian,
+              :cron => Chef::Provider::Cron,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :centos   => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :scientific => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :fedora   => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :suse     => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Zypper
+            }
+          },
+          :redhat   => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :gentoo   => {
+            :default => {
+              :package => Chef::Provider::Package::Portage,
+              :service => Chef::Provider::Service::Gentoo,
+              :cron => Chef::Provider::Cron,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :arch   => {
+            :default => {
+              :package => Chef::Provider::Package::Pacman,
+              :service => Chef::Provider::Service::Arch,
+              :cron => Chef::Provider::Cron,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :mswin => {
+            :default => {
+              :service => Chef::Provider::Service::Windows
+            }
+          },
+          :mingw32 => {
+            :default => {
+              :service => Chef::Provider::Service::Windows
+            }
+          },
+          :windows => {
+            :default => {
+              :service => Chef::Provider::Service::Windows
+            }
+          },
+          :solaris  => {},
+          :default  => {
+            :file => Chef::Provider::File,
+            :directory => Chef::Provider::Directory,
+            :link => Chef::Provider::Link,
+            :template => Chef::Provider::Template,
+            :remote_file => Chef::Provider::RemoteFile,
+            :remote_directory => Chef::Provider::RemoteDirectory,
+            :execute => Chef::Provider::Execute,
+            :mount => Chef::Provider::Mount::Mount,
+            :script => Chef::Provider::Script,
+            :service => Chef::Provider::Service::Init,
+            :perl => Chef::Provider::Script,
+            :python => Chef::Provider::Script,
+            :ruby => Chef::Provider::Script,
+            :bash => Chef::Provider::Script,
+            :csh => Chef::Provider::Script,
+            :user => Chef::Provider::User::Useradd,
+            :group => Chef::Provider::Group::Gpasswd,
+            :http_request => Chef::Provider::HttpRequest,
+            :route => Chef::Provider::Route,
+            :ifconfig => Chef::Provider::Ifconfig,
+            :ruby_block => Chef::Provider::RubyBlock,
+            :erl_call => Chef::Provider::ErlCall,
+            :log => Chef::Provider::Log::ChefLog
+          }
+        }
+      end
 
       include Chef::Mixin::ParamsValidate
 
       def find(name, version)
-        provider_map = @platforms[:default].clone
+        provider_map = platforms[:default].clone
 
         name_sym = name
         if name.kind_of?(String)
@@ -149,15 +183,15 @@ class Chef
           name_sym = name.to_sym
         end
 
-        if @platforms.has_key?(name_sym)
-          if @platforms[name_sym].has_key?(version)
+        if platforms.has_key?(name_sym)
+          if platforms[name_sym].has_key?(version)
             Chef::Log.debug("Platform #{name.to_s} version #{version} found")
-            if @platforms[name_sym].has_key?(:default)
-              provider_map.merge!(@platforms[name_sym][:default])
+            if platforms[name_sym].has_key?(:default)
+              provider_map.merge!(platforms[name_sym][:default])
             end
-            provider_map.merge!(@platforms[name_sym][version])
-          elsif @platforms[name_sym].has_key?(:default)
-            provider_map.merge!(@platforms[name_sym][:default])
+            provider_map.merge!(platforms[name_sym][version])
+          elsif platforms[name_sym].has_key?(:default)
+            provider_map.merge!(platforms[name_sym][:default])
           end
         else
           Chef::Log.debug("Platform #{name} not found, using all defaults. (Unsupported platform?)")
@@ -221,30 +255,30 @@ class Chef
         )
         if args.has_key?(:platform)
           if args.has_key?(:version)
-            if @platforms.has_key?(args[:platform])
-              if @platforms[args[:platform]].has_key?(args[:version])
-                @platforms[args[:platform]][args[:version]][args[:resource].to_sym] = args[:provider]
+            if platforms.has_key?(args[:platform])
+              if platforms[args[:platform]].has_key?(args[:version])
+                platforms[args[:platform]][args[:version]][args[:resource].to_sym] = args[:provider]
               else
-                @platforms[args[:platform]][args[:version]] = {
+                platforms[args[:platform]][args[:version]] = {
                   args[:resource].to_sym => args[:provider]
                 }
               end
             else
-              @platforms[args[:platform]] = {
+              platforms[args[:platform]] = {
                 args[:version] => {
                   args[:resource].to_sym => args[:provider]
                 }
               }
             end
           else
-            if @platforms.has_key?(args[:platform])
-              if @platforms[args[:platform]].has_key?(:default)
-                @platforms[args[:platform]][:default][args[:resource].to_sym] = args[:provider]
+            if platforms.has_key?(args[:platform])
+              if platforms[args[:platform]].has_key?(:default)
+                platforms[args[:platform]][:default][args[:resource].to_sym] = args[:provider]
               else
-                @platforms[args[:platform]] = { :default => { args[:resource].to_sym => args[:provider] } }
+                platforms[args[:platform]] = { :default => { args[:resource].to_sym => args[:provider] } }
               end
             else
-              @platforms[args[:platform]] = {
+              platforms[args[:platform]] = {
                 :default => {
                   args[:resource].to_sym => args[:provider]
                 }
@@ -252,10 +286,10 @@ class Chef
             end
           end
         else
-          if @platforms.has_key?(:default)
-            @platforms[:default][args[:resource].to_sym] = args[:provider]
+          if platforms.has_key?(:default)
+            platforms[:default][args[:resource].to_sym] = args[:provider]
           else
-            @platforms[:default] = {
+            platforms[:default] = {
               args[:resource].to_sym => args[:provider]
             }
           end
@@ -264,8 +298,8 @@ class Chef
 
       def find_provider(platform, version, resource_type)
         pmap = Chef::Platform.find(platform, version)
-        provider_klass = explicit_provider(platform, version, resource_type) || 
-                         platform_provider(platform, version, resource_type) || 
+        provider_klass = explicit_provider(platform, version, resource_type) ||
+                         platform_provider(platform, version, resource_type) ||
                          resource_matching_provider(platform, version, resource_type)
 
         raise ArgumentError, "Cannot find a provider for #{resource_type} on #{platform} version #{version}" if provider_klass.nil?
@@ -288,8 +322,8 @@ class Chef
         def resource_matching_provider(platform, version, resource_type)
           if resource_type.kind_of?(Chef::Resource)
             begin
-              Chef::Provider.const_get(resource_type.class.to_s.split('::').last) 
-            rescue NameError 
+              Chef::Provider.const_get(resource_type.class.to_s.split('::').last)
+            rescue NameError
               nil
             end
           else