ohai 15.6.3 → 15.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257f27a9e93bbd45470aa2e42c2a9e1e503e8d2e6568a5cbca4d8d964724e854
-  data.tar.gz: aa10fc60bdf94170e7d14f9bf38278974baf68995869c7a9467f45081d193e61
+  metadata.gz: 6bbb71abc64958b4f0ff697d800c043ad2a9fc2c27b8307c8f261b5f3d6dbccd
+  data.tar.gz: c4cd96f186a549a998edcbbbf2f7bcead5d5863f8a06b4a2e53c0e12d025cb20
 SHA512:
-  metadata.gz: 2595eef2b22bcafea6af89415c1ab6566036badb6b8ffba253be3ada2529632ad8210201d38bd5b56d2087cb5b2f2f513479a77ba8e0af5385ade1c250ae50dc
-  data.tar.gz: 4b8c0e3daa5eda327ce6f48f4c7ed34f7e045262e68a3f99c7e78667cc00f15ec4674c37efe4f134c71768841635739cfef06814b598c435cf70cd0d4058ffdb
+  metadata.gz: 311e06e5bd82ab679605f5ecba6de264671d033ec033a0c612e797a867278d5e4d8b1bdd00d0b61e23f576b9321d3f0609ab2677ebbf1763e50e9d330312fa19
+  data.tar.gz: 2a84f84836c3063c371c8f31d1456ee939114630ccd8474c8a164453c841b746eb676c17b7f482625de40f7bfe78d02e3fc26852645f47b1487261e11414e0ed

data/lib/ohai/plugins/filesystem.rb

@@ -162,6 +162,9 @@ Ohai.plugin(:Filesystem) do
   end
 
   ### Windows specific methods BEGINS
+  # Drive types
+  DRIVE_TYPE ||= %w{unknown no_root_dir removable local network cd ram}.freeze
+
   # Volume encryption or decryption status
   #
   # @see https://docs.microsoft.com/en-us/windows/desktop/SecProv/getconversionstatus-win32-encryptablevolume#parameters
@@ -173,7 +176,7 @@ Ohai.plugin(:Filesystem) do
 
   # Returns a Mash loaded with logical details
   #
-  # Uses Win32_LogicalDisk and logical_properties to return encryption details of volumes.
+  # Uses Win32_LogicalDisk and logical_properties to return general details of volumes.
   #
   # Returns an empty Mash in case of any WMI exception.
   #
@@ -184,7 +187,7 @@ Ohai.plugin(:Filesystem) do
   def logical_info
     wmi = WmiLite::Wmi.new("Root\\CIMV2")
 
-    # Note: we should really be parsing Win32_Volume and Win32_Mapped drive.
+    # TODO: We should really be parsing Win32_Volume and Win32_MountPoint.
     disks = wmi.instances_of("Win32_LogicalDisk")
     logical_properties(disks)
   rescue WmiLite::WmiException
@@ -234,9 +237,9 @@ Ohai.plugin(:Filesystem) do
     properties = Mash.new
     disks.each do |disk|
       property = Mash.new
-      # In windows the closet thing we have to a device is the volume_name
+      # In windows the closest thing we have to a device is the volume name
       # and the "mountpoint" is the drive letter...
-      device = disk["volume_name"].to_s.downcase
+      device = disk["volumename"].to_s.downcase
       mount = disk["deviceid"]
       property[:kb_size] = disk["size"] ? disk["size"].to_i / 1000 : 0
       property[:kb_available] = disk["freespace"].to_i / 1000
@@ -244,7 +247,10 @@ Ohai.plugin(:Filesystem) do
       property[:percent_used] = (property[:kb_size] == 0 ? 0 : (property[:kb_used] * 100 / property[:kb_size]))
       property[:mount] = mount
       property[:fs_type] = disk["filesystem"].to_s.downcase
-      property[:volume_name] = device
+      property[:drive_type] = disk["drivetype"].to_i
+      property[:drive_type_string] = DRIVE_TYPE[disk["drivetype"].to_i]
+      property[:drive_type_human] = disk["description"].to_s
+      property[:volume_name] = disk["volumename"].to_s
       property[:device] = device
 
       key = "#{device},#{mount}"
@@ -747,7 +753,7 @@ Ohai.plugin(:Filesystem) do
 
   collect_data(:windows) do
     require "wmi-lite/wmi"
-    require "ohai/mash"
+    require_relative "../mash"
 
     fs = merge_info(logical_info, encryptable_info)
 

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 15.6.3
+  version: 15.7.3
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu