sys-cpu 1.0.1 → 1.0.4

data/lib/sys/windows/sys/cpu.rb

@@ -1,15 +1,8 @@
+# frozen_string_literal: true
+
 require 'win32ole'
 require 'socket'
 
-# See Ruby bugs #2618 and #7681. This is a workaround.
-BEGIN{
-  require 'win32ole'
-  if RUBY_VERSION.to_f < 2.0
-    WIN32OLE.ole_initialize
-    at_exit { WIN32OLE.ole_uninitialize }
-  end
-}
-
 # The Sys module serves only as a namespace
 module Sys
   # Encapsulates system CPU information
@@ -17,10 +10,10 @@ module Sys
     # Error raised if any of the Sys::CPU methods fail.
     class Error < StandardError; end
 
-    private
-
     # Base connect string
-    BASE_CS = "winmgmts:{impersonationLevel=impersonate}" # :nodoc:
+    BASE_CS = 'winmgmts:{impersonationLevel=impersonate}' # :nodoc:
+
+    private_constant :BASE_CS
 
     # Fields used in the CPUStruct
     fields = %w[
@@ -71,21 +64,21 @@ module Sys
     ]
 
     # The struct returned by the CPU.processors method
-    CPUStruct = Struct.new("CPUStruct", *fields) # :nodoc:
+    CPUStruct = Struct.new('CPUStruct', *fields) # :nodoc:
 
-    public
+    private_constant :CPUStruct
 
     # Returns the +host+ CPU's architecture, or nil if it cannot be
     # determined.
     #
-    def self.architecture(host=Socket.gethostname)
+    def self.architecture(host = Socket.gethostname)
       cs = BASE_CS + "//#{host}/root/cimv2:Win32_Processor='cpu0'"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        self.get_cpu_arch(wmi.Architecture)
+        get_cpu_arch(wmi.Architecture)
       end
     end
 
@@ -98,10 +91,10 @@ module Sys
       cs = BASE_CS + "//#{host}/root/cimv2:Win32_Processor='cpu#{cpu_num}'"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        return wmi.CurrentClockSpeed
+        wmi.CurrentClockSpeed
       end
     end
 
@@ -117,10 +110,10 @@ module Sys
       cs = BASE_CS + "//#{host}/root/cimv2:Win32_Processor='cpu#{cpu_num}'"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        return wmi.LoadPercentage
+        wmi.LoadPercentage
       end
     end
 
@@ -130,10 +123,10 @@ module Sys
       cs = BASE_CS + "//#{host}/root/cimv2:Win32_Processor='cpu0'"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        return wmi.Name
+        wmi.Name
       end
     end
 
@@ -145,10 +138,10 @@ module Sys
       cs = BASE_CS + "//#{host}/root/cimv2:Win32_ComputerSystem='#{host}'"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        return wmi.NumberOfProcessors
+        wmi.NumberOfProcessors
       end
     end
 
@@ -201,20 +194,21 @@ module Sys
     # * voltage_caps
     #
     # Note that not all of these members will necessarily be defined.
-    #
+    #--
+    # rubocop:disable Metrics/BlockLength
     def self.processors(host = Socket.gethostname) # :yields: CPUStruct
       begin
         wmi = WIN32OLE.connect(BASE_CS + "//#{host}/root/cimv2")
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        wmi.InstancesOf("Win32_Processor").each{ |cpu|
+        wmi.InstancesOf('Win32_Processor').each do |cpu|
           yield CPUStruct.new(
             cpu.AddressWidth,
-            self.get_cpu_arch(cpu.Architecture),
-            self.get_availability(cpu.Availability),
+            get_cpu_arch(cpu.Architecture),
+            get_availability(cpu.Availability),
             cpu.Caption,
-            self.get_cmec(cpu.ConfigManagerErrorCode),
+            get_cmec(cpu.ConfigManagerErrorCode),
             cpu.ConfigManagerUserConfig,
             get_status(cpu.CpuStatus),
             cpu.CreationClassName,
@@ -226,7 +220,7 @@ module Sys
             cpu.ErrorCleared,
             cpu.ErrorDescription,
             cpu.ExtClock,
-            self.get_family(cpu.Family),
+            get_family(cpu.Family),
             cpu.InstallDate,
             cpu.L2CacheSize,
             cpu.L2CacheSpeed,
@@ -241,7 +235,7 @@ module Sys
             cpu.PowerManagementSupported,
             cpu.PowerManagementCapabilities,
             cpu.ProcessorId,
-            self.get_processor_type(cpu.ProcessorType),
+            get_processor_type(cpu.ProcessorType),
             cpu.Revision,
             cpu.Role,
             cpu.SocketDesignation,
@@ -251,24 +245,26 @@ module Sys
             cpu.SystemCreationClassName,
             cpu.SystemName,
             cpu.UniqueId,
-            self.get_upgrade_method(cpu.UpgradeMethod),
+            get_upgrade_method(cpu.UpgradeMethod),
             cpu.Version,
-            self.get_voltage_caps(cpu.VoltageCaps)
+            get_voltage_caps(cpu.VoltageCaps)
           )
-        }
+        end
       end
     end
 
+    # rubocop:enable Metrics/BlockLength
+
     # Returns a string indicating the type of processor, e.g. GenuineIntel.
     #
     def self.cpu_type(host = Socket.gethostname)
       cs = BASE_CS + "//#{host}/root/cimv2:Win32_Processor='cpu0'"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       else
-        return wmi.Manufacturer
+        wmi.Manufacturer
       end
     end
 
@@ -280,517 +276,640 @@ module Sys
     def self.get_cmec(num)
       case num
         when 0
-          str = "The device is working properly."
-          return str
+          'The device is working properly.'
         when 1
-          str = "The device is not configured correctly."
-          return str
+          'The device is not configured correctly.'
         when 2
-          str = "Windows cannot load the driver for the device."
-          return str
+          'Windows cannot load the driver for the device.'
         when 3
-          str = "The driver for the device might be corrupted, or the"
-          str << " system may be running low on memory or other"
-          str << " resources."
-          return str
+          str = 'The driver for the device might be corrupted, or the'
+          str << ' system may be running low on memory or other'
+          str << ' resources.'
+          str
         when 4
-          str = "The device is not working properly. One of the drivers"
-          str << " or the registry might be corrupted."
-          return str
+          str = 'The device is not working properly. One of the drivers'
+          str << ' or the registry might be corrupted.'
+          str
         when 5
-          str = "The driver for this device needs a resource that"
-          str << " Windows cannot manage."
-          return str
+          str = 'The driver for this device needs a resource that'
+          str << ' Windows cannot manage.'
+          str
         when 6
-          str = "The boot configuration for this device conflicts with"
-          str << " other devices."
-          return str
+          str = 'The boot configuration for this device conflicts with'
+          str << ' other devices.'
+          str
         when 7
-          str = "Cannot filter."
-          return str
+          'Cannot filter.'
         when 8
-          str = "The driver loader for the device is missing."
-          return str
+          'The driver loader for the device is missing.'
         when 9
-          str = "This device is not working properly because the"
-          str << " controlling firmware is reporting the resources"
-          str << " for the device incorrectly."
-          return str
+          str = 'This device is not working properly because the'
+          str << ' controlling firmware is reporting the resources'
+          str << ' for the device incorrectly.'
+          str
         when 10
-          str = "This device cannot start."
-          return str
+          'This device cannot start.'
         when 11
-          str = "This device failed."
-          return str
+          'This device failed.'
         when 12
-          str = "This device cannot find enough free resources that"
-          str << " it can use."
-          return str
+          str = 'This device cannot find enough free resources that'
+          str << ' it can use.'
+          str
         when 13
-          str = "Windows cannot verify this device's resources."
-          return str
+          "Windows cannot verify this device's resources."
         when 14
-          str = "This device cannot work properly until you restart"
-          str << " your computer."
-          return str
+          str = 'This device cannot work properly until you restart'
+          str << ' your computer.'
+          str
         when 15
-          str = "This device is not working properly because there is"
-          str << " probably a re-enumeration problem."
-          return str
+          str = 'This device is not working properly because there is'
+          str << ' probably a re-enumeration problem.'
+          str
         when 16
-           str = "Windows cannot identify all the resources this device "
-           str << " uses."
-           return str
+          str = 'Windows cannot identify all the resources this device '
+          str << ' uses.'
+          str
         when 17
-          str = "This device is asking for an unknown resource type."
-          return str
+          'This device is asking for an unknown resource type.'
         when 18
-          str = "Reinstall the drivers for this device."
-          return str
+          'Reinstall the drivers for this device.'
         when 19
-          str = "Failure using the VXD loader."
-          return str
+          'Failure using the VXD loader.'
         when 20
-          str = "Your registry might be corrupted."
-          return str
+          'Your registry might be corrupted.'
         when 21
-          str = "System failure: try changing the driver for this device."
-          str << " If that does not work, see your hardware documentation."
-          str << " Windows is removing this device."
-          return str
+          str = 'System failure: try changing the driver for this device.'
+          str << ' If that does not work, see your hardware documentation.'
+          str << ' Windows is removing this device.'
+          str
         when 22
-          str = "This device is disabled."
-          return str
+          'This device is disabled.'
         when 23
-          str = "System failure: try changing the driver for this device."
+          str = 'System failure: try changing the driver for this device.'
           str << "If that doesn't work, see your hardware documentation."
-          return str
+          str
         when 24
-          str = "This device is not present, not working properly, or"
-          str << " does not have all its drivers installed."
-          return str
-        when 25
-          str = "Windows is still setting up this device."
-          return str
-        when 26
-          str = "Windows is still setting up this device."
-          return str
+          str = 'This device is not present, not working properly, or'
+          str << ' does not have all its drivers installed.'
+          str
+        when 25, 26
+          'Windows is still setting up this device.'
         when 27
-          str = "This device does not have valid log configuration."
-          return str
+          'This device does not have valid log configuration.'
         when 28
-          str = "The drivers for this device are not installed."
-          return str
+          'The drivers for this device are not installed.'
         when 29
-          str = "This device is disabled because the firmware of the"
-          str << " device did not give it the required resources."
-          return str
+          str = 'This device is disabled because the firmware of the'
+          str << ' device did not give it the required resources.'
+          str
         when 30
-          str = "This device is using an Interrupt Request (IRQ)"
-          str << " resource that another device is using."
-          return str
+          str = 'This device is using an Interrupt Request (IRQ)'
+          str << ' resource that another device is using.'
+          str
         when 31
-          str = "This device is not working properly because Windows"
-          str << " cannot load the drivers required for this device"
-          return str
-        else
-          return nil
+          str = 'This device is not working properly because Windows'
+          str << ' cannot load the drivers required for this device'
+          str
       end
     end
 
+    private_class_method :get_cmec
+
     # Convert an cpu architecture number to a string
     def self.get_cpu_arch(num)
       case num
         when 0
-          return "x86"
+          'x86'
         when 1
-          return "MIPS"
+          'MIPS'
         when 2
-          return "Alpha"
+          'Alpha'
         when 3
-          return "PowerPC"
+          'PowerPC'
         when 6
-          return "IA64"
+          'IA64'
         when 9
-          return "x64"
-        else
-          return nil
+          'x64'
       end
     end
 
+    private_class_method :get_cpu_arch
+
     # convert an Availability number into a string
     def self.get_availability(num)
       case num
         when 1
-          return "Other"
+          'Other'
         when 2
-          return "Unknown"
+          'Unknown'
         when 3
-          return "Running"
+          'Running'
         when 4
-          return "Warning"
+          'Warning'
         when 5
-          return "In Test"
+          'In Test'
         when 6
-          return "Not Applicable"
+          'Not Applicable'
         when 7
-          return "Power Off"
+          'Power Off'
         when 8
-          return "Off Line"
+          'Off Line'
         when 9
-          return "Off Duty"
+          'Off Duty'
         when 10
-          return "Degraded"
+          'Degraded'
         when 11
-          return "Not Installed"
+          'Not Installed'
         when 12
-          return "Install Error"
+          'Install Error'
         when 13
-          return "Power Save - Unknown"
+          'Power Save - Unknown'
         when 14
-          return "Power Save - Low Power Mode"
+          'Power Save - Low Power Mode'
         when 15
-          return "Power Save - Standby"
+          'Power Save - Standby'
         when 16
-          return "Power Cycle"
+          'Power Cycle'
         when 17
-          return "Power Save - Warning"
+          'Power Save - Warning'
         when 18
-          return "Paused"
+          'Paused'
         when 19
-          return "Not Ready"
+          'Not Ready'
         when 20
-          return "Not Configured"
+          'Not Configured'
         when 21
-          return "Quiesced"
-        else
-          return nil
+          'Quiesced'
       end
     end
 
+    private_class_method :get_availability
+
     # convert CpuStatus to a string form.  Note that values 5 and 6 are
     # skipped because they're reserved.
     def self.get_status(num)
       case num
         when 0
-          return "Unknown"
+          'Unknown'
         when 1
-          return "Enabled"
+          'Enabled'
         when 2
-          return "Disabled by User via BIOS Setup"
+          'Disabled by User via BIOS Setup'
         when 3
-          return "Disabled By BIOS (POST Error)"
+          'Disabled By BIOS (POST Error)'
         when 4
-          return "Idle"
+          'Idle'
         when 7
-          return "Other"
-        else
-          return nil
+          'Other'
       end
     end
 
+    private_class_method :get_status
+
     # Convert a family number into the equivalent string
+    #
+    # NOTE: This could be out of date as new data is added occasionally.
+    # If there's a nicer way to do this, please send a PR my way.
+    #
     def self.get_family(num)
       case num
         when 1
-          return "Other"
+          'Other'
         when 2
-          return "Unknown"
+          'Unknown'
         when 3
-          return "8086"
+          '8086'
         when 4
-          return "80286"
+          '80286'
         when 5
-          return "80386"
+          '80386'
         when 6
-          return "80486"
+          '80486'
         when 7
-          return "8087"
+          '8087'
         when 8
-          return "80287"
+          '80287'
         when 9
-          return "80387"
+          '80387'
         when 10
-          return "80487"
+          '80487'
         when 11
-          return "Pentium?"
+          'Pentium'
         when 12
-          return "Pentium?"
+          'Pentium Pro'
         when 13
-          return "Pentium?"
+          'Pentium II'
         when 14
-          return "Pentium?"
+          'Pentium with MMX'
         when 15
-          return "Celeron?"
+          'Celeron'
         when 16
-          return "Pentium?"
+          'Pentium II Xeon'
         when 17
-          return "Pentium?"
+          'Pentium III'
         when 18
-          return "M1"
+          'M1'
         when 19
-          return "M2"
+          'M2'
         when 24
-          return "K5"
+          'K5'
         when 25
-          return "K6"
+          'K6'
         when 26
-          return "K6-2"
+          'K6-2'
         when 27
-          return "K6-3"
+          'K6-3'
         when 28
-          return "AMD"
+          'AMD Athlon'
         when 29
-          return "AMD?"
+          'AMD Duron'
         when 30
-          return "AMD2900"
+          'AMD2900'
         when 31
-          return "K6-2+"
+          'K6-2+'
         when 32
-          return "Power"
+          'Power PC'
         when 33
-          return "Power"
+          'Power 601'
         when 34
-          return "Power"
+          'Power 603'
         when 35
-          return "Power"
+          'Power 603+'
         when 36
-          return "Power"
+          'Power 604'
         when 37
-          return "Power"
+          'Power 620'
         when 38
-          return "Power"
+          'Power X704'
         when 39
-          return "Power"
+          'Power 750'
         when 48
-          return "Alpha"
+          'Alpha'
         when 49
-          return "Alpha"
+          'Alpha 21064'
         when 50
-          return "Alpha"
+          'Alpha 21066'
         when 51
-          return "Alpha"
+          'Alpha 21164'
         when 52
-          return "Alpha"
+          'Alpha 21164PC'
         when 53
-          return "Alpha"
+          'Alpha 21164a'
         when 54
-          return "Alpha"
+          'Alpha 21264'
         when 55
-          return "Alpha"
+          'Alpha 21364'
         when 64
-          return "MIPS"
+          'MIPS'
         when 65
-          return "MIPS"
+          'MIPS R4000'
         when 66
-          return "MIPS"
+          'MIPS R4200'
         when 67
-          return "MIPS"
+          'MIPS R4400'
         when 68
-          return "MIPS"
+          'MIPS R4600'
         when 69
-          return "MIPS"
+          'MIPS R10000'
         when 80
-          return "SPARC"
+          'SPARC'
         when 81
-          return "SuperSPARC"
+          'SuperSPARC'
         when 82
-          return "microSPARC"
+          'microSPARC II'
         when 83
-          return "microSPARC"
+          'microSPARC IIep'
         when 84
-          return "UltraSPARC"
+          'UltraSPARC'
         when 85
-          return "UltraSPARC"
+          'UltraSPARC II'
         when 86
-          return "UltraSPARC"
+          'UltraSPARC IIi'
         when 87
-          return "UltraSPARC"
+          'UltraSPARC III'
         when 88
-          return "UltraSPARC"
+          'UltraSPARC IIIi'
         when 96
-          return "68040"
+          '68040'
         when 97
-          return "68xxx"
+          '68xxx'
         when 98
-          return "68000"
+          '68000'
         when 99
-          return "68010"
+          '68010'
         when 100
-          return "68020"
+          '68020'
         when 101
-          return "68030"
+          '68030'
         when 112
-          return "Hobbit"
+          'Hobbit'
         when 120
-          return "Crusoe?"
+          'Crusoe TM5000'
         when 121
-          return "Crusoe?"
+          'Crusoe TM3000'
         when 128
-          return "Weitek"
+          'Weitek'
         when 130
-          return "Itanium?"
+          'Itanium'
+        when 131
+          'AMD Athlon 64'
+        when 132
+          'AMD Opteron'
+        when 133
+          'AMD Sempron'
+        when 134
+          'AMD Turion 64 Mobile'
+        when 135
+          'AMD Opteron Dual-Core'
+        when 136
+          'AMD Athlon 64 X2 Dual-Core'
+        when 137
+          'AMD Turion 64 X2 Mobile'
+        when 138
+          'AMD Opteron Quad-Core'
+        when 139
+          'AMD Opteron Third Generation'
+        when 140
+          'AMD Phenom FX Quad-Core'
+        when 141
+          'AMD Phenom X4 Quad-Core'
+        when 142
+          'AMD Phenom X2 Dual-Core'
+        when 143
+          'AMD Athlon X2 Dual-Core'
         when 144
-          return "PA-RISC"
+          'PA-RISC'
         when 145
-          return "PA-RISC"
+          'PA-RISC 8500'
         when 146
-          return "PA-RISC"
+          'PA-RISC 8000'
         when 147
-          return "PA-RISC"
+          'PA-RISC 7300LC'
         when 148
-          return "PA-RISC"
+          'PA-RISC 7200'
         when 149
-          return "PA-RISC"
+          'PA-RISC 7100LC'
         when 150
-          return "PA-RISC"
+          'PA-RISC 7100'
         when 160
-          return "V30"
+          'V30'
+        when 161
+          'Intel Xeon 3200 Quad-Core'
+        when 162
+          'Intel Xeon 3000 Dual-Core'
+        when 163
+          'Intel Xeon 5300 Quad-Core'
+        when 164
+          'Intel Xeon 5100 Dual-Core'
+        when 165
+          'Intel Xeon 5000 Dual-Core'
+        when 166
+          'Intel Xeon LV Dual-Core'
+        when 167
+          'Intel Xeon ULV Dual-Core'
+        when 168
+          'Intel Xeon 7100 Dual-Core'
+        when 169
+          'Intel Xeon 5400 Quad-Core'
+        when 170
+          'Intel Xeon Quad-Core'
+        when 171
+          'Intel Xeon 5200 Dual-Core'
+        when 172
+          'Intel Xeon 7200 Dual-Core'
+        when 173
+          'Intel Xeon 7300 Quad-Core'
+        when 174
+          'Intel Xeon 7400 Quad-Core'
+        when 175
+          'Intel Xeon 7400 Multi-Core'
         when 176
-          return "Pentium?"
+          'Pentium III Xeon'
         when 177
-          return "Pentium?"
+          'Pentium III with SpeedStep'
         when 178
-          return "Pentium?"
+          'Pentium 4'
         when 179
-          return "Intel?"
+          'Intel Xeon'
         when 180
-          return "AS400"
+          'AS400'
         when 181
-          return "Intel?"
+          'Intel Xeon MP'
         when 182
-          return "AMD"
+          'AMD Athlon XP'
         when 183
-          return "AMD"
+          'AMD Athlon MP'
         when 184
-          return "Intel?"
+          'Intel Itanium 2'
         when 185
-          return "AMD"
+          'Intel Pentium M'
+        when 186
+          'Intel Celeron D'
+        when 187
+          'Intel Pentium D'
+        when 188
+          'Intel Pentium Extreme Edition'
+        when 189
+          'Intel Core Solo'
         when 190
-          return "K7"
+          'K7'
+        when 191
+          'Intel Core2 Duo'
+        when 192
+          'Intel Core2 Solo'
+        when 193
+          'Intel Core2 Extreme'
+        when 194
+          'Intel Core2 Quad'
+        when 195
+          'Intel Core2 Extreme Mobile'
+        when 196
+          'Intel Core2 Duo Mobile'
+        when 197
+          'Intel Core2 Solo Mobile'
+        when 198
+          'Intel Core i7 Mobile'
+        when 199
+          'Intel Celeron Dual-Core'
         when 200
-          return "IBM390"
+          'zSeries S/390'
         when 201
-          return "G4"
+          'ESA/390 G4'
         when 202
-          return "G5"
+          'ESA/390 G5'
+        when 203
+          'ESA/390 G6'
+        when 204
+          'z/Architectur'
+        when 205
+          'Intel Core i5'
+        when 206
+          'Intel Core i3'
+        when 210
+          'VIA C7-M'
+        when 211
+          'VIA C7-D'
+        when 212
+          'VIA C7'
+        when 213
+          'VIA Eden'
+        when 214
+          'Intel Xeon Multi-Core'
+        when 215
+          'Intel Xeon 3xxx Dual-Core'
+        when 216
+          'Intel Xeon 3xxx Quad-Core'
+        when 217
+          'VIA Nano'
+        when 218
+          'Intel Xeon 5xxx Dual-Core'
+        when 219
+          'Intel Xeon 5xxx Quad-Core'
+        when 221
+          'Intel Xeon 7xxx Dual-Core'
+        when 222
+          'Intel Xeon 7xxx Quad-Core'
+        when 223
+          'Intel Xeon 7xxx Multi-Core'
+        when 224
+          'Intel Xeon 3400 Multi-Core'
+        when 230
+          'AMD Opteron Embedded Quad-Core'
+        when 231
+          'AMD Phenom Triple-Core'
+        when 232
+          'AMD Turion Ultra Dual-Core Mobile'
+        when 233
+          'AMD Turion Dual-Core Mobile'
+        when 234
+          'AMD Athlon Dual-Core'
+        when 235
+          'AMD Sempron SI'
+        when 236
+          'AMD Phenom II'
+        when 237
+          'AMD Athlon II'
+        when 238
+          'AMD Opteron Six-Core'
+        when 239
+          'AMD Sempron M'
         when 250
-          return "i860"
+          'i860'
         when 251
-          return "i960"
+          'i960'
         when 260
-          return "SH-3"
+          'SH-3'
         when 261
-          return "SH-4"
+          'SH-4'
         when 280
-          return "ARM"
+          'ARM'
         when 281
-          return "StrongARM"
+          'StrongARM'
         when 300
-          return "6x86"
+          '6x86'
         when 301
-          return "MediaGX"
+          'MediaGX'
         when 302
-          return "MII"
+          'MII'
         when 320
-          return "WinChip"
+          'WinChip'
         when 350
-          return "DSP"
+          'DSP'
         when 500
-          return "Video"
-        else
-          return nil
+          'Video'
       end
     end
 
+    private_class_method :get_family
+
     # Convert power management capabilities number to its equivalent string
     def self.get_pmc(num)
       case num
         when 0
-          return "Unknown"
+          'Unknown'
         when 1
-          return "Not Supported"
+          'Not Supported'
         when 2
-          return "Disabled"
+          'Disabled'
         when 3
-          return "Enabled"
+          'Enabled'
         when 4
-          return "Power Saving Modes Entered Automatically"
+          'Power Saving Modes Entered Automatically'
         when 5
-          return "Power State Settable"
+          'Power State Settable'
         when 6
-          return "Power Cycling Supported"
+          'Power Cycling Supported'
         when 7
-          return "Timed Power On Supported"
-        else
-          return nil
+          'Timed Power On Supported'
       end
     end
 
+    private_class_method :get_pmc
+
     # Convert a processor type into its equivalent string
     def self.get_processor_type(num)
       case num
         when 1
-          return "Other"
+          'Other'
         when 2
-          return "Unknown"
+          'Unknown'
         when 3
-          return "Central Processor"
+          'Central Processor'
         when 4
-          return "Math Processor"
+          'Math Processor'
         when 5
-          return "DSP Processor"
+          'DSP Processor'
         when 6
-          return "Video Processor"
-        else
-          return nil
+          'Video Processor'
       end
     end
 
+    private_class_method :get_processor_type
+
     # Convert an upgrade method into its equivalent string
     def self.get_upgrade_method(num)
       case num
         when 1
-          return "Other"
+          'Other'
         when 2
-          return "Unknown"
+          'Unknown'
         when 3
-          return "Daughter Board"
+          'Daughter Board'
         when 4
-          return "ZIF Socket"
+          'ZIF Socket'
         when 5
-          return "Replacement/Piggy Back"
+          'Replacement/Piggy Back'
         when 6
-          return "None"
+          'None'
         when 7
-          return "LIF Socket"
+          'LIF Socket'
         when 8
-          return "Slot 1"
+          'Slot 1'
         when 9
-          return "Slot 2"
+          'Slot 2'
         when 10
-          return "370 Pin Socket"
+          '370 Pin Socket'
         when 11
-          return "Slot A"
+          'Slot A'
         when 12
-          return "Slot M"
-        else
-          return nil
+          'Slot M'
       end
     end
 
+    private_class_method :get_upgrade_method
+
     # Convert return values to voltage cap values (floats)
     def self.get_voltage_caps(num)
       case num
         when 1
-          return 5.0
+          5.0
         when 2
-          return 3.3
+          3.3
         when 4
-          return 2.9
-        else
-          return nil
+          2.9
       end
     end
+
+    private_class_method :get_voltage_caps
   end
 end