ohai 6.18.0 → 6.20.0.rc.1

data/spec/unit/plugins/aix/platform_spec.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Prabhu Das (<prabhu.das@clogeny.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 File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+
+describe Ohai::System, "Aix plugin platform" do
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai[:kernel] = Mash.new
+    @ohai[:kernel][:name] = "aix"
+    @ohai[:kernel][:version] = "1"
+    @ohai[:kernel][:release] = "0"
+    @ohai.stub(:require_plugin).and_return(true)
+    @ohai._require_plugin("aix::platform")    
+  end
+
+  it "should set platform to aix" do
+    @ohai[:platform].should == "aix"
+  end
+
+  it "should set the platform_version" do
+    @ohai[:platform_version].should == "1.0"
+  end
+
+  it "should set platform_family" do
+    @ohai[:platform_family].should == @ohai[:platform]
+  end
+end

data/spec/unit/plugins/aix/uptime_spec.rb

@@ -0,0 +1,40 @@
+#
+# Author:: Prabhu Das (<prabhu.das@clogeny.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 File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+
+describe Ohai::System, "Aix plugin uptime" do
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai[:os] = "aix"
+    @ohai._require_plugin("uptime")    
+    @ohai.stub(:popen4).with("who -b").and_yield(nil, StringIO.new, StringIO.new(" .  system boot  Jul  9 17:51"), nil)
+
+    Time.stub_chain(:now, :to_i).and_return(1374258600)
+    DateTime.stub_chain(:parse, :strftime, :to_i).and_return(1373392260)
+    @ohai._require_plugin("aix::uptime")                    
+  end
+
+  it "should set uptime_seconds to uptime" do
+    @ohai[:uptime_seconds].should == 866340
+  end
+
+  it "should set uptime to a human readable date" do
+    @ohai[:uptime].should == "10 days 00 hours 39 minutes 00 seconds"
+  end
+end

data/spec/unit/plugins/gce_spec.rb

@@ -21,99 +21,55 @@ require 'ohai/mixin/gce_metadata'
 describe Ohai::System, "plugin gce" do
   before(:each) do
     @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
+    @ohai.stub(:require_plugin).and_return(true)
   end
 
   shared_examples_for "!gce" do
-    it "should NOT attempt to fetch the gce metadata" do
-      Ohai::Mixin::GCEMetadata.should_not_receive(:http_client)
-      @ohai._require_plugin("gce")
+    it 'should not behave like gce' do
+      @ohai[:gce].should be_nil
     end
   end
 
   shared_examples_for "gce" do
     before(:each) do
-      @http_client = mock("Net::HTTP client")
+      @http_client = double("Net::HTTP client")
       Ohai::Mixin::GCEMetadata.stub(:http_client).and_return(@http_client)
-      IO.stub!(:select).and_return([[],[1],[]])
-      t = mock("connection")
-      t.stub!(:connect_nonblock).and_raise(Errno::EINPROGRESS)
-      Socket.stub!(:new).and_return(t)
-      Socket.stub!(:pack_sockaddr_in).and_return(nil)
+      IO.stub(:select).and_return([[],[1],[]])
+      t = double("connection")
+      t.stub(:connect_nonblock).and_raise(Errno::EINPROGRESS)
+      Socket.stub(:new).and_return(t)
+      Socket.stub(:pack_sockaddr_in).and_return(nil)
     end
 
-    it "should recursively fetch metadata" do
-      @http_client.should_receive(:get).
-        with("/0.1/meta-data/").
-        and_return(mock("Net::HTTPOK",
-                         :body => "domain\nhostname\ndescription", :code=>"200"))
-      @http_client.should_receive(:get).
-        with("/0.1/meta-data/domain").
-        and_return(mock("Net::HTTPOK", :body => "test-domain", :code=>"200"))
-      @http_client.should_receive(:get).
-        with("/0.1/meta-data/hostname").
-        and_return(mock("Net::HTTPOK", :body => "test-host", :code=>"200"))
+    it "should recursively fetch and properly parse json metadata" do
       @http_client.should_receive(:get).
-        with("/0.1/meta-data/description").
-        and_return(mock("Net::HTTPOK", :body => "test-description", :code=>"200"))
+        with("/computeMetadata/v1beta1/?recursive=true/").
+        and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code=>"200"))
 
       @ohai._require_plugin("gce")
 
       @ohai[:gce].should_not be_nil
-      @ohai[:gce]['hostname'].should == "test-host"
-      @ohai[:gce]['domain'].should == "test-domain"
-      @ohai[:gce]['description'].should  == "test-description"
-    end
-
-    it "should properly parse json metadata" do
-      @http_client.should_receive(:get).
-        with("/0.1/meta-data/").
-        and_return(mock("Net::HTTP Response", :body => "attached-disks\n", :code=>"200"))
-      @http_client.should_receive(:get).
-        with("/0.1/meta-data/attached-disks").
-        and_return(mock("Net::HTTP Response", :body => '{"disks":[{"deviceName":"boot",
-                    "index":0,"mode":"READ_WRITE","type":"EPHEMERAL"}]}', :code=>"200"))
-
-      @ohai._require_plugin("gce")
-
-      @ohai[:gce].should_not be_nil
-      @ohai[:gce]['attached_disks'].should eq({"disks"=>[{"deviceName"=>"boot",
-                                              "index"=>0,"mode"=>"READ_WRITE",
-                                              "type"=>"EPHEMERAL"}]})
+      @ohai[:gce]['instance'].should eq("hostname"=>"test-host")
     end
   end
 
-  describe "with dmi and metadata address connected" do
-    it_should_behave_like "gce"
-    before(:each) do
-      File.should_receive(:read).with('/sys/firmware/dmi/entries/1-0/raw').and_return('Google')
-    end
-  end
-
-  describe "without dmi and metadata address connected" do
-    it_should_behave_like "!gce"
-    before(:each) do
-      File.should_receive(:read).with('/sys/firmware/dmi/entries/1-0/raw').and_return('Test')
-    end
-  end
-  
   describe "with hint file" do
     it_should_behave_like "gce"
 
     before(:each) do
-      File.stub!(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(true)
-      File.stub!(:read).with('/etc/chef/ohai/hints/gce.json').and_return('')
-      File.stub!(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(true)
-      File.stub!(:read).with('C:\chef\ohai\hints/gce.json').and_return('')
+      File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(true)
+      File.stub(:read).with('/etc/chef/ohai/hints/gce.json').and_return('')
+      File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(true)
+      File.stub(:read).with('C:\chef\ohai\hints/gce.json').and_return('')
     end
   end
 
   describe "without hint file" do
     it_should_behave_like "!gce"
-  
+
     before(:each) do
-      File.stub!(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
-      File.stub!(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
+      File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
+      File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
     end
   end
   
@@ -121,10 +77,14 @@ describe Ohai::System, "plugin gce" do
     it_should_behave_like "!gce"
   
     before(:each) do
-      File.stub!(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
-      File.stub!(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
-      File.stub!(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      File.stub!(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
+      File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
+      File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
+      
+      File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
+      File.stub(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
+      File.stub(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
+      File.stub(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
     end
   end
+
 end

data/spec/unit/plugins/linux/platform_spec.rb

@@ -72,12 +72,6 @@ describe Ohai::System, "Linux plugin platform" do
       @ohai[:platform].should == "linuxmint"
       @ohai[:platform_family].should == "debian"
     end
-    it "should set platform to gcel and platform_family to debian [:lsb][:id] contains GCEL" do
-      @ohai[:lsb][:id] = "GCEL"
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "gcel"
-      @ohai[:platform_family].should == "debian"
-    end
     it "should set platform to debian and platform_family to debian [:lsb][:id] contains Debian" do
       @ohai[:lsb][:id] = "Debian"
       @ohai._require_plugin("linux::platform")

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 6.18.0
+  version: 6.20.0.rc.1
+  prerelease: 7
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -202,6 +227,7 @@ files:
 - lib/ohai/plugins/aix/cpu.rb
 - lib/ohai/plugins/aix/filesystem.rb
 - lib/ohai/plugins/aix/hostname.rb
+- lib/ohai/plugins/aix/kernel.rb
 - lib/ohai/plugins/aix/memory.rb
 - lib/ohai/plugins/aix/network.rb
 - lib/ohai/plugins/aix/platform.rb
@@ -343,6 +369,13 @@ files:
 - spec/unit/mixin/command_spec.rb
 - spec/unit/mixin/ec2_metadata_spec.rb
 - spec/unit/mixin/from_file_spec.rb
+- spec/unit/plugins/aix/cpu_spec.rb
+- spec/unit/plugins/aix/filesystem_spec.rb
+- spec/unit/plugins/aix/hostname_spec.rb
+- spec/unit/plugins/aix/kernel_spec.rb
+- spec/unit/plugins/aix/network_spec.rb
+- spec/unit/plugins/aix/platform_spec.rb
+- spec/unit/plugins/aix/uptime_spec.rb
 - spec/unit/plugins/azure_spec.rb
 - spec/unit/plugins/c_spec.rb
 - spec/unit/plugins/chef_spec.rb
@@ -410,25 +443,26 @@ files:
 - bin/ohai
 homepage: http://wiki.opscode.com/display/chef/Ohai
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ohai profiles your system and emits JSON
 test_files: []