chef 0.9.0.b02 → 0.9.0.rc01

data/distro/common/man/man8/knife.8

@@ -70,7 +70,7 @@ Say yes to all prompts for confirmation
 Show this message
 .
 .SH "SUB\-COMMANDS"
-Knife sub\-commands are structured as "\fINOUN\fR \fBverb\fR \fINOUN\fR (options)". The sub\-commands are meant to be intuitively named. Because the Chef Server API is RESTful, sub\-commands generally utilize CRUD operations.
+Knife sub\-commands are structured as \fINOUN verb NOUN (options)\fR. The sub\-commands are meant to be intuitively named. Because the Chef Server API is RESTful, sub\-commands generally utilize CRUD operations.
 .
 .IP "\(bu" 4
 create (create)
@@ -104,7 +104,7 @@ Create an initial API Client
 The path to your chef\-repo
 .
 .P
-Create a configuration file for knife. This will prompt for values to enter into the file. Default values are listed in square brackets if no other entry is typed. See "\fBCONFIGURATION\fR" below for available options.
+Create a configuration file for knife. This will prompt for values to enter into the file. Default values are listed in square brackets if no other entry is typed. See \fBCONFIGURATION\fR below for available options.
 .
 .P
 \fBindex rebuild\fR \fI(options)\fR
@@ -117,6 +117,12 @@ don't bother to ask if I'm sure
 Rebuilds all the search indexes on the server.
 .
 .P
+\fBrecipe list [PATTERN]\fR
+.
+.P
+List available recipes from the server. Specify \fIPATTERN\fR as a regular expression to limit the results.
+.
+.P
 \fBsearch INDEX QUERY\fR \fI(options)\fR
 .
 .TP
@@ -250,20 +256,32 @@ Cookbooks are the fundamental unit of distribution in Chef. They encapsulate all
 Delete cookbooks on the Chef Server based on a regular expression. The regular expression (\fIREGEX\fR) should be in quotes, not in //'s.
 .
 .P
-\fBcookbook delete COOKBOOK\fR \fI(options)\fR
+\fBcookbook delete COOKBOOK [VERSION]\fR \fI(options)\fR
+.
+.TP
+\fB\-a\fR, \fB\-\-all\fR
+Delete all versions
 .
 .P
-Delete a single named \fICOOKBOOK\fR.
+Delete the specified \fIVERSION\fR of the named \fICOOKBOOK\fR. If no version is specified, and only one version exists on the server, that version will be deleted. If multiple versions are available on the server, you will be prompted for a version to delete.
 .
 .P
-\fBcookbook download COOKBOOK\fR \fI(options)\fR
+\fBcookbook download COOKBOOK [VERSION]\fR \fI(options)\fR
 .
 .TP
-\fB\-f\fR, \fB\-\-file FILE\fR
-The filename to write to
+\fB\-d\fR, \fB\-\-dir DOWNLOAD_DIRECTORY\fR
+The directory to download the cookbook into
+.
+.TP
+\fB\-f\fR, \fB\-\-force\fR
+Overwrite an existing directory with the download
+.
+.TP
+\fB\-N\fR, \fB\-\-latest\fR
+Download the latest version of the cookbook
 .
 .P
-Download a cookbook from the Chef Server as a gzip(1)'ed, tar(1) archive.
+Download a cookbook from the Chef Server. If no version is specified and only one version exists on the server, that version will be downloaded. If no version is specified and multiple versions are available on the server, you will be prompted for a version to download.
 .
 .P
 \fBcookbook list\fR \fI(options)\fR
@@ -287,7 +305,7 @@ Generate metadata for all cookbooks, rather than just a single cookbook
 A colon\-separated path to look for cookbooks in
 .
 .P
-Generate cookbook metadata for the named \fICOOKBOOK\fR. The \fIPATH\fR used here specifies where the "cookbooks" directory is located and corresponds to the \fBcookbook_path\fR configuration option.
+Generate cookbook metadata for the named \fICOOKBOOK\fR. The \fIPATH\fR used here specifies where the cookbooks directory is located and corresponds to the \fBcookbook_path\fR configuration option.
 .
 .P
 \fBcookbook metadata from FILE\fR \fI(options)\fR
@@ -296,7 +314,7 @@ Generate cookbook metadata for the named \fICOOKBOOK\fR. The \fIPATH\fR used her
 Load the cookbook metadata from a specified file.
 .
 .P
-\fBcookbook show COOKBOOK [PART] [FILENAME]\fR \fI(options)\fR
+\fBcookbook show COOKBOOK [VERSION] [PART] [FILENAME]\fR \fI(options)\fR
 .
 .TP
 \fB\-f\fR, \fB\-\-fqdn FQDN              \fR
@@ -311,7 +329,7 @@ The platform to see the file for
 The platform version to see the file for
 .
 .P
-Show a particular part of a \fICOOKBOOK\fR. \fIPART\fR can be one of:
+Show a particular part of a \fICOOKBOOK\fR for the specified \fIVERSION\fR. \fIPART\fR can be one of:
 .
 .IP "\(bu" 4
 \fIattributes\fR
@@ -434,6 +452,12 @@ Delete a data bag, or an item from a data bag.
 Edit an item in a data bag.
 .
 .P
+\fBdata bag from file BAG FILE\fR \fI(options)\fR
+.
+.P
+Load a data bag item from a JSON file. Looks in the directory \fBdata_bags/BAG/ITEM.json\fR unless a relative path is specified.
+.
+.P
 \fBdata bag list\fR \fI(options)\fR
 .
 .TP
@@ -522,6 +546,12 @@ Show only the run list
 .P
 Show a node.
 .
+.SH "RECIPE SUB\-COMMANDS"
+\fBrecipe list [PATTERN]\fR
+.
+.P
+List the recipes available on the server. The results shown can be limited with the optional PATTERN, which is a regular expression. PATTERN should be given in quotes, without slashes.
+.
 .SH "ROLE SUB\-COMMANDS"
 \fBrole bulk delete REGEX\fR \fI(options)\fR
 .
@@ -582,6 +612,68 @@ The next sections describe sub\-commands to work with various Cloud Computing AP
 .P
 The Rackspace and Terremark sub\-commands are early stage of development. Right now when creating instances of these types, knife will assume an Ubuntu image, install Ruby from packages, RubyGems from source and Chef as a RubyGem. As these commands are developed, other installation styles may become available, as options.
 .
+.P
+\fBbootstrap FQDN [RUN LIST...]\fR \fI(options)\fR
+.
+.TP
+\fB\-N\fR, \fB\-\-node\-name NAME\fR
+The Chef node name for your new node
+.
+.TP
+\fB\-P\fR, \fB\-\-ssh\-password PASSWORD\fR
+The ssh password
+.
+.TP
+\fB\-x\fR, \fB\-\-ssh\-user USERNAME\fR
+The ssh username
+.
+.TP
+\fB\-\-prerelease\fR
+Install pre\-release Chef gems
+.
+.P
+Performs a Chef Bootstrap on the target node. This subcommand is used internally by the various cloud computing server create commands. Currently assumes an Ubuntu base OS image and will take the following actions:
+.
+.IP "\(bu" 4
+Updates APT cache.
+.
+.IP "\(bu" 4
+Installs Ruby and packages required to build RubyGems with native extensions.
+.
+.IP "\(bu" 4
+Installs RubyGems 1.3.6 \fBfrom source\fR.
+.
+.IP "\(bu" 4
+Installs Chef and Ohai RubyGems.
+.
+.IP "\(bu" 4
+Writes the validation.pem per the local knife configuration.
+.
+.IP "\(bu" 4
+Writes a default config file for Chef.
+.
+.IP "\(bu" 4
+Creates a JSON attributes file containing the node's run list and runs Chef.
+.
+.IP "" 0
+.
+.P
+When this is complete, the bootstrapped node will have:
+.
+.IP "\(bu" 4
+Latest Chef version installed from RubyGems.
+.
+.IP "\(bu" 4
+Be validated with the configured Chef Server.
+.
+.IP "\(bu" 4
+Have run Chef with its default run list.
+.
+.IP "" 0
+.
+.P
+Future versions of this sub\-command will support performing Chef Bootstrap on other platforms.
+.
 .SH "EC2 SUB\-COMMANDS"
 Chef is commonly used with Amazon AWS EC2 nodes. This sub\-command will generate instance metadata that can be used to automatically configure an EC2 instance with Chef. This requires an AMI that has Chef preinstalled with a configuration file that can parse the metadata at run\-time. At this time this is the only sub\-command for EC2, but more may be added later similar to \fBRACKSPACE\fR and \fBTERREMARK\fR below.
 .
@@ -595,6 +687,76 @@ Edit the instance data
 .P
 The \fIRUN LIST\fR should be specified as a space separated list of roles or recipes that will be used by the instance to configure the server.
 .
+.P
+\fBec2 server create [RUN LIST...]\fR \fI(options)\fR
+.
+.TP
+\fB\-Z\fR, \fB\-\-availability\-zone ZONE\fR
+The Availability Zone
+.
+.TP
+\fB\-A\fR, \fB\-\-aws\-access\-key\-id KEY\fR
+Your AWS Access Key ID
+.
+.TP
+\fB\-K SECRET\fR, \fB\-\-aws\-secret\-access\-key\fR
+Your AWS API Secret Access Key
+.
+.TP
+\fB\-f\fR, \fB\-\-flavor FLAVOR\fR
+The flavor of server (m1.small, m1.medium, etc)
+.
+.TP
+\fB\-i\fR, \fB\-\-image IMAGE\fR
+The AMI for the server
+.
+.TP
+\fB\-\-prerelease\fR
+Install the pre\-release chef gems
+.
+.TP
+\fB\-G\fR, \fB\-\-groups X,Y,Z    \fR
+The security groups for this server
+.
+.TP
+\fB\-S\fR, \fB\-\-ssh\-key KEY     \fR
+The SSH root key
+.
+.TP
+\fB\-x\fR, \fB\-\-ssh\-user USERNAME\fR
+The ssh username
+.
+.P
+Creates a new Amazon AWS EC2 instance.
+.
+.P
+\fBec2 server delete SERVER [SERVER]\fR \fI(options)\fR
+.
+.TP
+\fB\-A\fR, \fB\-\-aws\-access\-key\-id KEY\fR
+Your AWS Access Key ID
+.
+.TP
+\fB\-K SECRET\fR, \fB\-\-aws\-secret\-access\-key\fR
+Your AWS API Secret Access Key
+.
+.P
+Terminates a running Amazon AWS EC2 instance.
+.
+.P
+\fBec2 server list [RUN LIST...]\fR \fI(options)\fR
+.
+.TP
+\fB\-A\fR, \fB\-\-aws\-access\-key\-id KEY\fR
+Your AWS Access Key ID
+.
+.TP
+\fB\-K SECRET\fR, \fB\-\-aws\-secret\-access\-key\fR
+Your AWS API Secret Access Key
+.
+.P
+List running Amazon AWS EC2 instances.
+.
 .SH "RACKSPACE SUB\-COMMANDS"
 In addition to EC2 nodes, Chef can be used on Rackspace Cloud nodes. The following sub\-commands allow manipulating Rackspace Cloud nodes via the \fBfog\fR library.
 .
@@ -682,7 +844,10 @@ Your terremark username
 Lists running Terremark vCloud servers.
 .
 .SH "CONFIGURATION"
-The knife configuration file is a Ruby DSL. If it exists, knife uses these settings for \fBGENERAL OPTIONS\fR defaults.
+The knife configuration file is a Ruby DSL to set configuration parameters for Knife's \fBGENERAL OPTIONS\fR. The default location for the config file is \fB~/.chef/knife.rb\fR. If managing multiple Chef repositories, per\-repository config files can be created. The file must be \fB.chef/knife.rb\fR in the current directory of the repository.
+.
+.P
+If the config file exists, knife uses these settings for \fBGENERAL OPTIONS\fR defaults.
 .
 .P
 \fBlog_level\fR
@@ -756,7 +921,7 @@ Specifies the private key file to use for generating ec2 instance data for valid
 \fI~/.chef/knife.rb\fR
 .
 .P
-Ruby DSL configuration file for knife. See "\fBCONFIGURATION\fR".
+Ruby DSL configuration file for knife. See \fBCONFIGURATION\fR.
 .
 .SH "SEE ALSO"
 Full documentation for Chef is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home/.

data/distro/common/markdown/knife.mkd

@@ -42,7 +42,7 @@ Unless otherwise specified, output is in JSON format, and input files are also J
 
 ## SUB-COMMANDS
 
-Knife sub-commands are structured as "_NOUN_ __verb__ _NOUN_ (options)". The sub-commands are meant to be intuitively named. Because the Chef Server API is RESTful, sub-commands generally utilize CRUD operations.
+Knife sub-commands are structured as _NOUN verb NOUN (options)_. The sub-commands are meant to be intuitively named. Because the Chef Server API is RESTful, sub-commands generally utilize CRUD operations.
 
 * create (create)
 * list and show (read)
@@ -62,7 +62,7 @@ __configure__ _(options)_
   * `-r`, `--repository REPO`:
     The path to your chef-repo
 
-Create a configuration file for knife. This will prompt for values to enter into the file. Default values are listed in square brackets if no other entry is typed. See "__CONFIGURATION__" below for available options.
+Create a configuration file for knife. This will prompt for values to enter into the file. Default values are listed in square brackets if no other entry is typed. See __CONFIGURATION__ below for available options.
 
 __index rebuild__ _(options)_
 
@@ -71,6 +71,10 @@ __index rebuild__ _(options)_
 
 Rebuilds all the search indexes on the server.
 
+__recipe list [PATTERN]__
+
+List available recipes from the server. Specify _PATTERN_ as a regular expression to limit the results.
+
 __search INDEX QUERY__ _(options)_
 
   * `-a`, `--attribute ATTR`:
@@ -159,16 +163,23 @@ __cookbook bulk delete REGEX__ _(options)_
 
 Delete cookbooks on the Chef Server based on a regular expression. The regular expression (_REGEX_) should be in quotes, not in //'s.
 
-__cookbook delete COOKBOOK__ _(options)_
+__cookbook delete COOKBOOK [VERSION]__ _(options)_
 
-Delete a single named _COOKBOOK_.
+  * `-a`, `--all`:
+    Delete all versions
 
-__cookbook download COOKBOOK__ _(options)_
+Delete the specified _VERSION_ of the named _COOKBOOK_. If no version is specified, and only one version exists on the server, that version will be deleted. If multiple versions are available on the server, you will be prompted for a version to delete.
 
-  * `-f`, `--file FILE`:
-    The filename to write to
+__cookbook download COOKBOOK [VERSION]__ _(options)_
+
+  * `-d`, `--dir DOWNLOAD_DIRECTORY`:
+    The directory to download the cookbook into
+  * `-f`, `--force`:
+    Overwrite an existing directory with the download
+  * `-N`, `--latest`:
+    Download the latest version of the cookbook
 
-Download a cookbook from the Chef Server as a gzip(1)'ed, tar(1) archive.
+Download a cookbook from the Chef Server. If no version is specified and only one version exists on the server, that version will be downloaded. If no version is specified and multiple versions are available on the server, you will be prompted for a version to download.
 
 __cookbook list__ _(options)_
 
@@ -184,13 +195,13 @@ __cookbook metadata COOKBOOK__ _(options)_
   * `-o`, `--cookbook-path PATH:PATH`:
     A colon-separated path to look for cookbooks in
 
-Generate cookbook metadata for the named _COOKBOOK_. The _PATH_ used here specifies where the "cookbooks" directory is located and corresponds to the `cookbook_path` configuration option.
+Generate cookbook metadata for the named _COOKBOOK_. The _PATH_ used here specifies where the cookbooks directory is located and corresponds to the `cookbook_path` configuration option.
 
 __cookbook metadata from FILE__ _(options)_
 
 Load the cookbook metadata from a specified file.
 
-__cookbook show COOKBOOK [PART] [FILENAME]__ _(options)_
+__cookbook show COOKBOOK [VERSION] [PART] [FILENAME]__ _(options)_
 
   * `-f`, `--fqdn FQDN               `:
     The FQDN of the host to see the file for
@@ -199,7 +210,7 @@ __cookbook show COOKBOOK [PART] [FILENAME]__ _(options)_
   * `-V`, `--platform-version VERSION`:
     The platform version to see the file for
 
-Show a particular part of a _COOKBOOK_. _PART_ can be one of:
+Show a particular part of a _COOKBOOK_ for the specified _VERSION_. _PART_ can be one of:
 
   * _attributes_
   * _definitions_
@@ -277,6 +288,10 @@ __data bag edit BAG ITEM__ _(options)_
 
 Edit an item in a data bag.
 
+__data bag from file BAG FILE__ _(options)_
+
+Load a data bag item from a JSON file. Looks in the directory `data_bags/BAG/ITEM.json` unless a relative path is specified.
+
 __data bag list__ _(options)_
 
   * `-w`, `--with-uri`:
@@ -339,6 +354,11 @@ __node show NODE__ _(options)_
 
 Show a node.
 
+## RECIPE SUB-COMMANDS
+__recipe list [PATTERN]__
+
+List the recipes available on the server. The results shown can be limited with the optional PATTERN, which is a regular expression. PATTERN should be given in quotes, without slashes.
+
 ## ROLE SUB-COMMANDS
 
 __role bulk delete REGEX__ _(options)_
@@ -384,6 +404,35 @@ The next sections describe sub-commands to work with various Cloud Computing API
 
 The Rackspace and Terremark sub-commands are early stage of development. Right now when creating instances of these types, knife will assume an Ubuntu image, install Ruby from packages, RubyGems from source and Chef as a RubyGem. As these commands are developed, other installation styles may become available, as options.
 
+__bootstrap FQDN [RUN LIST...]__ _(options)_
+
+  * `-N`, `--node-name NAME`:
+    The Chef node name for your new node
+  * `-P`, `--ssh-password PASSWORD`:
+    The ssh password
+  * `-x`, `--ssh-user USERNAME`:
+    The ssh username
+  * `--prerelease`:
+    Install pre-release Chef gems
+
+Performs a Chef Bootstrap on the target node. This subcommand is used internally by the various cloud computing server create commands. Currently assumes an Ubuntu base OS image and will take the following actions:
+
+  - Updates APT cache.
+  - Installs Ruby and packages required to build RubyGems with native extensions.
+  - Installs RubyGems 1.3.6 **from source**.
+  - Installs Chef and Ohai RubyGems.
+  - Writes the validation.pem per the local knife configuration.
+  - Writes a default config file for Chef.
+  - Creates a JSON attributes file containing the node's run list and runs Chef.
+
+When this is complete, the bootstrapped node will have:
+
+  - Latest Chef version installed from RubyGems.
+  - Be validated with the configured Chef Server.
+  - Have run Chef with its default run list.
+
+Future versions of this sub-command will support performing Chef Bootstrap on other platforms.
+
 ## EC2 SUB-COMMANDS
 
 Chef is commonly used with Amazon AWS EC2 nodes. This sub-command will generate instance metadata that can be used to automatically configure an EC2 instance with Chef. This requires an AMI that has Chef preinstalled with a configuration file that can parse the metadata at run-time. At this time this is the only sub-command for EC2, but more may be added later similar to __RACKSPACE__ and __TERREMARK__ below.
@@ -395,6 +444,47 @@ __ec2 instance data [RUN LIST...]__ _(options)_
 
 The _RUN LIST_ should be specified as a space separated list of roles or recipes that will be used by the instance to configure the server.
 
+__ec2 server create [RUN LIST...]__ _(options)_
+
+  * `-Z`, `--availability-zone ZONE`:
+    The Availability Zone
+  * `-A`, `--aws-access-key-id KEY `:
+    Your AWS Access Key ID
+  * `-K SECRET`, `--aws-secret-access-key`:
+    Your AWS API Secret Access Key
+  * `-f`, `--flavor FLAVOR`:
+    The flavor of server (m1.small, m1.medium, etc)
+  * `-i`, `--image IMAGE`:
+    The AMI for the server
+  * `--prerelease`:
+    Install the pre-release chef gems
+  * `-G`, `--groups X,Y,Z     `:
+    The security groups for this server
+  * `-S`, `--ssh-key KEY      `:
+    The SSH root key
+  * `-x`, `--ssh-user USERNAME`:
+    The ssh username
+
+Creates a new Amazon AWS EC2 instance.
+
+__ec2 server delete SERVER [SERVER]__ _(options)_
+
+  * `-A`, `--aws-access-key-id KEY`:
+    Your AWS Access Key ID
+  * `-K SECRET`, `--aws-secret-access-key`:
+    Your AWS API Secret Access Key
+
+Terminates a running Amazon AWS EC2 instance.
+
+__ec2 server list [RUN LIST...]__ _(options)_
+
+  * `-A`, `--aws-access-key-id KEY`:
+    Your AWS Access Key ID
+  * `-K SECRET`, `--aws-secret-access-key`:
+    Your AWS API Secret Access Key
+
+List running Amazon AWS EC2 instances.
+
 ## RACKSPACE SUB-COMMANDS
 
 In addition to EC2 nodes, Chef can be used on Rackspace Cloud nodes. The following sub-commands allow manipulating Rackspace Cloud nodes via the `fog` library.
@@ -454,7 +544,9 @@ Lists running Terremark vCloud servers.
 
 ## CONFIGURATION
 
-The knife configuration file is a Ruby DSL. If it exists, knife uses these settings for __GENERAL OPTIONS__ defaults.
+The knife configuration file is a Ruby DSL to set configuration parameters for Knife's __GENERAL OPTIONS__. The default location for the config file is `~/.chef/knife.rb`. If managing multiple Chef repositories, per-repository config files can be created. The file must be `.chef/knife.rb` in the current directory of the repository.
+
+If the config file exists, knife uses these settings for __GENERAL OPTIONS__ defaults.
 
 `log_level`
 
@@ -501,7 +593,7 @@ Specifies the private key file to use for generating ec2 instance data for valid
 
 _~/.chef/knife.rb_
 
-Ruby DSL configuration file for knife. See "__CONFIGURATION__".
+Ruby DSL configuration file for knife. See __CONFIGURATION__.
 
 ## SEE ALSO
 

data/lib/chef.rb

@@ -62,3 +62,47 @@ class String
     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

data/lib/chef/cookbook_version.rb

@@ -727,7 +727,7 @@ class Chef
     def self.cdb_load(name, version='latest', couchdb=nil)
       cdb = couchdb || Chef::CouchDB.new
       if version == "latest" || version == "_latest"
-        rs = cdb.get_view("cookbook_versions", "all_latest_version", :key => name, :descending => true, :group => true, :reduce => true)["rows"].first
+        rs = cdb.get_view("cookbooks", "all_latest_version", :key => name, :descending => true, :group => true, :reduce => true)["rows"].first
         cdb.load("cookbook_version", "#{rs["key"]}-#{rs["value"]}")
       else
         cdb.load("cookbook_version", "#{name}-#{version}")

data/lib/chef/rest/rest_request.rb

@@ -55,10 +55,12 @@ class Chef
       end
 
       def call
-        http_client.request(http_request) do |response|
-          store_cookie(response)
-          yield response if block_given?
-          response
+        hide_net_http_bug do
+          http_client.request(http_request) do |response|
+            store_cookie(response)
+            yield response if block_given?
+            response
+          end
         end
       end
 
@@ -68,6 +70,21 @@ class Chef
 
       private
 
+      def hide_net_http_bug
+        yield
+      rescue NoMethodError => e
+        # http://redmine.ruby-lang.org/issues/show/2708
+        # http://redmine.ruby-lang.org/issues/show/2758
+        if e.to_s =~ /#{Regexp.escape(%q|undefined method `closed?' for nil:NilClass|)}/
+          Chef::Log.debug("rescued error in http connect, re-raising as Errno::ECONNREFUSED to hide bug in net/http")
+          Chef::Log.debug("#{e.class.name}: #{e.to_s}")
+          Chef::Log.debug(e.backtrace.join("\n"))
+          raise Errno::ECONNREFUSED, "Connection refused attempting to contact #{url.scheme}://#{host}:#{port}"
+        else
+          raise
+        end
+      end
+
       def store_cookie(response)
         if response['set-cookie']
           @cookies["#{host}:#{port}"] = response['set-cookie']

data/lib/chef/version.rb

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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - b02
-  version: 0.9.0.b02
+  - rc01
+  version: 0.9.0.rc01
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -07:00
+date: 2010-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency