ohai 8.17.0 → 8.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae245303a831b0eaec644eb464458a3976fd12e0
-  data.tar.gz: 1fd1433f699f6c4e7dc42de7259389d8049dac16
+  metadata.gz: 4b474815c9a67658b2190cad18967511a48593d4
+  data.tar.gz: 268d26318d08819041eb136cb06dff59a15cab5e
 SHA512:
-  metadata.gz: eeca17b1356293ad8655b890d84aa99deda9eee3830e68be07f9c277dad9c33109f29654a505274d0329d49620ab47dd7fa9371480c24c447ee6285acf6d2876
-  data.tar.gz: 6baa6085bee325657976ed297b890587c10afa5e4ad4b04f75c35705eeabed227690d935bafd896853041052a6a31216bcf8e690c47a6e3aa7b068b731c41999
+  metadata.gz: 5a7d729b4dab3483ab3d08ed0e383503a7720ef3bad30b0395c44a1c00419531db582f7d9e9fdb6f6d93ac40049da37fbcbde3fb1bae666b2368187e7aeba980
+  data.tar.gz: 8dfa9640dcf754831ebf088fa544e81d9de823a1b5dc9040f4d1fd2c34ce358d3dab20f5cfa758d319d7132185a31e2718cee7f34638cac7a41cd90cdf91cdbd

data/Gemfile

@@ -6,6 +6,8 @@ group :development do
   gem "sigar", :platform => "ruby"
 
   gem "chefstyle", "= 0.3.1"
-  # gem 'pry-byebug'
-  # gem 'pry-stack_explorer'
+  gem "overcommit", ">= 0.34.1"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
+  gem "rb-readline"
 end

data/lib/ohai/plugins/powershell.rb

@@ -46,7 +46,7 @@ Ohai.plugin(:Powershell) do
         powershell[:serialization_version] = version_info["SerializationVersion"]
         powershell[:clr_version] = version_info["CLRVersion"]
         powershell[:build_version] = version_info["BuildVersion"]
-        powershell[:compatible_versions] = parse_compatible_versions(version_info["PSCompatibleVersions"])
+        powershell[:compatible_versions] = parse_compatible_versions
         powershell[:remoting_protocol_version] = version_info["PSRemotingProtocolVersion"]
         languages[:powershell] = powershell unless powershell.empty?
       end
@@ -55,12 +55,28 @@ Ohai.plugin(:Powershell) do
     end
   end
 
-  def parse_compatible_versions(versions_str)
-    if versions_str
-      if versions_str.strip.start_with?("{") && versions_str.end_with?("}")
-        versions = versions_str.gsub(/[{}\s]+/, "").split(",")
-        versions if versions.length
-      end
+  def version_command
+    [
+      "$progresspreference = 'silentlycontinue'",
+      "$PSVersionTable.PSCompatibleVersions | foreach {$_.tostring()}",
+    ].join("; ")
+  end
+
+  def powershell_command
+    ["powershell.exe",
+      "-NoLogo",
+      "-NonInteractive",
+      "-NoProfile",
+      "-Command",
+    ].join(" ")
+  end
+
+  def parse_compatible_versions
+    so = shell_out("#{powershell_command} \"#{version_command}\"")
+    versions = []
+    so.stdout.strip.each_line do |line|
+      versions << line.strip
     end
+    versions
   end
 end

data/lib/ohai/plugins/timezone.rb

@@ -15,9 +15,10 @@
 # limitations under the License.
 
 Ohai.plugin(:Timezone) do
-  provides "timezone"
+  provides "time/timezone"
 
   collect_data(:default) do
-    timezone Time.now.getlocal.zone
+    time Mash.new unless time
+    time[:timezone] = Time.now.getlocal.zone
   end
 end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.17.0"
+  VERSION = "8.17.1"
 end

data/spec/unit/plugins/powershell_spec.rb

@@ -43,8 +43,10 @@ PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
 PSRemotingProtocolVersion      2.2
 
 END
+    compat_version_array = ["1.0", "2.0", "3.0", "4.0"]
 
     allow(plugin).to receive(:shell_out).with(anything()).and_return(mock_shell_out(0, v4_output, ""))
+    allow(plugin).to receive(:parse_compatible_versions).and_return(compat_version_array)
     plugin.run
     expect(plugin.languages[:powershell][:version]).to eql("4.0")
     expect(plugin.languages[:powershell][:ws_man_stack_version]).to eql("3.0")

data/spec/unit/plugins/timezone_spec.rb

@@ -25,6 +25,6 @@ describe Ohai::System, "timezone plugin" do
 
   it "should get the local timezone" do
     @plugin.run
-    expect(@plugin["timezone"]).to eq("ZZZ")
+    expect(@plugin["time"]["timezone"]).to eq("ZZZ")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.17.0
+  version: 8.17.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu