chef 0.8.8 → 0.8.10

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.8.8'
+  VERSION = '0.8.10'
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat

data/lib/chef/certificate.rb

@@ -130,28 +130,62 @@ class Chef
 
       def gen_validation_key(name=Chef::Config[:validation_client_name], key_file=Chef::Config[:validation_key])
         # Create the validation key
-        create_key = false 
+        api_client = Chef::ApiClient.new
+        api_client.name(name)
+        api_client.admin(true)
+        
         begin
-          c = Chef::ApiClient.cdb_load(name)
+          # If both the couch record and file exist, don't do anything. Otherwise,
+          # re-generate the validation key.
+          Chef::ApiClient.cdb_load(name)
+          
+          # The couch document was loaded successfully if we got to here; if we
+          # can't also load the file on the filesystem, we'll regenerate it all.
+          File.open(key_file, "r") do |file|
+          end
         rescue Chef::Exceptions::CouchDBNotFound
-          create_key = true
+          create_validation_key(api_client, key_file)
+        rescue
+          if $!.class.name =~ /Errno::/
+            Chef::Log.error("Error opening validation key: #{$!} -- destroying and regenerating")
+            begin
+              api_client.cdb_destroy
+            rescue Bunny::ServerDownError => e
+              # create_validation_key is gonna fail anyway, so let's just bail out.
+              Chef::Log.fatal("Could not de-index (to rabbitmq) previous validation key - rabbitmq is down! Start rabbitmq then restart chef-server to re-generate it")
+              raise
+            end
+            
+            create_validation_key(api_client, key_file)
+          else
+            raise
+          end
         end
+      end
+      
+      private
+      def create_validation_key(api_client, key_file)
+        Chef::Log.info("Creating validation key...")
 
-        if create_key
-          Chef::Log.info("Creating validation key...")
-          api_client = Chef::ApiClient.new
-          api_client.name(name)
-          api_client.admin(true)
-          api_client.create_keys
+        api_client.create_keys
+        begin
           api_client.cdb_save
-          key_dir = File.dirname(key_file)
-          FileUtils.mkdir_p(key_dir) unless File.directory?(key_dir)
-          File.open(key_file, File::WRONLY|File::EXCL|File::CREAT, 0600) do |f|
-            f.print(api_client.private_key)
-          end
-          if (Chef::Config[:signing_ca_user] && Chef::Config[:signing_ca_group])
-            FileUtils.chown(Chef::Config[:signing_ca_user], Chef::Config[:signing_ca_group], key_file)
-          end
+        rescue Bunny::ServerDownError => e
+          # If rabbitmq is down, the client will have been saved in CouchDB,
+          # but not in the index.
+          Chef::Log.fatal("Could not index (to rabbitmq) validation key - rabbitmq is down! Start rabbitmq then restart chef-server to re-generate it")
+
+          # re-raise so the error bubbles out and nukes chef-server
+          raise e
+        end
+        
+        key_dir = File.dirname(key_file)
+        FileUtils.mkdir_p(key_dir) unless File.directory?(key_dir)
+        File.open(key_file, File::WRONLY|File::CREAT, 0600) do |f|
+          f.print(api_client.private_key)
+        end
+        if (Chef::Config[:signing_ca_user] && Chef::Config[:signing_ca_group])
+          FileUtils.chown(Chef::Config[:signing_ca_user], Chef::Config[:signing_ca_group], key_file)
         end
       end
 

data/lib/chef/config.rb

@@ -168,7 +168,7 @@ class Chef
     amqp_vhost '/chef'
     # Setting this to a UUID string also makes the queue durable 
     # (persist across rabbitmq restarts)
-    amqp_consumer_id nil
+    amqp_consumer_id "default"
 
     client_key "/etc/chef/client.pem"
     validation_key "/etc/chef/validation.pem"

data/lib/chef/cookbook.rb

@@ -19,7 +19,7 @@
 
 require 'chef/log'
 require 'chef/node'
-require 'chef/resource_definition'
+require 'chef/resource_definition_list'
 require 'chef/recipe'
 require 'chef/mixin/convert_to_class_name'
 
@@ -98,9 +98,12 @@ class Chef
       results = Hash.new
       @definition_files.each do |file|
         Chef::Log.debug("Loading cookbook #{name}'s definitions from #{file}")
-        resourcedef = Chef::ResourceDefinition.new
-        resourcedef.from_file(file)
-        results[resourcedef.name] = resourcedef
+        resourcelist = Chef::ResourceDefinitionList.new
+        resourcelist.from_file(file)
+        results.merge!(resourcelist.defines) do |key, oldval, newval|
+          Chef::Log.info("Overriding duplicate definition #{key}, new found in #{file}")
+          newval
+        end
       end
       results
     end

data/lib/chef/cookbook_loader.rb

@@ -75,7 +75,7 @@ class Chef
             cookbook_settings[cookbook_name][:lib_files]
           )
           load_cascading_files(
-            "*.erb",
+            "*",
             File.join(cookbook, "templates"),
             cookbook_settings[cookbook_name][:template_files]
           )

data/lib/chef/exceptions.rb

@@ -36,5 +36,6 @@ class Chef
     class PrivateKeyMissing < RuntimeError; end
     class CannotWritePrivateKey < RuntimeError; end
     class RoleNotFound < RuntimeError; end
+    class ValidationFailed < ArgumentError; end
   end
 end

data/lib/chef/mixin/params_validate.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 class Chef
+  
   module Mixin
     module ParamsValidate
       
@@ -105,26 +106,24 @@ class Chef
         # Raise an exception if the parameter is not found.
         def _pv_required(opts, key, is_required=true)
           if is_required
-            if (opts.has_key?(key.to_s) && opts[key.to_s] != nil) ||
-                (opts.has_key?(key.to_sym) && opts[key.to_sym] != nil)
+            if (opts.has_key?(key.to_s) && !opts[key.to_s].nil?) ||
+                (opts.has_key?(key.to_sym) && !opts[key.to_sym].nil?)
               true
             else
-              raise ArgumentError, "Required argument #{key} is missing!"
+              raise Exceptions::ValidationFailed, "Required argument #{key} is missing!"
             end
           end
         end
         
         def _pv_equal_to(opts, key, to_be)
           value = _pv_opts_lookup(opts, key)
-          if value != nil
+          unless value.nil?
             passes = false
-            [ to_be ].flatten.each do |tb|
-              if value == tb
-                passes = true
-              end
+            Array(to_be).each do |tb|
+              passes = true if value == tb
             end
             unless passes
-              raise ArgumentError, "Option #{key} must be equal to one of: #{to_be.join(", ")}!  You passed #{value.inspect}."
+              raise Exceptions::ValidationFailed, "Option #{key} must be equal to one of: #{to_be.join(", ")}!  You passed #{value.inspect}."
             end
           end
         end
@@ -132,15 +131,13 @@ class Chef
         # Raise an exception if the parameter is not a kind_of?(to_be)
         def _pv_kind_of(opts, key, to_be)
           value = _pv_opts_lookup(opts, key)
-          if value != nil
+          unless value.nil?
             passes = false
-            [ to_be ].flatten.each do |tb|
-              if value.kind_of?(tb)
-                passes = true
-              end
+            Array(to_be).each do |tb|
+              passes = true if value.kind_of?(tb)
             end
             unless passes
-              raise ArgumentError, "Option #{key} must be a kind of #{to_be}!  You passed #{value.inspect}."
+              raise Exceptions::ValidationFailed, "Option #{key} must be a kind of #{to_be}!  You passed #{value.inspect}."
             end
           end
         end
@@ -148,14 +145,32 @@ class Chef
         # Raise an exception if the parameter does not respond to a given set of methods.
         def _pv_respond_to(opts, key, method_name_list)
           value = _pv_opts_lookup(opts, key)
-          if value != nil
-            [ method_name_list ].flatten.each do |method_name|
+          unless value.nil?
+            Array(method_name_list).each do |method_name|
               unless value.respond_to?(method_name)
-                raise ArgumentError, "Option #{key} must have a #{method_name} method!"
+                raise Exceptions::ValidationFailed, "Option #{key} must have a #{method_name} method!"
               end
             end
           end
         end
+
+        # Assert that parameter returns false when passed a predicate method.
+        # For example, :cannot_be => :blank will raise a Exceptions::ValidationFailed
+        # error value.blank? returns a 'truthy' (not nil or false) value.
+        #
+        # Note, this will *PASS* if the object doesn't respond to the method.
+        # So, to make sure a value is not nil and not blank, you need to do
+        # both :cannot_be => :blank *and* :cannot_be => :nil (or :required => true)
+        def _pv_cannot_be(opts, key, predicate_method_base_name)
+          value = _pv_opts_lookup(opts, key)
+          predicate_method = (predicate_method_base_name.to_s + "?").to_sym
+
+          if value.respond_to?(predicate_method)
+            if value.send(predicate_method)
+              raise Exceptions::ValidationFailed, "Option #{key} cannot be #{predicate_method_base_name}"
+            end
+          end
+        end
       
         # Assign a default value to a parameter.
         def _pv_default(opts, key, default_value)
@@ -178,7 +193,7 @@ class Chef
               end
             end
             unless passes
-              raise ArgumentError, "Option #{key}'s value #{value} does not match regular expression #{regex.to_s}"
+              raise Exceptions::ValidationFailed, "Option #{key}'s value #{value} does not match regular expression #{regex.to_s}"
             end
           end
         end
@@ -190,7 +205,7 @@ class Chef
           if value != nil
             callbacks.each do |message, zeproc|
               if zeproc.call(value) != true
-                raise ArgumentError, "Option #{key}'s value #{value} #{message}!"
+                raise Exceptions::ValidationFailed, "Option #{key}'s value #{value} #{message}!"
               end
             end
           end

data/lib/chef/mixin/xml_escape.rb

@@ -1,5 +1,4 @@
 #
-# Author:: Sam Ruby
 # Author:: Daniel DeLeo (<dan@opscode.com>)
 # Copyright:: Copyright (c) 2009 Opscode, Inc.
 # Copyright:: Copyright (c) 2005 Sam Ruby
@@ -17,8 +16,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Code adapted from Sam Ruby's xchar.rb http://intertwingly.net/stories/2005/09/28/xchar.rb
+#
+# Portions of this code are adapted from Sam Ruby's xchar.rb
+# http://intertwingly.net/stories/2005/09/28/xchar.rb 
+#
+# Such code appears here under Sam's original MIT license, while portions of
+# this file are covered by the above Apache License.  For a completely MIT
+# licensed version, please see Sam's original.
+#
 # Thanks, Sam!
+# 
+# Copyright (c) 2005, Sam Ruby 
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 
 class Chef
   module Mixin

data/lib/chef/node.rb

@@ -182,13 +182,10 @@ class Chef
     def name(arg=nil)
       if arg != nil
         validate(
-          { :name => arg }, 
-          {
-            :name => {
-              :kind_of => String
-            }
-          }
-        )
+          {:name => arg }, 
+          {:name => { :kind_of => String,
+                      :cannot_be => :blank}
+          })
         @name = arg
       else
         @name

data/lib/chef/provider/deploy.rb

@@ -211,7 +211,7 @@ class Chef
       def copy_cached_repo
         Chef::Log.info "copying the cached checkout to #{release_path}"
         FileUtils.mkdir_p(@new_resource.deploy_to + "/releases")
-        FileUtils.cp_r(::File.join(@new_resource.destination, "."), release_path, :preserve => true)
+        run_command(:command => "cp -RPp #{::File.join(@new_resource.destination, ".")} #{release_path}")
         release_created(release_path)
       end
       

data/lib/chef/provider/template.rb

@@ -42,7 +42,9 @@ class Chef
         cache_file_name = "cookbooks/#{cookbook_name}/templates/default/#{@new_resource.source}"
         template_cache_name = "#{cookbook_name}_#{@new_resource.source}"
         
-        if Chef::Config[:solo]
+        if @new_resource.local
+          cache_file_name = @new_resource.source
+        elsif Chef::Config[:solo]
           cache_file_name = solo_cache_file_name
         else
           raw_template_file = fetch_template_via_rest(cache_file_name, template_cache_name)

data/lib/chef/resource/template.rb

@@ -28,6 +28,7 @@ class Chef
         @action = "create"
         @source = "#{::File.basename(name)}.erb"
         @cookbook = nil
+        @local = false
         @variables = Hash.new
       end
 
@@ -55,6 +56,14 @@ class Chef
         )
       end
 
+      def local(args=nil)
+        set_or_return(
+          :local,
+          args,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
     end
   end
 end

data/lib/chef/resource_definition.rb

@@ -64,4 +64,4 @@ class Chef
       "#{name.to_s}"
     end
   end
-end
+end

data/lib/chef/resource_definition_list.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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/mixin/from_file'
+require 'chef/resource_definition'
+
+class Chef
+  class ResourceDefinitionList
+    include Chef::Mixin::FromFile
+
+    attr_accessor :defines
+
+    def initialize
+      @defines = Hash.new
+    end
+
+    def define(resource_name, prototype_params=nil, &block)
+      @defines[resource_name] = ResourceDefinition.new
+      @defines[resource_name].define(resource_name, prototype_params, &block)
+      true
+    end
+  end
+end

data/lib/chef/run_list.rb

@@ -133,7 +133,7 @@ class Chef
                    @seen_roles << name
                    if from == 'disk' || Chef::Config[:solo]
                      # Load the role from disk
-                     Chef::Role.from_disk("#{name}") || Chef::Exceptions::RoleNotFound
+                     Chef::Role.from_disk("#{name}") || raise(Chef::Exceptions::RoleNotFound)
                    elsif from == 'server'
                      # Load the role from the server
                      begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 8
-  version: 0.8.8
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -376,6 +376,7 @@ files:
 - lib/chef/resource_collection/stepable_iterator.rb
 - lib/chef/resource_collection.rb
 - lib/chef/resource_definition.rb
+- lib/chef/resource_definition_list.rb
 - lib/chef/rest.rb
 - lib/chef/role.rb
 - lib/chef/run_list.rb