ohai 8.2.0 → 8.3.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4fdcd52a082fc45f9b8290c5f9a0b235ad4ee8f
-  data.tar.gz: bdf90d6b5e6c9fd85d9ad4c441cf90e5d30fc3af
+  metadata.gz: 31c6368a87a221d3913d78e534ec4ab999877239
+  data.tar.gz: 37cfbd9731bfbde300a92fb74735a883baf3bb59
 SHA512:
-  metadata.gz: cf65d4334c84ae6d7f0fc28348370763d9f7b2f25cc5ca95fb9dfab6bca028c66f3be0884235ce6ea14b2b696494b150ac285af8e84358ebf652c41e8224fb08
-  data.tar.gz: f1d9cb9f4d98062ef81d1087fb02d6a261762d096ca5cdae6d643e5817019e1148614873d8bdd564e356ec520460116c6990e426619dbbab826b2bb99f0ac43d
+  metadata.gz: 092f4f66e9978df246c2903a0e408635bff308d2f73a5deb49198a0252eef4364969b6b470ca79b7b72cfa12c82818b9d3e6f4a7985556467b72b5ece38efe8a
+  data.tar.gz: bf77b83c2ade4da425469ccba8713aa0ba48e06adc5d5c42f900ea3caa71c8241d07d632269f7cd718e8bdeae014c05db1cd3c7ea4a8100116c335872861b3f0

data/lib/ohai/common/dmi.rb

@@ -106,6 +106,7 @@ module Ohai
               next if field.to_s == 'size'
               next if field.to_s == 'record_id'
               translated = field.downcase.gsub(/[^a-z0-9]/, '_')
+              value      = value.strip
               if in_common.has_key?(translated)
                 in_common[translated] = nil unless in_common[translated] == value
               else
@@ -115,7 +116,7 @@ module Ohai
           }
           in_common.each{ |field, value|
             next if value == nil
-            dmi[type][field] = value
+            dmi[type][field] = value.strip
           }
         }
       end

data/lib/ohai/plugins/dmi.rb

@@ -57,6 +57,7 @@ Ohai.plugin(:DMI) do
     # ... similar lines trimmed
     so.stdout.lines do |line|
       next if blank_line.match(line)
+      line = line.encode(line.encoding, :universal_newline => true)
 
       if dmidecode_version = dmidecode_version_line.match(line)
         dmi[:dmidecode_version] = dmidecode_version[1]

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

@@ -34,7 +34,7 @@ Ohai.plugin(:Network) do
   end
 
   def iproute2_binary_available?
-    ["/sbin/ip", "/usr/bin/ip"].any? { |path| File.exist?(path) }
+    ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].any? { |path| File.exist?(path) }
   end
 
   collect_data(:linux) do

data/lib/ohai/version.rb

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

data/spec/spec_helper.rb

@@ -32,6 +32,10 @@ def get_plugin(plugin, ohai = Ohai::System.new, path = PLUGIN_PATH)
   loader.load_plugin(File.join(path, "#{plugin}.rb"))
 end
 
+def convert_windows_output(stdout)
+    stdout.gsub("\n", "\r\n")
+end
+
 def it_should_check_from(plugin, attribute, from, value)
   it "should set the #{attribute} to the value from '#{from}'" do
     @plugin.run

data/spec/unit/plugins/dmi_spec.rb

@@ -123,6 +123,12 @@ describe Ohai::System, "plugin dmi" do
         @plugin.run
         expect(@plugin[:dmi][id][attribute]).to eql(value)
       end
+      it "should have [:dmi][:#{id}][:#{attribute}] set for windows output" do
+        @stdout = convert_windows_output(DMI_OUT)
+        expect(@plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, @stdout, ""))
+        @plugin.run
+        expect(@plugin[:dmi][id][attribute]).to eql(value)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.0.rc.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -530,12 +530,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON