ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/darwin/hardware.rb

@@ -1,99 +1,99 @@
-# frozen_string_literal: true
-#
-# Author:: Nate Walck (<nate.walck@gmail.com>)
-# Copyright:: Copyright (c) 2016-present Facebook, Inc.
-# 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(:Hardware) do
-  provides "hardware"
-
-  def system_profiler(datatype)
-    sp_cmd = "system_profiler #{datatype} -xml"
-    # Hardware queries
-    sp_std = shell_out(sp_cmd)
-    Plist.parse_xml(sp_std.stdout)
-  end
-
-  collect_data(:darwin) do
-    unless hardware
-      hardware Mash.new
-    else
-      logger.trace("Plugin Hardware: namespace already exists")
-      next
-    end
-
-    require "plist"
-
-    hw_hash = system_profiler("SPHardwareDataType")
-    hw_hash[0]["_items"][0].delete("_name")
-    hardware.merge!(hw_hash[0]["_items"][0])
-
-    # ProductName:	Mac OS X
-    # ProductVersion:	10.15.6
-    # BuildVersion:	19G46c
-    shell_out("sw_vers").stdout.lines.each do |line|
-      case line
-      when /^ProductName:\s*(.*)$/
-        hardware["operating_system"] = Regexp.last_match[1].strip
-      when /^ProductVersion:\s*(.*)$/
-        hardware["operating_system_version"] = Regexp.last_match[1].strip
-      when /^BuildVersion:\s*(.*)$/
-        hardware["build_version"] = Regexp.last_match[1].strip
-      end
-    end
-
-    hardware["architecture"] = shell_out("uname -m").stdout.strip
-
-    # Storage queries
-    storage = []
-    storage_hash = system_profiler("SPStorageDataType")
-    drives = storage_hash[0]["_items"]
-    drives.each do |drive_entry|
-      drive = Mash.new
-      drive[:name] = drive_entry["_name"]
-      drive[:bsd_name] = drive_entry["bsd_name"]
-      drive[:capacity] = drive_entry["size_in_bytes"]
-      if drive_entry.key?("com.apple.corestorage.pv")
-        drive[:drive_type] = drive_entry["com.apple.corestorage.pv"][0]["medium_type"]
-        drive[:smart_status] = drive_entry["com.apple.corestorage.pv"][0]["smart_status"]
-        drive[:partitions] = drive_entry["com.apple.corestorage.pv"].count
-      end
-      storage << drive
-    end
-
-    hardware["storage"] = storage
-
-    # Battery queries
-    battery_hash = system_profiler("SPPowerDataType")
-    power_entries = battery_hash[0]["_items"]
-    battery = Mash.new
-    power_entries.each do |entry|
-      if entry.value?("spbattery_information")
-        charge = entry["sppower_battery_charge_info"]
-        health = entry["sppower_battery_health_info"]
-        battery[:current_capacity] = charge["sppower_battery_current_capacity"]
-        battery[:max_capacity] = charge["sppower_battery_max_capacity"]
-        battery[:fully_charged] = charge["sppower_battery_fully_charged"].eql?("TRUE")
-        battery[:is_charging] = charge["sppower_battery_is_charging"].eql?("TRUE")
-        battery[:charge_cycle_count] = health["sppower_battery_cycle_count"]
-        battery[:health] = health["sppower_battery_health"]
-        battery[:serial] = entry["sppower_battery_model_info"]["sppower_battery_serial_number"]
-        battery[:remaining] = (battery["current_capacity"].to_f / battery["max_capacity"].to_f * 100).to_i
-      end
-    end
-    hardware[:battery] = battery
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Nate Walck (<nate.walck@gmail.com>)
+# Copyright:: Copyright (c) 2016-present Facebook, Inc.
+# 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(:Hardware) do
+  provides "hardware"
+
+  def system_profiler(datatype)
+    sp_cmd = "system_profiler #{datatype} -xml"
+    # Hardware queries
+    sp_std = shell_out(sp_cmd)
+    Plist.parse_xml(sp_std.stdout)
+  end
+
+  collect_data(:darwin) do
+    unless hardware
+      hardware Mash.new
+    else
+      logger.trace("Plugin Hardware: namespace already exists")
+      next
+    end
+
+    require "plist"
+
+    hw_hash = system_profiler("SPHardwareDataType")
+    hw_hash[0]["_items"][0].delete("_name")
+    hardware.merge!(hw_hash[0]["_items"][0])
+
+    # ProductName:	Mac OS X
+    # ProductVersion:	10.15.6
+    # BuildVersion:	19G46c
+    shell_out("sw_vers").stdout.lines.each do |line|
+      case line
+      when /^ProductName:\s*(.*)$/
+        hardware["operating_system"] = Regexp.last_match[1].strip
+      when /^ProductVersion:\s*(.*)$/
+        hardware["operating_system_version"] = Regexp.last_match[1].strip
+      when /^BuildVersion:\s*(.*)$/
+        hardware["build_version"] = Regexp.last_match[1].strip
+      end
+    end
+
+    hardware["architecture"] = shell_out("uname -m").stdout.strip
+
+    # Storage queries
+    storage = []
+    storage_hash = system_profiler("SPStorageDataType")
+    drives = storage_hash[0]["_items"]
+    drives.each do |drive_entry|
+      drive = Mash.new
+      drive[:name] = drive_entry["_name"]
+      drive[:bsd_name] = drive_entry["bsd_name"]
+      drive[:capacity] = drive_entry["size_in_bytes"]
+      if drive_entry.key?("com.apple.corestorage.pv")
+        drive[:drive_type] = drive_entry["com.apple.corestorage.pv"][0]["medium_type"]
+        drive[:smart_status] = drive_entry["com.apple.corestorage.pv"][0]["smart_status"]
+        drive[:partitions] = drive_entry["com.apple.corestorage.pv"].count
+      end
+      storage << drive
+    end
+
+    hardware["storage"] = storage
+
+    # Battery queries
+    battery_hash = system_profiler("SPPowerDataType")
+    power_entries = battery_hash[0]["_items"]
+    battery = Mash.new
+    power_entries.each do |entry|
+      if entry.value?("spbattery_information")
+        charge = entry["sppower_battery_charge_info"]
+        health = entry["sppower_battery_health_info"]
+        battery[:current_capacity] = charge["sppower_battery_current_capacity"]
+        battery[:max_capacity] = charge["sppower_battery_max_capacity"]
+        battery[:fully_charged] = charge["sppower_battery_fully_charged"].eql?("TRUE")
+        battery[:is_charging] = charge["sppower_battery_is_charging"].eql?("TRUE")
+        battery[:charge_cycle_count] = health["sppower_battery_cycle_count"]
+        battery[:health] = health["sppower_battery_health"]
+        battery[:serial] = entry["sppower_battery_model_info"]["sppower_battery_serial_number"]
+        battery[:remaining] = (battery["current_capacity"].to_f / battery["max_capacity"].to_f * 100).to_i
+      end
+    end
+    hardware[:battery] = battery
+  end
+end

data/lib/ohai/plugins/darwin/memory.rb

@@ -1,62 +1,62 @@
-# frozen_string_literal: true
-#
-# Author:: Patrick Collins (<pat@burned.com>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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(:Memory) do
-  provides "memory"
-
-  collect_data(:darwin) do
-    memory Mash.new
-
-    installed_memory = shell_out("sysctl -n hw.memsize").stdout.to_i / 1024 / 1024.0
-    memory[:total] = "#{installed_memory.to_i}MB"
-
-    total_consumed = 0
-    active = 0
-    inactive = 0
-    vm_stat = shell_out("vm_stat").stdout
-    vm_stat_match = /page size of (\d+) bytes/.match(vm_stat)
-    page_size = if vm_stat_match && vm_stat_match[1]
-                  vm_stat_match[1].to_i
-                else
-                  4096
-                end
-
-    vm_stat.split("\n").each do |line|
-      ["wired down", "active", "inactive"].each do |match|
-        unless line.index("Pages #{match}:").nil?
-          pages = line.split.last.to_i
-          megabyte_val = (pages * page_size) / 1024 / 1024.0
-          total_consumed += megabyte_val
-          case match
-          when "wired down", "active"
-            active += megabyte_val.to_i
-          when "inactive"
-            inactive += megabyte_val.to_i
-          end
-        end
-      end
-    end
-
-    memory[:active] = "#{active}MB" if active > 0
-    memory[:inactive] = "#{inactive}MB" if inactive > 0
-
-    free_memory = installed_memory - total_consumed
-    memory[:free] = "#{free_memory.to_i}MB" if total_consumed > 0
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Patrick Collins (<pat@burned.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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(:Memory) do
+  provides "memory"
+
+  collect_data(:darwin) do
+    memory Mash.new
+
+    installed_memory = shell_out("sysctl -n hw.memsize").stdout.to_i / 1024 / 1024.0
+    memory[:total] = "#{installed_memory.to_i}MB"
+
+    total_consumed = 0
+    active = 0
+    inactive = 0
+    vm_stat = shell_out("vm_stat").stdout
+    vm_stat_match = /page size of (\d+) bytes/.match(vm_stat)
+    page_size = if vm_stat_match && vm_stat_match[1]
+                  vm_stat_match[1].to_i
+                else
+                  4096
+                end
+
+    vm_stat.split("\n").each do |line|
+      ["wired down", "active", "inactive"].each do |match|
+        unless line.index("Pages #{match}:").nil?
+          pages = line.split.last.to_i
+          megabyte_val = (pages * page_size) / 1024 / 1024.0
+          total_consumed += megabyte_val
+          case match
+          when "wired down", "active"
+            active += megabyte_val.to_i
+          when "inactive"
+            inactive += megabyte_val.to_i
+          end
+        end
+      end
+    end
+
+    memory[:active] = "#{active}MB" if active > 0
+    memory[:inactive] = "#{inactive}MB" if inactive > 0
+
+    free_memory = installed_memory - total_consumed
+    memory[:free] = "#{free_memory.to_i}MB" if total_consumed > 0
+  end
+end