chef 0.9.0 → 0.9.2

data/distro/debian/etc/init/chef-client.conf

@@ -0,0 +1,17 @@
+# chef-client - Chef Configuration Management Client
+#
+# Chef Client provides the Chef configuration management daemon
+
+description "Chef Client"
+
+start on filesystem
+stop on runlevel [!2345]
+
+respawn
+respawn limit 5 30
+
+pre-start script
+    test -x /usr/bin/chef-client || { stop; exit 0; }
+end script
+
+exec /usr/bin/chef-client -i 1800 -L /var/log/chef/client.log

data/distro/debian/etc/init/chef-server-webui.conf

@@ -0,0 +1,17 @@
+# chef-server-webui - Chef Server WebUI
+#
+# Chef Server WebUI provides the browser-accessible UI to the Chef Server API
+
+description "Chef Server WebUI"
+
+start on filesystem
+stop on runlevel [!2345]
+
+respawn
+respawn limit 5 30
+
+pre-start script
+    test -x /usr/bin/chef-server-webui || { stop; exit 0; }
+end script
+
+exec /usr/bin/chef-server-webui -e production -p 4040 -L /var/log/chef/server-webui.log

data/distro/debian/etc/init/chef-server.conf

@@ -0,0 +1,17 @@
+# chef-server - Chef Server
+#
+# Chef Server provides the Chef API server
+
+description "Chef Server API"
+
+start on filesystem
+stop on runlevel [!2345]
+
+respawn
+respawn limit 5 30
+
+pre-start script
+    test -x /usr/bin/chef-server || { stop; exit 0; }
+end script
+
+exec /usr/bin/chef-server -e production -p 4000 -L /var/log/chef/server.log

data/distro/debian/etc/init/chef-solr-indexer.conf

@@ -0,0 +1,17 @@
+# chef-solr-indexer - Chef Solr Indexer
+#
+# Chef Solr Indexer provides indexing of Solr for Chef Server
+
+description "Chef Solr Indexer"
+
+start on filesystem
+stop on runlevel [!2345]
+
+respawn
+respawn limit 5 30
+
+pre-start script
+    test -x /usr/bin/chef-solr-indexer || { stop; exit 0; }
+end script
+
+exec /usr/bin/chef-solr-indexer -c /etc/chef/solr.rb -L /var/log/chef/solr-indexer.log

data/distro/debian/etc/init/chef-solr.conf

@@ -0,0 +1,17 @@
+# chef-solr - Chef Solr
+#
+# Chef Solr provides Solr search for Chef Server
+
+description "Chef Solr"
+
+start on filesystem
+stop on runlevel [!2345]
+
+respawn
+respawn limit 5 30
+
+pre-start script
+    test -x /usr/bin/chef-solr || { stop; exit 0; }
+end script
+
+exec /usr/bin/chef-solr -c /etc/chef/solr.rb -L /var/log/chef/solr.log

data/lib/chef.rb

@@ -34,76 +34,6 @@ require 'chef/run_status'
 require 'chef/handler'
 require 'chef/handler/json_file'
 
-# Adds a Dir.glob to Ruby 1.8.5, for compat
-if RUBY_VERSION < "1.8.6" || RUBY_PLATFORM =~ /mswin|mingw32|windows/
-  class Dir 
-    class << self 
-      alias_method :glob_, :glob 
-      def glob(pattern, flags=0)
-        raise ArgumentError unless (
-          !pattern.nil? and (
-            pattern.is_a? Array and !pattern.empty?
-          ) or pattern.is_a? String
-        )
-        pattern.gsub!(/\\/, "/") if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-        [pattern].flatten.inject([]) { |r, p| r + glob_(p, flags) }
-      end
-      alias_method :[], :glob 
-    end 
-  end 
-end 
-
-
-# On ruby 1.9, Strings are aware of multibyte characters, so #size and length
-# give the actual number of characters. In Chef::REST, we need the bytesize
-# so we can correctly set the Content-Length headers, but ruby 1.8.6 and lower
-# don't define String#bytesize. Monkey patching time!
-class String
-  unless method_defined?(:bytesize)
-    alias :bytesize :size
-  end
-end
-
-
-# Tempfile has a horrible bug where it causes an IOError: closed stream in its
-# finalizer, leading to intermittent application crashes with confusing stack
-# traces. Here we monkey patch the fix into place. You can track the bug on
-# ruby's redmine: http://redmine.ruby-lang.org/issues/show/3119
-class Tempfile
-  # Tempfile has changes between 1.8.x and 1.9.x
-  # so we monkey patch separately
-  if RUBY_VERSION =~ /^1\.8/
-    def unlink
-      # keep this order for thread safeness
-      begin
-        File.unlink(@tmpname) if File.exist?(@tmpname)
-        @@cleanlist.delete(@tmpname)
-        @tmpname = nil
-        ObjectSpace.undefine_finalizer(self)
-      rescue Errno::EACCES
-        # may not be able to unlink on Windows; just ignore
-      end
-    end
-    alias delete unlink
-
-
-  # There is a patch for this, to be merged into 1.9 at some point.
-  # When that happens, we'll want to also check the RUBY_PATCHLEVEL
-  elsif RUBY_VERSION =~ /^1\.9/
-    def unlink
-      # keep this order for thread safeness
-      return unless @tmpname
-      begin
-        if File.exist?(@tmpname)
-          File.unlink(@tmpname)
-        end
-        # remove tmpname from remover
-        @data[0] = @data[2] = nil
-        @tmpname = nil
-      rescue Errno::EACCES
-        # may not be able to unlink on Windows; just ignore
-      end
-    end
-    alias delete unlink
-  end
-end
+require 'chef/monkey_patches/tempfile'
+require 'chef/monkey_patches/dir'
+require 'chef/monkey_patches/string'

data/lib/chef/api_client.rb

@@ -19,6 +19,7 @@
 
 require 'chef/config'
 require 'chef/mixin/params_validate'
+require 'chef/mixin/from_file'
 require 'chef/couchdb'
 require 'chef/certificate'
 require 'chef/index_queue'

data/lib/chef/client.rb

@@ -129,7 +129,7 @@ class Chef
     def run_report_handlers(run_status)
       Chef::Log.info("Running report handlers")
       Array(Chef::Config[:report_handlers]).each do |handler|
-        handler.run_report_safely(handler)
+        handler.run_report_safely(run_status)
       end
       Chef::Log.info("Report handlers complete")
     end
@@ -249,7 +249,7 @@ class Chef
       Chef::Log.debug("Synchronizing cookbook #{cookbook.name}")
 
       # files and templates are lazily loaded, and will be done later.
-      eager_segments = Array(Chef::CookbookVersion::COOKBOOK_SEGMENTS)
+      eager_segments = Chef::CookbookVersion::COOKBOOK_SEGMENTS.dup
       eager_segments.delete(:files)
       eager_segments.delete(:templates)
       

data/lib/chef/knife/cookbook_upload.rb

@@ -20,7 +20,7 @@
 require 'rest_client'
 
 require 'chef/knife'
-require 'chef/streaming_cookbook_uploader'
+require 'chef/cookbook_loader'
 require 'chef/cache/checksum'
 require 'chef/sandbox'
 require 'chef/cookbook_version'
@@ -144,7 +144,7 @@ class Chef
         begin
           catch_auth_exceptions{ rest.put_rest(sandbox_url, {:is_completed => true}) }
         rescue Net::HTTPServerException => e
-          if e.to_s =~ /400 "Bad Request"/ && retries += 1 <= 1
+          if e.message =~ /^400/ && (retries += 1) <= 1
             sleep 2
             retry
           else

data/lib/chef/knife/slicehost_images_list.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Ian Meyer (<ianmmeyer@gmail.com>)
+# Copyright:: Copyright (c) 2010 Ian Meyer
+# 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/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class SlicehostImagesList < Knife
+
+      banner "Sub-Command: slicehost images list"
+
+      def highline
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+
+        slicehost = Fog::Slicehost.new(
+          :slicehost_password => Chef::Config[:knife][:slicehost_password]
+        )
+
+        images  = slicehost.images.inject({}) { |h,i| h[i.id] = i.name; h }
+
+        image_list = [ highline.color('ID', :bold), highline.color('Name', :bold) ]
+
+        slicehost.images.each do |server|
+          image_list << server.id.to_s
+          image_list << server.name
+        end
+        puts highline.list(image_list, :columns_across, 2)
+
+      end
+    end
+  end
+end

data/lib/chef/knife/slicehost_server_create.rb

@@ -0,0 +1,103 @@
+#
+# Author:: Ian Meyer (<ianmmeyer@gmail.com>)
+# Copyright:: Copyright (c) 2009 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/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class SlicehostServerCreate < Knife
+
+      banner "Sub-Command: slicehost server create [RUN LIST...] (options)"
+
+      option :flavor,
+        :short => "-f FLAVOR",
+        :long => "--flavor FLAVOR",
+        :description => "The flavor of server",
+        :proc => Proc.new { |f| f.to_i },
+        :default => 1
+
+      option :image,
+        :short => "-i IMAGE",
+        :long => "--image IMAGE",
+        :description => "The image of the server",
+        :proc => Proc.new { |i| i.to_i },
+        :default => 49
+
+      option :server_name,
+        :short => "-N NAME",
+        :long => "--server-name NAME",
+        :description => "The server name",
+        :default => "wtf"
+
+      option :slicehost_password,
+        :short => "-K KEY",
+        :long => "--slicehost-password password",
+        :description => "Your slicehost API password",
+        :proc => Proc.new { |password| Chef::Config[:knife][:slicehost_password] = password } 
+
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        slicehost = Fog::Slicehost.new(
+          :slicehost_password => Chef::Config[:knife][:slicehost_password]
+        )
+
+        flavors = slicehost.flavors.inject({}) { |h,f| h[f.id] = f.name; h }
+        images  = slicehost.images.inject({}) { |h,i| h[i.id] = i.name; h }
+
+        response = slicehost.create_slice(config[:flavor],
+                               config[:image],
+                               config[:server_name])
+        $stdout.sync = true
+
+        puts "#{h.color("Name", :cyan)}: #{response.body['name']}"
+        puts "#{h.color("Flavor", :cyan)}: #{flavors[response.body['flavor-id']]}"
+        puts "#{h.color("Image", :cyan)}: #{images[response.body['image-id']]}"
+        puts "#{h.color("Public Address", :cyan)}: #{response.body['addresses'][1]}"
+        puts "#{h.color("Private Address", :cyan)}: #{response.body['addresses'][0]}"
+        puts "#{h.color("Password", :cyan)}: #{response.body['root-password']}"
+     
+        print "\n#{h.color("Requesting status of #{response.body['name']}", :magenta)}"
+        saved_password = response.body['root-password']
+
+        # wait for it to be ready to do stuff
+        loop do
+          sleep 15
+          host = slicehost.get_slice(response.body['id'])
+          if host.body['status'] == 'active'
+            break
+          end
+        end
+
+        puts "\nServer ready!!"
+      
+      end
+    end
+  end
+end
+
+

data/lib/chef/knife/slicehost_server_delete.rb

@@ -0,0 +1,61 @@
+#
+# Author:: Ian Meyer (<ianmmeyer@gmail.com>)
+# Copyright:: Copyright (c) 2009 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/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class SlicehostServerDelete < Knife
+
+      banner "Sub-Command: slicehost server delete SLICENAME"
+
+      def run 
+        require 'fog'
+        require 'readline'
+        
+        slicehost = Fog::Slicehost.new(
+          :slicehost_password => Chef::Config[:knife][:slicehost_password]
+        )
+      
+        # Build hash of slice => id  
+        servers = slicehost.servers.inject({}) { |h,f| h[f.name] = f.id; h }
+
+        unless servers.has_key?(@name_args[0])
+          Chef::Log.warn("I can't find a slice named #{@name_args[0]}")
+          return false
+        end
+ 
+        confirm("Do you really want to delete server ID #{servers[@name_args[0]]} named #{@name_args[0]}")
+
+        begin
+          response = slicehost.delete_slice(servers[@name_args[0]])
+          
+          if response.headers['status'] == "200 OK" 
+            Chef::Log.warn("Deleted server #{servers[@name_args[0]]} named #{@name_args[0]}")
+          end
+        rescue Excon::Errors::UnprocessableEntity
+          Chef::Log.warn("There was a problem deleting #{@name_args[0]}, check your slice manager")
+        end
+      end
+    end
+  end
+end
+
+
+

data/lib/chef/knife/slicehost_server_list.rb

@@ -0,0 +1,64 @@
+#
+# Author:: Ian Meyer (<ianmmeyer@gmail.com>)
+# Copyright:: Copyright (c) 2009 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/knife'
+require 'json'
+
+class Chef
+  class Knife
+    class SlicehostServerList < Knife
+
+      banner "Sub-Command: slicehost server list (options)"
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run 
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+        
+        slicehost = Fog::Slicehost.new(
+          :slicehost_password => Chef::Config[:knife][:slicehost_password]
+        )
+       
+        # Make hash of flavor id => name and image id => name
+        flavors = slicehost.flavors.inject({}) { |h,f| h[f.id] = f.name; h }
+        images  = slicehost.images.inject({}) { |h,i| h[i.id] = i.name; h }
+ 
+        server_list = [ h.color('ID', :bold), h.color('Name', :bold), h.color('Public IP', :bold), h.color('Private IP', :bold), h.color('Image', :bold), h.color('Flavor', :bold) ]
+ 
+        slicehost.servers.each do |server|
+          server_list << server.id.to_s
+          server_list << server.name
+          server_list << server.addresses[1]
+          server_list << server.addresses[0]
+          server_list << images[server.image_id].to_s
+          server_list << flavors[server.flavor_id].to_s
+        end
+        puts h.list(server_list, :columns_across, 6)
+
+      end
+    end
+  end
+end
+
+
+

data/lib/chef/log.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef'
+require 'logger'
 require 'mixlib/log'
 
 class Chef

data/lib/chef/monkey_patches/dir.rb

@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+# Adds a Dir.glob to Ruby 1.8.5, for compat
+if RUBY_VERSION < "1.8.6" || RUBY_PLATFORM =~ /mswin|mingw32|windows/
+  class Dir 
+    class << self 
+      alias_method :glob_, :glob 
+      def glob(pattern, flags=0)
+        raise ArgumentError unless (
+          !pattern.nil? and (
+            pattern.is_a? Array and !pattern.empty?
+          ) or pattern.is_a? String
+        )
+        pattern.gsub!(/\\/, "/") if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+        [pattern].flatten.inject([]) { |r, p| r + glob_(p, flags) }
+      end
+      alias_method :[], :glob 
+    end 
+  end 
+end 

data/lib/chef/monkey_patches/string.rb

@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+# On ruby 1.9, Strings are aware of multibyte characters, so #size and length
+# give the actual number of characters. In Chef::REST, we need the bytesize
+# so we can correctly set the Content-Length headers, but ruby 1.8.6 and lower
+# don't define String#bytesize. Monkey patching time!
+class String
+  unless method_defined?(:bytesize)
+    alias :bytesize :size
+  end
+end

data/lib/chef/monkey_patches/tempfile.rb

@@ -0,0 +1,60 @@
+#
+# 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.
+#
+
+# Tempfile has a horrible bug where it causes an IOError: closed stream in its
+# finalizer, leading to intermittent application crashes with confusing stack
+# traces. Here we monkey patch the fix into place. You can track the bug on
+# ruby's redmine: http://redmine.ruby-lang.org/issues/show/3119
+class Tempfile
+  # Tempfile has changes between 1.8.x and 1.9.x
+  # so we monkey patch separately
+  if RUBY_VERSION =~ /^1\.8/
+    def unlink
+      # keep this order for thread safeness
+      begin
+        File.unlink(@tmpname) if File.exist?(@tmpname)
+        @@cleanlist.delete(@tmpname)
+        @tmpname = nil
+        ObjectSpace.undefine_finalizer(self)
+      rescue Errno::EACCES
+        # may not be able to unlink on Windows; just ignore
+      end
+    end
+    alias delete unlink
+
+
+  # There is a patch for this, to be merged into 1.9 at some point.
+  # When that happens, we'll want to also check the RUBY_PATCHLEVEL
+  elsif RUBY_VERSION =~ /^1\.9/
+    def unlink
+      # keep this order for thread safeness
+      return unless @tmpname
+      begin
+        if File.exist?(@tmpname)
+          File.unlink(@tmpname)
+        end
+        # remove tmpname from remover
+        @data[0] = @data[2] = nil
+        @tmpname = nil
+      rescue Errno::EACCES
+        # may not be able to unlink on Windows; just ignore
+      end
+    end
+    alias delete unlink
+  end
+end

data/lib/chef/provider/mount/mount.rb

@@ -39,7 +39,7 @@ class Chef
           Chef::Log.debug("Checking for mount point #{@current_resource.mount_point}")
 
           # only check for existence of non-remote devices
-          if(@new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && !::File.exists?(@new_resource.device) )
+          if(@new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && !::File.exists?(device_real) )
             raise Chef::Exceptions::Mount, "Device #{@new_resource.device} does not exist"
           elsif( !::File.exists?(@new_resource.mount_point) )
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"
@@ -84,7 +84,14 @@ class Chef
           unless @current_resource.mounted
             command = "mount -t #{@new_resource.fstype}"
             command << " -o #{@new_resource.options.join(',')}" unless @new_resource.options.nil? || @new_resource.options.empty?
-            command << " #{device_real}"
+            command << case @new_resource.device_type
+            when :device
+              " #{device_real}"
+            when :label
+              " -L #{@new_resource.device}"
+            when :uuid
+              " -U #{@new_resource.device}"
+            end
             command << " #{@new_resource.mount_point}"
             shell_out!(command)
             Chef::Log.info("Mounted #{@new_resource.mount_point}")
@@ -174,11 +181,10 @@ class Chef
             if @new_resource.device_type == :device
               @real_device = @new_resource.device
             else
+              @real_device = ""
               status = popen4("/sbin/findfs #{device_fstab}") do |pid, stdin, stdout, stderr|
-                @real_device = stdout.first.chomp
-              end
-              unless status.exitstatus == 0
-                @real_device = "/dev/null"
+                device_line = stdout.first # stdout.first consumes
+                @real_device = device_line.chomp unless device_line.nil?
               end
             end
           end

data/lib/chef/provider/service/redhat.rb

@@ -41,7 +41,7 @@ class Chef
           
           super
           
-          chkconfig = shell_out!("/sbin/chkconfig --list #{@current_resource.service_name}")
+          chkconfig = shell_out!("/sbin/chkconfig --list #{@current_resource.service_name}", :returns => [0,1])
           @current_resource.enabled(!!(chkconfig.stdout =~ CHKCONFIG_ON))
           @current_resource        
         end

data/lib/chef/provider/template.rb

@@ -52,7 +52,7 @@ class Chef
             Chef::Log.info("Writing updated content for #{@new_resource} to #{@new_resource.path}")
             backup
             set_all_access_controls(rendered_template.path)
-            FileUtils.cp(rendered_template.path, @new_resource.path)
+            FileUtils.mv(rendered_template.path, @new_resource.path)
             @new_resource.updated = true
           end
         end

data/lib/chef/rest.rb

@@ -27,6 +27,7 @@ require 'tempfile'
 require 'chef/api_client'
 require 'chef/rest/auth_credentials'
 require 'chef/rest/rest_request'
+require 'chef/monkey_patches/string'
 
 class Chef
   class REST

data/lib/chef/rest/rest_request.rb

@@ -23,6 +23,7 @@
 require 'uri'
 require 'net/http'
 require 'chef/rest/cookie_jar'
+require 'chef/version'
 
 class Chef
   class REST
@@ -165,4 +166,4 @@ class Chef
 
     end
   end
-end
+end

data/lib/chef/shell_out.rb

@@ -19,6 +19,8 @@
 require 'etc'
 require 'tmpdir'
 require 'chef/log'
+require 'fcntl'
+require 'chef/exceptions'
 
 class Chef
   
@@ -42,6 +44,7 @@ class Chef
     attr_accessor :user, :group, :cwd, :valid_exit_codes
     attr_reader :command, :umask, :environment
     attr_writer :timeout
+    attr_reader :execution_time
     
     attr_reader :stdout, :stderr, :status
     
@@ -136,7 +139,7 @@ class Chef
       propagate_pre_exec_failure
         
       @result = nil
-      read_time = 0
+      @execution_time = 0
      
       # Ruby 1.8.7 and 1.8.6 from mid 2009 try to allocate objects during GC
       # when calling IO.select and IO#read. Some OS Vendors are not interested
@@ -146,8 +149,8 @@ class Chef
       until @status
         ready = IO.select(open_pipes, nil, nil, READ_WAIT_TIME)
         unless ready
-          read_time += READ_WAIT_TIME
-          if read_time >= timeout && !@result
+          @execution_time += READ_WAIT_TIME
+          if @execution_time >= timeout && !@result
             raise Chef::Exceptions::CommandTimeout, "command timed out:\n#{format_for_exception}"
           end
         end

data/lib/chef/streaming_cookbook_uploader.rb

@@ -9,6 +9,7 @@
 require 'net/http'
 require 'mixlib/authentication/signedheaderauth'
 require 'openssl'
+require 'chef/version'
 
 class Chef
   class StreamingCookbookUploader

data/lib/chef/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.0'
-end
+  VERSION = '0.9.2'
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 -07:00
+date: 2010-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -106,7 +100,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -114,7 +107,6 @@ dependencies:
         version: 1.0.4
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
@@ -130,7 +122,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -146,7 +137,6 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 4
@@ -162,7 +152,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -176,7 +165,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -190,7 +178,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -204,7 +191,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -218,7 +204,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -256,6 +241,11 @@ files:
 - distro/debian/etc/default/chef-server-webui
 - distro/debian/etc/default/chef-solr
 - distro/debian/etc/default/chef-solr-indexer
+- distro/debian/etc/init/chef-client.conf
+- distro/debian/etc/init/chef-server-webui.conf
+- distro/debian/etc/init/chef-server.conf
+- distro/debian/etc/init/chef-solr-indexer.conf
+- distro/debian/etc/init/chef-solr.conf
 - distro/debian/etc/init.d/chef-client
 - distro/debian/etc/init.d/chef-server
 - distro/debian/etc/init.d/chef-server-webui
@@ -369,6 +359,10 @@ files:
 - lib/chef/knife/role_list.rb
 - lib/chef/knife/role_show.rb
 - lib/chef/knife/search.rb
+- lib/chef/knife/slicehost_images_list.rb
+- lib/chef/knife/slicehost_server_create.rb
+- lib/chef/knife/slicehost_server_delete.rb
+- lib/chef/knife/slicehost_server_list.rb
 - lib/chef/knife/ssh.rb
 - lib/chef/knife/status.rb
 - lib/chef/knife/terremark_server_create.rb
@@ -394,6 +388,9 @@ files:
 - lib/chef/mixin/template.rb
 - lib/chef/mixin/xml_escape.rb
 - lib/chef/mixins.rb
+- lib/chef/monkey_patches/dir.rb
+- lib/chef/monkey_patches/string.rb
+- lib/chef/monkey_patches/tempfile.rb
 - lib/chef/node/attribute.rb
 - lib/chef/node.rb
 - lib/chef/openid_registration.rb
@@ -561,7 +558,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -570,7 +566,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"