chef 0.9.8 → 0.9.10.rc.0

data/lib/chef/resource/http_request.rb

@@ -28,6 +28,7 @@ class Chef
         @message = name
         @url = nil
         @action = :get
+        @headers = {}
         @allowed_actions.push(:get, :put, :post, :delete, :head, :options)
       end
       
@@ -46,6 +47,14 @@ class Chef
           :kind_of => Object
         )
       end
+
+      def headers(args=nil)
+        set_or_return(
+          :headers,
+          args,
+          :kind_of => Hash
+        )
+      end
       
     end
   end

data/lib/chef/resource/ohai.rb

@@ -0,0 +1,40 @@
+#
+# Author:: Michael Leinartas (<mleinartas@gmail.com>)
+# Copyright:: Copyright (c) 2010 Michael Leinartas
+# 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.
+#
+
+class Chef
+  class Resource
+    class Ohai < Chef::Resource
+      
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :ohai
+        @allowed_actions.push(:reload)
+        @action = :reload
+        @plugin = nil
+      end
+
+      def plugin(arg=nil)
+        set_or_return(
+          :plugin,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+    end
+  end
+end

data/lib/chef/resource/remote_directory.rb

@@ -35,7 +35,8 @@ class Chef
         @files_owner = nil
         @files_group = nil
         @files_mode = 0644
-        @allowed_actions.push(:create, :delete)
+        @overwrite = true
+        @allowed_actions.push(:create, :create_if_missing, :delete)
         @cookbook = nil
       end
 
@@ -87,6 +88,14 @@ class Chef
         )
       end
 
+      def overwrite(arg=nil)
+        set_or_return(
+          :overwrite,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
       def cookbook(args=nil)
         set_or_return(
           :cookbook,

data/lib/chef/resource/rpm_package.rb

@@ -0,0 +1,34 @@
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright (c) 2010 Thomas Bishop
+# 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/resource/package'
+require 'chef/provider/package/rpm'
+
+class Chef
+  class Resource
+    class RpmPackage < Chef::Resource::Package
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :rpm_package
+        @provider = Chef::Provider::Package::Rpm
+      end
+
+    end
+  end
+end

data/lib/chef/resource_collection.rb

@@ -112,7 +112,7 @@ class Chef
       end
       res = @resources_by_name[lookup_by]
       unless res
-        raise ArgumentError, "Cannot find a resource matching #{lookup_by} (did you define it first?)"
+        raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{lookup_by} (did you define it first?)"
       end
       @resources[res]
     end
@@ -138,7 +138,8 @@ class Chef
         when String
           results << find_resource_by_string(arg)
         else
-          raise ArgumentError, "resources takes arguments as a hash or strings!"
+          msg = "arguments to #{self.class.name}#find should be of the form :resource => 'name' or resource[name]"
+          raise Chef::Exceptions::InvalidResourceSpecification, msg
         end
       end
       flat_results = results.flatten

data/lib/chef/resources.rb

@@ -42,6 +42,7 @@ require 'chef/resource/log'
 require 'chef/resource/macports_package'
 require 'chef/resource/mdadm'
 require 'chef/resource/mount'
+require 'chef/resource/ohai'
 require 'chef/resource/package'
 require 'chef/resource/pacman_package'
 require 'chef/resource/perl'
@@ -49,6 +50,7 @@ require 'chef/resource/portage_package'
 require 'chef/resource/python'
 require 'chef/resource/remote_directory'
 require 'chef/resource/remote_file'
+require 'chef/resource/rpm_package'
 require 'chef/resource/route'
 require 'chef/resource/ruby'
 require 'chef/resource/ruby_block'

data/lib/chef/rest.rb

@@ -182,7 +182,9 @@ class Chef
             response_body = res.body.chomp
             JSON.parse(response_body)
           else
-            if raw
+            if method == :HEAD
+              true
+            elsif raw
               tf
             else
               res.body
@@ -190,6 +192,8 @@ class Chef
           end
         elsif res.kind_of?(Net::HTTPFound) or res.kind_of?(Net::HTTPMovedPermanently)
           follow_redirect {run_request(:GET, create_url(res['location']), {}, false, nil, raw)}
+        elsif res.kind_of?(Net::HTTPNotModified)
+          false
         else
           if res['content-type'] =~ /json/
             exception = JSON.parse(res.body)
@@ -369,12 +373,14 @@ class Chef
       response.read_body do |chunk|
         tf.write(chunk)
         size += chunk.size
-        if size == 0
-          Chef::Log.debug("#{url.path} done (0 length file)")
-        elsif total == 0
-          Chef::Log.debug("#{url.path} (zero content length or no Content-Length header)")
-        else
-          Chef::Log.debug("#{url.path}" + " %d%% done (%d of %d)" % [(size * 100) / total, size, total])
+        if Chef::Log.verbose
+          if size == 0
+            Chef::Log.debug("#{url.path} done (0 length file)")
+          elsif total == 0
+            Chef::Log.debug("#{url.path} (zero content length or no Content-Length header)")
+          else
+            Chef::Log.debug("#{url.path}" + " %d%% done (%d of %d)" % [(size * 100) / total, size, total])
+          end
         end
       end
       tf.close

data/lib/chef/rest/auth_credentials.rb

@@ -56,7 +56,7 @@ class Chef
 
       def load_signing_key
         begin
-          @raw_key = IO.read(key_file)
+          @raw_key = IO.read(key_file).strip
         rescue SystemCallError, IOError => e
           Chef::Log.fatal "Failed to read the private key #{key_file}: #{e.inspect}, #{e.backtrace}"
           raise Chef::Exceptions::PrivateKeyMissing, "I cannot read #{key_file}, which you told me to use to sign requests!"

data/lib/chef/rest/rest_request.rb

@@ -172,8 +172,10 @@ class Chef
           Net::HTTP::Put.new(req_path, headers)
         when "delete"
           Net::HTTP::Delete.new(req_path, headers)
+        when "head"
+          Net::HTTP::Head.new(req_path, headers)
         else
-          raise ArgumentError, "You must provide :GET, :PUT, :POST or :DELETE as the method"
+          raise ArgumentError, "You must provide :GET, :PUT, :POST, :DELETE or :HEAD as the method"
         end
 
         @http_request.body = request_body if (request_body && @http_request.request_body_permitted?)

data/lib/chef/runner.rb

@@ -29,11 +29,14 @@ class Chef
   class Runner
     
     attr_reader :run_context
-    
+
+    attr_reader :delayed_actions
+
     include Chef::Mixin::ParamsValidate
 
     def initialize(run_context)
-      @run_context = run_context
+      @run_context      = run_context
+      @delayed_actions  = []
     end
     
     def build_provider(resource)
@@ -46,28 +49,24 @@ class Chef
     
     # Determine the appropriate provider for the given resource, then
     # execute it.
-    def run_action(resource, action, delayed_actions)
-      provider = build_provider(resource)
-      provider.send("action_#{action}")
-      
+    def run_action(resource, action)
+      resource.run_action(action)
+
       # Execute any immediate and queue up any delayed notifications
-      # associated with the resource.
-      if resource.updated
-        resource.notifies_immediate.each do |notify|
-          Chef::Log.info("#{resource} sending #{notify.action} action to #{notify.resource} (immediate)")
-          run_action(notify.resource, notify.action, delayed_actions)
+      # associated with the resource, but only if it was updated *this time*
+      # we ran an action on it.
+      if resource.updated_by_last_action?
+        resource.immediate_notifications.each do |notification|
+          Chef::Log.info("#{resource} sending #{notification.action} action to #{notification.resource} (immediate)")
+          run_action(notification.resource, notification.action)
         end
-        
-        resource.notifies_delayed.each do |notify|
-          unless delayed_actions.include?(notify)
-            delayed_actions << notify
-            delayed_actions << lambda {
-              Chef::Log.info("#{resource} sending #{notify.action} action to #{notify.resource} (delayed)")
-            }
+
+        resource.delayed_notifications.each do |notification|
+          if delayed_actions.any? { |existing_notification| existing_notification.duplicates?(notification) }
+            Chef::Log.info( "#{resource} not queuing delayed action #{notification.action} on #{notification.resource}"\
+                            " (delayed), as it's already been queued")
           else
-            delayed_actions << lambda {
-              Chef::Log.info("#{resource} not sending #{notify.action} action to #{notify.resource} (delayed), as it's already been queued")
-            }
+            delayed_actions << notification
           end
         end
       end
@@ -76,38 +75,18 @@ class Chef
     # Iterates over the +resource_collection+ in the +run_context+ calling
     # +run_action+ for each resource in turn.
     def converge
-      delayed_actions = Array.new
-      
+      # Resolve all lazy/forward references in notifications
+      run_context.resource_collection.each do |resource|
+        resource.resolve_notification_references
+      end
+
       # Execute each resource.
       run_context.resource_collection.execute_each_resource do |resource|
         begin
           Chef::Log.debug("Processing #{resource} on #{run_context.node.name}")
           
-          # Check if this resource has an only_if block -- if it does,
-          # evaluate the only_if block and skip the resource if
-          # appropriate.
-          if resource.only_if
-            unless Chef::Mixin::Command.only_if(resource.only_if, resource.only_if_args)
-              Chef::Log.debug("Skipping #{resource} due to only_if")
-              next
-            end
-          end
-          
-          # Check if this resource has a not_if block -- if it does,
-          # evaluate the not_if block and skip the resource if
-          # appropriate.
-          if resource.not_if
-            unless Chef::Mixin::Command.not_if(resource.not_if, resource.not_if_args)
-              Chef::Log.debug("Skipping #{resource} due to not_if")
-              next
-            end
-          end
-          
           # Execute each of this resource's actions.
-          action_list = resource.action.kind_of?(Array) ? resource.action : [ resource.action ]
-          action_list.each do |action|
-            run_action(resource, action, delayed_actions)
-          end
+          Array(resource.action).each {|action| run_action(resource, action)}
         rescue => e
           Chef::Log.error("#{resource} (#{resource.source_line}) had an error:\n#{e}\n#{e.backtrace.join("\n")}")
           raise e unless resource.ignore_failure
@@ -115,14 +94,11 @@ class Chef
       end
       
       # Run all our :delayed actions
-      delayed_actions.each do |notify_or_lambda|
-        if notify_or_lambda.is_a?(Proc)
-          # log message
-          notify_or_lambda.call
-        else
-          # OpenStruct of resource/action to call
-          run_action(notify_or_lambda.resource, notify_or_lambda.action, delayed_actions)
-        end
+      delayed_actions.each do |notification|
+        Chef::Log.info( "#{notification.notifying_resource} sending #{notification.action}"\
+                        " action to #{notification.resource} (delayed)")
+        # Struct of resource/action to call
+        run_action(notification.resource, notification.action)
       end
 
       true

data/lib/chef/shef/shef_session.rb

@@ -219,7 +219,7 @@ module Shef
 
       ohai_data = @ohai.data.merge(@node.automatic_attrs)
 
-      @node.process_external_attrs(ohai_data,nil)
+      @node.consume_external_attrs(ohai_data,nil)
       @node.reset_defaults_and_overrides
 
       @node

data/lib/chef/util/windows/net_use.rb

@@ -81,7 +81,7 @@ class Chef::Util::Windows::NetUse < Chef::Util::Windows
   def add(args)
     if args.class == String
       remote = args
-      args = Hash.new(USE_INFO_2)
+      args = Hash.new
       args[:remote] = remote
     end
     args[:local] ||= @localname

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.8'
+  VERSION = '0.9.10.rc.0'
 end

data/lib/chef/webui_user.rb

@@ -32,7 +32,6 @@ class Chef
     attr_reader   :password, :salt, :couchdb_id, :couchdb_rev
     
     include Chef::Mixin::ParamsValidate
-    include Chef::IndexQueue::Indexable
     
     DESIGN_DOCUMENT = {
       "version" => 3,

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 10
+  - rc
+  - 0
+  version: 0.9.10.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +30,8 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 2
+        version: 1.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -88,8 +90,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 6
-        version: 0.5.6
+        - 7
+        version: 0.5.7
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,13 +107,13 @@ dependencies:
         - 0
         - 4
         version: 1.0.4
-    - - <=
+    - - <
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 7
+        - 0
+        version: 1.7.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -135,13 +137,20 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 4
+        version: 1.4.4
     - - <=
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 4
-        - 2
-        version: 1.4.2
+        - 6
+        version: 1.4.6
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -274,10 +283,9 @@ files:
 - lib/chef/application/solo.rb
 - lib/chef/application.rb
 - lib/chef/applications.rb
-- lib/chef/cache/checksum.rb
-- lib/chef/cache.rb
 - lib/chef/certificate.rb
 - lib/chef/checksum.rb
+- lib/chef/checksum_cache.rb
 - lib/chef/client.rb
 - lib/chef/config.rb
 - lib/chef/cookbook/cookbook_collection.rb
@@ -304,10 +312,13 @@ files:
 - lib/chef/index_queue/consumer.rb
 - lib/chef/index_queue/indexable.rb
 - lib/chef/index_queue.rb
+- lib/chef/knife/bootstrap/archlinux-gems.erb
 - lib/chef/knife/bootstrap/centos5-gems.erb
+- lib/chef/knife/bootstrap/client-install.vbs
 - lib/chef/knife/bootstrap/fedora13-gems.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
+- lib/chef/knife/bootstrap/windows-gems.erb
 - lib/chef/knife/bootstrap.rb
 - lib/chef/knife/client_bulk_delete.rb
 - lib/chef/knife/client_create.rb
@@ -345,6 +356,7 @@ files:
 - lib/chef/knife/ec2_server_create.rb
 - lib/chef/knife/ec2_server_delete.rb
 - lib/chef/knife/ec2_server_list.rb
+- lib/chef/knife/exec.rb
 - lib/chef/knife/index_rebuild.rb
 - lib/chef/knife/node_bulk_delete.rb
 - lib/chef/knife/node_create.rb
@@ -376,6 +388,7 @@ files:
 - lib/chef/knife/terremark_server_create.rb
 - lib/chef/knife/terremark_server_delete.rb
 - lib/chef/knife/terremark_server_list.rb
+- lib/chef/knife/windows_bootstrap.rb
 - lib/chef/knife.rb
 - lib/chef/log.rb
 - lib/chef/mixin/check_helper.rb
@@ -407,6 +420,7 @@ files:
 - lib/chef/platform.rb
 - lib/chef/provider/breakpoint.rb
 - lib/chef/provider/cookbook_file.rb
+- lib/chef/provider/cron/solaris.rb
 - lib/chef/provider/cron.rb
 - lib/chef/provider/deploy/revision.rb
 - lib/chef/provider/deploy/timestamped.rb
@@ -433,6 +447,7 @@ files:
 - lib/chef/provider/mount/mount.rb
 - lib/chef/provider/mount/windows.rb
 - lib/chef/provider/mount.rb
+- lib/chef/provider/ohai.rb
 - lib/chef/provider/package/apt.rb
 - lib/chef/provider/package/dpkg.rb
 - lib/chef/provider/package/easy_install.rb
@@ -499,6 +514,7 @@ files:
 - lib/chef/resource/macports_package.rb
 - lib/chef/resource/mdadm.rb
 - lib/chef/resource/mount.rb
+- lib/chef/resource/ohai.rb
 - lib/chef/resource/package.rb
 - lib/chef/resource/pacman_package.rb
 - lib/chef/resource/perl.rb
@@ -507,6 +523,7 @@ files:
 - lib/chef/resource/remote_directory.rb
 - lib/chef/resource/remote_file.rb
 - lib/chef/resource/route.rb
+- lib/chef/resource/rpm_package.rb
 - lib/chef/resource/ruby.rb
 - lib/chef/resource/ruby_block.rb
 - lib/chef/resource/scm.rb
@@ -578,11 +595,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: