lib/ohai/plugins/kernel.rb in ohai-8.10.0 vs lib/ohai/plugins/kernel.rb in ohai-8.11.1

- old
+ new

@@ -78,11 +78,11 @@ kernel init_kernel kernel[:os] = kernel[:name] so = shell_out("sysctl -n hw.optional.x86_64") if so.stdout.split($/)[0].to_i == 1 - kernel[:machine] = 'x86_64' + kernel[:machine] = "x86_64" end modules = Mash.new so = shell_out("kextstat -k -l") so.stdout.lines do |line| @@ -155,44 +155,44 @@ so = shell_out("modinfo") # EXAMPLE: # Id Loadaddr Size Info Rev Module Name # 6 1180000 4623 1 1 specfs (filesystem for specfs) - module_description = /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/ + module_description = /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/ so.stdout.lines do |line| if mod = module_description.match(line) - modules[mod[4]] = { :id => mod[1].to_i, :loadaddr => mod[2], :size => mod[3].to_i(16), :description => mod[5]} + modules[mod[4]] = { :id => mod[1].to_i, :loadaddr => mod[2], :size => mod[3].to_i(16), :description => mod[5] } end end kernel[:modules] = modules end collect_data(:windows) do - require 'win32ole' - require 'wmi-lite/wmi' + require "win32ole" + require "wmi-lite/wmi" WIN32OLE.codepage = WIN32OLE::CP_UTF8 wmi = WmiLite::Wmi.new kernel Mash.new - host = wmi.first_of('Win32_OperatingSystem') + host = wmi.first_of("Win32_OperatingSystem") kernel[:os_info] = Mash.new host.wmi_ole_object.properties_.each do |p| kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase] end kernel[:name] = "#{kernel[:os_info][:caption]}" kernel[:release] = "#{kernel[:os_info][:version]}" kernel[:version] = "#{kernel[:os_info][:version]} #{kernel[:os_info][:csd_version]} Build #{kernel[:os_info][:build_number]}" kernel[:os] = os_lookup(kernel[:os_info][:os_type]) || languages[:ruby][:host_os] - host = wmi.first_of('Win32_ComputerSystem') + host = wmi.first_of("Win32_ComputerSystem") kernel[:cs_info] = Mash.new cs_info_blacklist = [ - 'oem_logo_bitmap' + "oem_logo_bitmap" ] host.wmi_ole_object.properties_.each do |p| if !cs_info_blacklist.include?(p.name.wmi_underscore) kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase] end