ohai 8.3.0.rc.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c6368a87a221d3913d78e534ec4ab999877239
-  data.tar.gz: 37cfbd9731bfbde300a92fb74735a883baf3bb59
+  metadata.gz: 126cc8aea8018c470f57fecaadab6f176ba76e46
+  data.tar.gz: 44bd077bf56631f93bb71cd0fab55ef9bc826549
 SHA512:
-  metadata.gz: 092f4f66e9978df246c2903a0e408635bff308d2f73a5deb49198a0252eef4364969b6b470ca79b7b72cfa12c82818b9d3e6f4a7985556467b72b5ece38efe8a
-  data.tar.gz: bf77b83c2ade4da425469ccba8713aa0ba48e06adc5d5c42f900ea3caa71c8241d07d632269f7cd718e8bdeae014c05db1cd3c7ea4a8100116c335872861b3f0
+  metadata.gz: bf217e044c0c551ff5b1a5225403de3ed380f2f24449b7225f7583ab459ac096f65f3bc48a2186b8dade3f18d1281004764e5d80de369a431f2e767b56806c38
+  data.tar.gz: 32af8885f0290102396cfcd140d02fc158d7502fc487f556beb87dcd0f589d0c5ed8a6a1599f702ab19fdc37485152d8954ea981b051c8148742e21868013360

data/lib/ohai/plugins/kernel.rb

@@ -183,23 +183,5 @@ Ohai.plugin(:Kernel) do
 
     kernel[:machine] = machine_lookup("#{kernel[:cs_info][:system_type]}")
 
-    kext = Mash.new
-    pnp_drivers = Mash.new
-
-    drivers = wmi.instances_of('Win32_PnPSignedDriver')
-    drivers.each do |driver|
-      pnp_drivers[driver['deviceid']] = Mash.new
-      driver.wmi_ole_object.properties_.each do |p|
-        pnp_drivers[driver['deviceid']][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
-      end
-      if driver['devicename']
-        kext[driver['devicename']] = pnp_drivers[driver['deviceid']]
-        kext[driver['devicename']][:version] = pnp_drivers[driver['deviceid']][:driver_version]
-        kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
-      end
-    end
-
-    kernel[:pnp_drivers] = pnp_drivers
-    kernel[:modules] = kext
   end
 end

data/lib/ohai/plugins/linux/network.rb

@@ -33,6 +33,10 @@ Ohai.plugin(:Network) do
     encap
   end
 
+  def ipv6_enabled?
+    File.exist? "/proc/net/if_inet6"
+  end
+
   def iproute2_binary_available?
     ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].any? { |path| File.exist?(path) }
   end
@@ -60,12 +64,14 @@ Ohai.plugin(:Network) do
                     :default_route => "0.0.0.0/0",
                     :default_prefix => :default,
                     :neighbour_attribute => :arp
-                  },{
+                  }]
+
+      families << {
                     :name => "inet6",
                     :default_route => "::/0",
                     :default_prefix => :default_inet6,
                     :neighbour_attribute => :neighbour_inet6
-                  }]
+                  } if ipv6_enabled?
 
       so = shell_out("ip addr")
       cint = nil

data/lib/ohai/plugins/windows/drivers.rb

@@ -0,0 +1,47 @@
+#
+# Copyright:: Copyright (c) 2015 Chef Software
+# 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.
+#
+
+Ohai.plugin(:Drivers) do
+  provides "kernel/pnp_drivers", "kernel/modules"
+  depends "kernel"
+
+  collect_data(:windows) do
+    require 'wmi-lite/wmi'
+
+    wmi = WmiLite::Wmi.new
+
+    kext = Mash.new
+    pnp_drivers = Mash.new
+
+    drivers = wmi.instances_of('Win32_PnPSignedDriver')
+    drivers.each do |driver|
+      pnp_drivers[driver['deviceid']] = Mash.new
+      driver.wmi_ole_object.properties_.each do |p|
+        pnp_drivers[driver['deviceid']][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
+      end
+      if driver['devicename']
+        kext[driver['devicename']] = pnp_drivers[driver['deviceid']]
+        kext[driver['devicename']][:version] = pnp_drivers[driver['deviceid']][:driver_version]
+        kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
+      end
+    end
+
+    kernel[:pnp_drivers] = pnp_drivers
+    kernel[:modules] = kext
+
+  end
+end

data/lib/ohai/version.rb

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

data/spec/unit/plugins/kernel_spec.rb

@@ -74,11 +74,10 @@ describe Ohai::System, "plugin kernel" do
       cs_wmi = WmiLite::Wmi::Instance.new(cs)
 
       expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with('Win32_ComputerSystem').and_return(cs_wmi)
-      expect_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with('Win32_PnPSignedDriver').and_return([])
 
       @plugin.run
     end
-    it "should set the corrent system information" do
+    it "should set the correct system information" do
       expect(@ohai_system.data[:kernel][:name]).to eq("Microsoft Windows 7 Ultimate")
       expect(@ohai_system.data[:kernel][:release]).to eq("6.1.7601")
       expect(@ohai_system.data[:kernel][:version]).to eq("6.1.7601 Service Pack 1 Build 7601")

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

@@ -314,7 +314,7 @@ fe80::21c:eff:fe12:3456 dev eth0.153 lladdr 00:1c:0e:30:28:00 router REACHABLE
   end
 
   describe "#iproute2_binary_available?" do
-    ["/sbin/ip", "/usr/bin/ip"].each do |path|
+    ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].each do |path|
       it "accepts #{path}" do
         allow(File).to receive(:exist?).and_return(false)
         allow(File).to receive(:exist?).with(path).and_return(true)
@@ -546,6 +546,7 @@ Destination     Gateway         Genmask         Flags Metric Ref    Use Iface
   describe "for newer network features using iproute2 only" do
     before(:each) do
       allow(File).to receive(:exist?).with("/sbin/ip").and_return(true) # iproute2 only
+      allow(File).to receive(:exist?).with("/proc/net/if_inet6").and_return(true) # ipv6 is enabled
       plugin.run
     end
 
@@ -591,6 +592,17 @@ Destination     Gateway         Genmask         Flags Metric Ref    Use Iface
       expect(plugin['network']['interfaces']['eth3']['state']).to eq('up')
     end
 
+    describe "when IPv6 is disabled" do
+      before :each do
+        allow(File).to receive(:exist?).with("/proc/net/if_inet6").and_return(false)
+        plugin.run
+      end
+
+      it "doesn't set ip6address" do
+        expect(plugin['ip6address']).to be_nil
+      end
+    end
+
     describe "when dealing with routes" do
       it "adds routes" do
         plugin.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.3.0.rc.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -377,6 +377,7 @@ files:
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualization.rb
 - lib/ohai/plugins/windows/cpu.rb
+- lib/ohai/plugins/windows/drivers.rb
 - lib/ohai/plugins/windows/filesystem.rb
 - lib/ohai/plugins/windows/network.rb
 - lib/ohai/plugins/windows/platform.rb
@@ -530,13 +531,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON
 test_files: []
+has_rdoc: