ohai 0.6.0 → 0.6.2.rc.0

data/lib/ohai/mixin/command.rb

@@ -99,7 +99,7 @@ module Ohai
         return status, stdout_string, stderr_string
       end
 
-      def run_comand_windows(command, timeout)
+      def run_command_windows(command, timeout)
         if timeout
           begin
             systemu(command)

data/lib/ohai/mixin/ec2_metadata.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'open-uri'
+require 'net/http'
 require 'socket'
 
 module Ohai
@@ -25,17 +25,17 @@ module Ohai
     module Ec2Metadata
 
       EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
-      EC2_METADATA_URL = "http://#{EC2_METADATA_ADDR}/2008-02-01/meta-data" unless defined?(EC2_METADATA_URL)
-      EC2_USERDATA_URL = "http://#{EC2_METADATA_ADDR}/2008-02-01/user-data" unless defined?(EC2_USERDATA_URL)
+      EC2_METADATA_URL = "/2008-02-01/meta-data" unless defined?(EC2_METADATA_URL)
+      EC2_USERDATA_URL = "/2008-02-01/user-data" unless defined?(EC2_USERDATA_URL)
       EC2_ARRAY_VALUES = %w(security-groups)
 
       def can_metadata_connect?(addr, port, timeout=2)
         t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
         saddr = Socket.pack_sockaddr_in(port, addr)
         connected = false
-      
+
         begin
-          t.connect_nonblock(saddr)    
+          t.connect_nonblock(saddr)
         rescue Errno::EINPROGRESS
           r,w,e = IO::select(nil,[t],nil,timeout)
           if !w.nil?
@@ -55,16 +55,20 @@ module Ohai
         connected
       end
 
+      def http_client
+        Net::HTTP.start(EC2_METADATA_ADDR).tap {|h| h.read_timeout = 600}
+      end
+
       def fetch_metadata(id='')
         metadata = Hash.new
-        OpenURI.open_uri("#{EC2_METADATA_URL}/#{id}").read.split("\n").each do |o|
+        http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
           key = "#{id}#{o.gsub(/\=.*$/, '/')}"
           if key[-1..-1] != '/'
-            metadata[key.gsub(/\-|\//, '_').to_sym] = 
+            metadata[key.gsub(/\-|\//, '_').to_sym] =
               if EC2_ARRAY_VALUES.include? key
-                OpenURI.open_uri("#{EC2_METADATA_URL}/#{key}").read.split("\n")
+                http_client.get("#{EC2_METADATA_URL}/#{key}").body.split("\n")
               else
-                OpenURI.open_uri("#{EC2_METADATA_URL}/#{key}").read
+                http_client.get("#{EC2_METADATA_URL}/#{key}").body
               end
           else
             next
@@ -72,14 +76,10 @@ module Ohai
         end
         metadata
       end
-      
+
       def fetch_userdata()
-        # assumes the only expected error is the 404 if there's no user-data
-        begin
-          OpenURI.open_uri("#{EC2_USERDATA_URL}/").read
-        rescue OpenURI::HTTPError
-          nil
-        end
+        response = http_client.get("#{EC2_USERDATA_URL}/")
+        response.code == "200" ? response.body : nil
       end
     end
   end

data/lib/ohai/plugins/ec2.rb

@@ -48,7 +48,7 @@ end
 if looks_like_ec2?
   Ohai::Log.debug("looks_like_ec2? == true")
   ec2 Mash.new
-  self.fetch_metadata.each {|k, v| ec2[k] = v }
+  fetch_metadata.each {|k, v| ec2[k] = v }
   ec2[:userdata] = self.fetch_userdata
 else
   Ohai::Log.debug("looks_like_ec2? == false")

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '0.6.0'
+  VERSION = '0.6.2.rc.0'
 end
 

data/spec/ohai/plugins/ec2_spec.rb

@@ -12,7 +12,7 @@
 #
 # 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.
+# WITHOUT WARRANTIES OR CONDIT"Net::HTTP Response"NS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
@@ -29,28 +29,31 @@ describe Ohai::System, "plugin ec2" do
 
   shared_examples_for "!ec2" do
     it "should NOT attempt to fetch the ec2 metadata" do
-      OpenURI.should_not_receive(:open)
+      @ohai.should_not_receive(:http_client)
       @ohai._require_plugin("ec2")
     end
   end
 
   shared_examples_for "ec2" do
     before(:each) do
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/").
-        and_return(mock(IO, :read => "instance_type\nami_id\nsecurity-groups"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/instance_type").
-        and_return(mock(IO, :read => "c1.medium"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/ami_id").
-        and_return(mock(IO, :read => "ami-5d2dc934"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/security-groups").
-        and_return(mock(IO, :read => "group1\ngroup2"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/user-data/").
-        and_return(mock(IO, :gets => "By the pricking of my thumb..."))
+      @http_client = mock("Net::HTTP client")
+      @ohai.stub!(:http_client).and_return(@http_client)
+
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/").
+        and_return(mock("Net::HTTP Response", :body => "instance_type\nami_id\nsecurity-groups"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/instance_type").
+        and_return(mock("Net::HTTP Response", :body => "c1.medium"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/ami_id").
+        and_return(mock("Net::HTTP Response", :body => "ami-5d2dc934"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/security-groups").
+        and_return(mock("Net::HTTP Response", :body => "group1\ngroup2"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/user-data/").
+        and_return(mock("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
     end
 
     it "should recursively fetch all the ec2 metadata" do

data/spec/ohai/plugins/eucalyptus_spec.rb

@@ -35,21 +35,24 @@ describe Ohai::System, "plugin eucalyptus" do
 
   shared_examples_for "eucalyptus" do
     before(:each) do
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/").
-        and_return(mock(IO, :read => "instance_type\nami_id\nsecurity-groups"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/instance_type").
-        and_return(mock(IO, :read => "c1.medium"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/ami_id").
-        and_return(mock(IO, :read => "ami-5d2dc934"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/meta-data/security-groups").
-        and_return(mock(IO, :read => "group1\ngroup2"))
-      OpenURI.stub!(:open_uri).
-        with("http://169.254.169.254/2008-02-01/user-data/").
-        and_return(mock(IO, :gets => "By the pricking of my thumb..."))
+      @http_client = mock("Net::HTTP client")
+      @ohai.stub!(:http_client).and_return(@http_client)
+
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/").
+        and_return(mock("Net::HTTP Response", :body => "instance_type\nami_id\nsecurity-groups"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/instance_type").
+        and_return(mock("Net::HTTP Response", :body => "c1.medium"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/ami_id").
+        and_return(mock("Net::HTTP Response", :body => "ami-5d2dc934"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/meta-data/security-groups").
+        and_return(mock("Net::HTTP Response", :body => "group1\ngroup2"))
+      @http_client.should_receive(:get).
+        with("/2008-02-01/user-data/").
+        and_return(mock("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
     end
 
     it "should recursively fetch all the eucalyptus metadata" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.6.0
+  prerelease: 6
+  version: 0.6.2.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -293,9 +293,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: