sys-cpu 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7093a05a67945ccf9980c070421462c4a30a40d72ba9645230fad1d86381c0c1
-  data.tar.gz: e411d1a7f0ce381fcd8660e9b7654d60c21c03459b25cb6cdd1b46c379196b10
+  metadata.gz: 240d4766057d3b5e6099092e037a858a527598955f303a6b1e958e78dd55f10e
+  data.tar.gz: 9a1041ac81a63a1205d28d94c59373a5868f17eb9e46b1cf4226f3488f7dafd9
 SHA512:
-  metadata.gz: ff952395b1f70fedc9f01818efff2c4655ed19f2120351a84eec82690176a6de5664ca1b17648656b8eeaacaccc805c5077f4c50d79ad2983f1b3df92f14e6a8
-  data.tar.gz: 07344e7816c0ccb3bc2217c4563d2c3c97875bd3e45cc8b463cd516b44f2cc38ba94df7798ae9e086886bd0bbcdae5da514244a19165f0d732c2ddb5179d85ca
+  metadata.gz: 9bb252c92d2460f38fdf65656c2d3875c55b6d3d2ec73863be3fcdd878d3d66a49a33f9a9d1d49ae65aa4c8d3d5a405bac2aa3bdaaa4edbc5d6854e12e6a29af
+  data.tar.gz: 993afd63ee978e9bd24682309221f9f4fbddb177f8ed748b9cf512317bf72ea5243b529d114e9407fbf198f00c685fc1a6a0afc4646e2230acce9a5dce8d0d08

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 1.0.6 - 12-Aug-2022
+* The Sys::CPU.model method will now return "ARM" for machines using an
+  ARM-based processor instead of "Uknown".
+
 ## 1.0.5 - 10-Aug-2022
 * Updated the cpu detection handling for Mac M1 systems. Thanks go to
   Julien W for the spot.

data/lib/sys/cpu.rb

@@ -10,7 +10,7 @@ module Sys
   # This class is reopened for each of the supported platforms/operating systems.
   class CPU
     # The version of the sys-cpu gem.
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
 
     private_class_method :new
   end

data/lib/sys/darwin/sys/cpu.rb

@@ -15,16 +15,22 @@ module Sys
 
     CTL_HW = 6 # Generic hardware/cpu
 
+    private_constant :CTL_HW
+
     HW_MACHINE      = 1  # Machine class
     HW_MODEL        = 2  # Specific machine model
     HW_NCPU         = 3  # Number of CPU's
     HW_CPU_FREQ     = 15 # CPU frequency
     HW_MACHINE_ARCH = 12 # Machine architecture
 
+    private_constant :HW_MACHINE, :HW_MODEL, :HW_NCPU, :HW_CPU_FREQ, :HW_MACHINE_ARCH
+
     SI_MACHINE          = 5
     SI_ARCHITECTURE     = 6
     SC_NPROCESSORS_ONLN = 15
 
+    private_constant :SI_MACHINE, :SI_ARCHITECTURE, :SC_NPROCESSORS_ONLN
+
     P_OFFLINE  = 1
     P_ONLINE   = 2
     P_FAULTED  = 4
@@ -32,12 +38,19 @@ module Sys
     P_NOINTR   = 6
     P_SPARE    = 7
 
+    private_constant :P_OFFLINE, :P_ONLINE, :P_FAULTED, :P_POWEROFF, :P_NOINTR, :P_SPARE
+
     CPU_ARCH_ABI64     = 0x01000000
     CPU_TYPE_X86       = 7
     CPU_TYPE_X86_64    = (CPU_TYPE_X86 | CPU_ARCH_ABI64)
+    CPU_TYPE_ARM		   = 12
     CPU_TYPE_SPARC     = 14
     CPU_TYPE_POWERPC   = 18
     CPU_TYPE_POWERPC64 = CPU_TYPE_POWERPC | CPU_ARCH_ABI64
+    CPU_TYPE_ARM64     = CPU_TYPE_ARM | CPU_ARCH_ABI64
+
+    private_constant :CPU_ARCH_ABI64, :CPU_TYPE_X86, :CPU_TYPE_X86_64, :CPU_TYPE_ARM
+    private_constant :CPU_TYPE_SPARC, :CPU_TYPE_POWERPC, :CPU_TYPE_POWERPC64
 
     attach_function(
       :sysctl,
@@ -73,6 +86,8 @@ module Sys
       )
     end
 
+    private_constant :ClockInfo
+
     # Returns the cpu's architecture. On most systems this will be identical
     # to the CPU.machine method. On OpenBSD it will be identical to the CPU.model
     # method.
@@ -145,6 +160,8 @@ module Sys
           'Sparc'
         when CPU_TYPE_POWERPC, CPU_TYPE_POWERPC64
           'PowerPC'
+        when CPU_TYPE_ARM, CPU_TYPE_ARM64
+          'ARM'
         else
           'Unknown'
       end

data/spec/sys_cpu_bsd_spec.rb

@@ -93,4 +93,21 @@ RSpec.describe Sys::CPU, :bsd => true do
   example 'num_cpu method does not accept any arguments' do
     expect{ described_class.num_cpu(0) }.to raise_error(ArgumentError)
   end
+
+  context "ffi methods and constants are private" do
+    example "ffi constants are private" do
+      constants = described_class.constants
+      expect(constants).not_to include(:CTL_HW)
+      expect(constants).not_to include(:CPU_TYPE_X86)
+      expect(constants).not_to include(:CPU_TYPE_X86_64)
+      expect(constants).not_to include(:HW_MACHINE)
+      expect(constants).not_to include(:ClockInfo)
+    end
+
+    example "ffi methods are private" do
+      methods = described_class.methods(false)
+      expect(methods).not_to include(:sysctl)
+      expect(methods).not_to include(:sysctlbyname)
+    end
+  end
 end

data/spec/sys_cpu_shared.rb

@@ -11,7 +11,7 @@ require 'rspec'
 
 RSpec.shared_examples Sys::CPU do
   example 'version number is set to the expected value' do
-    expect(Sys::CPU::VERSION).to eq('1.0.5')
+    expect(Sys::CPU::VERSION).to eq('1.0.6')
   end
 
   example 'version number is frozen' do

data/sys-cpu.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-cpu'
-  spec.version    = '1.0.5'
+  spec.version    = '1.0.6'
   spec.author     = 'Daniel J. Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.license    = 'Apache-2.0'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sys-cpu
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -159,7 +159,7 @@ metadata:
   source_code_uri: https://github.com/djberg96/sys-cpu
   wiki_uri: https://github.com/djberg96/sys-cpu/wiki
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.3.15
+signing_key: 
 specification_version: 4
 summary: A Ruby interface for providing CPU information
 test_files: