Backport URI::Generic#hostname to Ruby 1.9.2 and older

Documentation for URI::Generic#host in Ruby 2.0.0 explains:

    Since IPv6 addresses are wrapped by brackets in URIs, this method
    returns IPv6 addresses wrapped by brackets. This form is not appropriate
    to pass socket methods such as TCPSocket.open. If unwrapped host names
    are required, use “hostname” method.

Therefore the best way to support IPv6 URIs is to replace calls to
URI::Generic#host with URI::Generic#hostname. The #hostname method is
added in Ruby 1.9.3 so we need to backport it for older ruby versions.

Conflicts:
	chef/lib/chef.rb

3 files changed, 105 insertions, 0 deletions

diff --git a/chef/lib/chef.rb b/chef/lib/chef.rb
index e56e805dee..f1def0be6b 100644
--- a/chef/lib/chef.rb
+++ b/chef/lib/chef.rb
@@ -39,3 +39,4 @@ require 'chef/monkey_patches/dir'
 require 'chef/monkey_patches/string'
 require 'chef/monkey_patches/numeric'
 require 'chef/monkey_patches/object'
+require 'chef/monkey_patches/uri'
diff --git a/chef/lib/chef/monkey_patches/uri.rb b/chef/lib/chef/monkey_patches/uri.rb
new file mode 100644
index 0000000000..158285e395
--- /dev/null
+++ b/chef/lib/chef/monkey_patches/uri.rb
@@ -0,0 +1,70 @@
+# Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+# You can redistribute it and/or modify it under either the terms of the
+# 2-clause BSDL (see the file BSDL), or the conditions below:
+#
+#   1. You may make and give away verbatim copies of the source form of the
+#      software without restriction, provided that you duplicate all of the
+#      original copyright notices and associated disclaimers.
+#
+#   2. You may modify your copy of the software in any way, provided that
+#      you do at least ONE of the following:
+#
+#        a) place your modifications in the Public Domain or otherwise
+#           make them Freely Available, such as by posting said
+# 	  modifications to Usenet or an equivalent medium, or by allowing
+# 	  the author to include your modifications in the software.
+#
+#        b) use the modified software only within your corporation or
+#           organization.
+#
+#        c) give non-standard binaries non-standard names, with
+#           instructions on where to get the original software distribution.
+#
+#        d) make other distribution arrangements with the author.
+#
+#   3. You may distribute the software in object code or binary form,
+#      provided that you do at least ONE of the following:
+#
+#        a) distribute the binaries and library files of the software,
+# 	  together with instructions (in the manual page or equivalent)
+# 	  on where to get the original distribution.
+#
+#        b) accompany the distribution with the machine-readable source of
+# 	  the software.
+#
+#        c) give non-standard binaries non-standard names, with
+#           instructions on where to get the original software distribution.
+#
+#        d) make other distribution arrangements with the author.
+#
+#   4. You may modify and include the part of the software into any other
+#      software (possibly commercial).  But some files in the distribution
+#      are not written by the author, so that they are not under these terms.
+#
+#      For the list of those files and their copying conditions, see the
+#      file LEGAL.
+#
+#   5. The scripts and library files supplied as input to or produced as
+#      output from the software do not automatically fall under the
+#      copyright of the software, but belong to whomever generated them,
+#      and may be sold commercially, and may be aggregated with this
+#      software.
+#
+#   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+#      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+#      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#      PURPOSE.
+
+require 'uri'
+
+unless URI::Generic.instance_methods.map {|m| m.to_s}.include?("hostname")
+
+  class URI::Generic
+    # Copied from the MRI source for Ruby 1.9.3
+    # File lib/uri/generic.rb, line 659
+    def hostname
+      v = self.host
+      /\A\[(.*)\]\z/ =~ v ? $1 : v
+    end
+  end
+end
diff --git a/chef/spec/unit/monkey_patches/uri_spec.rb b/chef/spec/unit/monkey_patches/uri_spec.rb
new file mode 100644
index 0000000000..cff252ac3b
--- /dev/null
+++ b/chef/spec/unit/monkey_patches/uri_spec.rb
@@ -0,0 +1,34 @@
+#--
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2013 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 'spec_helper'
+describe URI do
+
+  describe "when a URI contains an IPv6 literal" do
+
+    let(:ipv6_uri) do
+      URI.parse("https://[2a00:1450:4009:809::1008]:8443")
+    end
+
+    it "returns the hostname without brackets" do
+      ipv6_uri.hostname.should == "2a00:1450:4009:809::1008"
+    end
+
+  end
+
+end