sys-cpu 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c9b0550fea7a97f78cb37062e8f347d1b945e53a2a885f2c4fa8cdd02e0dc5
-  data.tar.gz: 6b4c3525653fd1a186078a533826795e3d2b168c2649d48fe549de33ca021edb
+  metadata.gz: 5cdd1159dbf95e9dfdddb43c3fc76182d4b6cc01c9b968fbfa3408375a003e31
+  data.tar.gz: 67ec3a4ec93472020c8253430e9eaa523fad7655f61968cb10cc03a6ee39ea49
 SHA512:
-  metadata.gz: c3efb6d399e22fff8380ec6d581c3997707bab5f99a7bbe001a86a058427e348066fce271348c9451f567bf6ffa7a9f2cf247de94ae82cd258d5ea6fa3d4bb9c
-  data.tar.gz: 337fe45c0fe0463320c910aee118cf3496f71b9b4be7965d79204a109b12d273746f47afa50deb96519ec4118a3058e2aba00d912810bf065abee5e5fc8e0678
+  metadata.gz: f7f24be4c56b6459f6ad665a1b13130f6d662f751a724bc8cf64d94e82421cfdc64f1660b2a2cc6e11eb5aa97064dab82f6b9cc7e2d313645940a8a6ab23faff
+  data.tar.gz: 1710410533c1139f9ad07cbe032f3041990d448ef37698b5e8285d807fe91f6eb05b7b55a5303fcbd86ad648cdcf4f6e4893d9cb24d8de5976a7da15499dba47

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 1.2.0 - 17-Feb-2026
+* The win32ole gem is now a dependency since Ruby 4.x no longer bundles it.
+* The freq method was updated for BSD platforms on aarch64. It now defaults
+  to the hardclock timer value as a best guess.
+* The architecture method now recognizes ARM64 on Windows.
+
 ## 1.1.0 - 9-Jun-2024
 * Removed Solaris support.
 * Added DragonflyBSD support.

data/README.md

@@ -72,7 +72,7 @@ https://github.com/djberg96/sys-cpu
 Apache-2.0
 
 ## Copyright
-(C) 2003-2024 Daniel J. Berger, All Rights Reserved
+(C) 2003-2026 Daniel J. Berger, All Rights Reserved
 
 ## Warranty
 This package is provided "as is" and without any express or

data/Rakefile

@@ -44,6 +44,9 @@ end
 RuboCop::RakeTask.new
 
 desc "Run the test suite"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+  t.rspec_opts = '-f documentation -w'
+end
 
 task :default => :spec

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.1.0'
+    VERSION = '1.2.0'
 
     private_class_method :new
   end

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

@@ -43,7 +43,7 @@ module Sys
     CPU_ARCH_ABI64     = 0x01000000
     CPU_TYPE_X86       = 7
     CPU_TYPE_X86_64    = (CPU_TYPE_X86 | CPU_ARCH_ABI64)
-    CPU_TYPE_ARM		   = 12
+    CPU_TYPE_ARM       = 12
     CPU_TYPE_SPARC     = 14
     CPU_TYPE_POWERPC   = 18
     CPU_TYPE_POWERPC64 = CPU_TYPE_POWERPC | CPU_ARCH_ABI64
@@ -74,6 +74,7 @@ module Sys
     private_class_method :getloadavg
     private_class_method :sysconf
 
+    # Private wrapper class for struct clockinfo
     class ClockInfo < FFI::Struct
       layout(
         :hz, :int,
@@ -189,7 +190,7 @@ module Sys
         (optr.read_long * clock[:hz]) / 1_000_000
       else
         if sysctlbyname('hw.cpufrequency', optr, size, nil, 0) < 0
-          raise Error, 'sysctlbyname failed on hw.cpufrequency' if result < 0
+          raise Error, 'sysctlbyname failed on hw.cpufrequency'
         end
         optr.read_long / 1_000_000
       end

data/lib/sys/linux/sys/cpu.rb

@@ -10,7 +10,10 @@ module Sys
 
   cpu_file  = '/proc/cpuinfo'
   cpu_hash  = {}
+
+  # rubocop:disable Style/MutableConstant
   CPU_ARRAY = []
+  # rubocop:enable Style/MutableConstant
 
   private_constant :CPU_ARRAY
 

data/lib/sys/unix/sys/cpu.rb

@@ -19,10 +19,11 @@ module Sys
     HW_MODEL        = 2  # Specific machine model
     HW_NCPU         = 3  # Number of CPU's
     HW_CPU_FREQ     = 15 # CPU frequency
+    HOST_OS         = RbConfig::CONFIG['host_os']
 
     private_constant :CTL_HW, :HW_MACHINE, :HW_MODEL, :HW_NCPU, :HW_CPU_FREQ
 
-    if RbConfig::CONFIG['host_os'] =~ /bsd|dragonfly/
+    if HOST_OS =~ /bsd|dragonfly/
       HW_MACHINE_ARCH = 11 # Machine architecture
     else
       HW_MACHINE_ARCH = 12 # Machine architecture
@@ -92,6 +93,7 @@ module Sys
       # Do nothing, not supported on this platform.
     end
 
+    # Private wrapper class for the procinfo struct
     class ProcInfo < FFI::Struct
       layout(
         :pi_state, :int,
@@ -101,6 +103,8 @@ module Sys
       )
     end
 
+    private_constant :ProcInfo
+
     # 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.
@@ -238,6 +242,16 @@ module Sys
 
     # Returns an integer indicating the speed of the CPU.
     #
+    # Note that for BSD systems running on an aarch64 cpu this method
+    # will default to a hardclock timer value rather than the actual
+    # CPU frequency. This will typically be 1000 (or 100 on VM's).
+    #--
+    # If there's a better way please let me know. In my experiments locally
+    # stuff like dev.cpu.0 did NOT have the information that you might
+    # expect to find there, so we cannot rely on that either. In my defense,
+    # stuff like lscpu or dmesg did not have the freq information either,
+    # not on my aarch64 VM anyway.
+    #
     def self.freq
       if respond_to?(:sysctlbyname, true)
         optr = FFI::MemoryPointer.new(:long)
@@ -245,8 +259,12 @@ module Sys
 
         size.write_long(optr.size)
 
-        if RbConfig::CONFIG['host_os'] =~ /bsd|dragonfly/i
-          name = 'hw.clockrate'
+        if HOST_OS =~ /bsd|dragonfly/i
+          if architecture =~ /aarch/i
+            name = 'kern.hz'
+          else
+            name = 'hw.clockrate'
+          end
         else
           name = 'hw.cpufrequency'
         end

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

@@ -390,6 +390,8 @@ module Sys
           'IA64'
         when 9
           'x64'
+        when 12
+          'ARM64'
       end
     end
 

data/spec/sys_cpu_bsd_spec.rb

@@ -8,14 +8,14 @@
 require 'sys/cpu'
 require 'spec_helper'
 
-RSpec.describe Sys::CPU, :bsd => true do
+RSpec.describe Sys::CPU, :bsd do
   example 'architecture method basic functionality' do
     expect(described_class).to respond_to(:architecture)
     expect{ described_class.architecture }.not_to raise_error
   end
 
   example 'architecture method returns a sane value' do
-    expect(described_class.architecture).to be_kind_of(String)
+    expect(described_class.architecture).to be_a(String)
     expect(described_class.architecture.size).to be > 0
   end
 
@@ -29,7 +29,7 @@ RSpec.describe Sys::CPU, :bsd => true do
   end
 
   example 'freq method returns expected value' do
-    expect(described_class.freq).to be_kind_of(Integer)
+    expect(described_class.freq).to be_a(Integer)
     expect(described_class.freq).to be > 0
   end
 
@@ -43,9 +43,9 @@ RSpec.describe Sys::CPU, :bsd => true do
   end
 
   example 'load_avg returns the expected results' do
-    expect(described_class.load_avg).to be_kind_of(Array)
+    expect(described_class.load_avg).to be_a(Array)
     expect(described_class.load_avg.length).to eq(3)
-    expect(described_class.load_avg[0]).to be_kind_of(Float)
+    expect(described_class.load_avg[0]).to be_a(Float)
   end
 
   example 'load_avg does not accept any arguments' do
@@ -58,7 +58,7 @@ RSpec.describe Sys::CPU, :bsd => true do
   end
 
   example 'machine method returns sane value' do
-    expect(described_class.machine).to be_kind_of(String)
+    expect(described_class.machine).to be_a(String)
     expect(described_class.machine.size).to be > 0
   end
 
@@ -72,7 +72,7 @@ RSpec.describe Sys::CPU, :bsd => true do
   end
 
   example 'model method returns sane value' do
-    expect(described_class.model).to be_kind_of(String)
+    expect(described_class.model).to be_a(String)
     expect(described_class.model.length).to be > 0
   end
 
@@ -86,7 +86,7 @@ RSpec.describe Sys::CPU, :bsd => true do
   end
 
   example 'num_cpu method returns expected value' do
-    expect(described_class.num_cpu).to be_kind_of(Integer)
+    expect(described_class.num_cpu).to be_a(Integer)
     expect(described_class.num_cpu).to be > 0
   end
 
@@ -94,8 +94,8 @@ RSpec.describe Sys::CPU, :bsd => true 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
+  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)
@@ -104,13 +104,13 @@ RSpec.describe Sys::CPU, :bsd => true do
       expect(constants).not_to include(:ClockInfo)
     end
 
-    example "ffi core methods are private" do
+    example 'ffi core methods are private' do
       methods = described_class.methods(false)
       expect(methods).not_to include(:attach_function)
       expect(methods).not_to include(:bitmask)
     end
 
-    example "ffi attached methods are private" do
+    example 'ffi attached methods are private' do
       methods = described_class.methods(false)
       expect(methods).not_to include(:sysctl)
       expect(methods).not_to include(:sysctlbyname)

data/spec/sys_cpu_hpux_spec.rb

@@ -9,30 +9,30 @@
 require 'sys/cpu'
 require 'spec_helper'
 
-RSpec.describe Sys::CPU, :hpux => true do
+RSpec.describe Sys::CPU, :hpux do
   example 'cpu_freq' do
     expect(described_class).to respond_to(:freq)
     expect{ described_class.freq }.not_to raise_error
     expect{ described_class.freq(0) }.not_to raise_error
-    expect(described_class.freq).to be_kind_of(Integer)
+    expect(described_class.freq).to be_a(Integer)
   end
 
   example 'num_cpu' do
     expect(described_class).to respond_to(:num_cpu)
     expect{ described_class.num_cpu }.not_to raise_error
-    expect(described_class.num_cpu).to be_kind_of(Integer)
+    expect(described_class.num_cpu).to be_a(Integer)
   end
 
   example 'num_active_cpu' do
     expect(described_class).to respond_to(:num_active_cpu)
     expect{ described_class.num_active_cpu }.not_to raise_error
-    expect(described_class.num_active_cpu).to be_kind_of(Integer)
+    expect(described_class.num_active_cpu).to be_a(Integer)
   end
 
   example 'cpu_architecture' do
     expect(described_class).to respond_to(:architecture)
     expect{ described_class.architecture }.not_to raise_error
-    expect(described_class.architecture).to be_kind_of(String)
+    expect(described_class.architecture).to be_a(String)
   end
 
   example 'load_avg basic sanity check' do
@@ -47,8 +47,8 @@ RSpec.describe Sys::CPU, :hpux => true do
   end
 
   example 'load_avg expected results' do
-    expect(described_class.load_avg).to be_kind_of(Array)
-    expect(described_class.load_avg(0)).to be_kind_of(Array)
+    expect(described_class.load_avg).to be_a(Array)
+    expect(described_class.load_avg(0)).to be_a(Array)
     expect(described_class.load_avg.length).to eq(3)
     expect(described_class.load_avg(0).length).to eq(3)
   end

data/spec/sys_cpu_linux_spec.rb

@@ -9,7 +9,7 @@
 require 'sys/cpu'
 require 'spec_helper'
 
-RSpec.describe Sys::CPU, :linux => true do
+RSpec.describe Sys::CPU, :linux do
   example 'dynamic methods are defined as expected' do
     expect do
       described_class.processors do |cs|
@@ -25,28 +25,28 @@ RSpec.describe Sys::CPU, :linux => true do
 
   example 'cpu_stats works as expected' do
     expect{ described_class.cpu_stats }.not_to raise_error
-    expect(described_class.cpu_stats).to be_kind_of(Hash)
+    expect(described_class.cpu_stats).to be_a(Hash)
     expect(described_class.cpu_stats['cpu0'].length).to be >= 4
   end
 
   example 'architecture works as expected' do
     expect{ described_class.architecture }.not_to raise_error
-    expect(described_class.architecture).to be_kind_of(String)
+    expect(described_class.architecture).to be_a(String)
   end
 
   example 'model works as expected' do
     expect{ described_class.model }.not_to raise_error
-    expect(described_class.model).to be_kind_of(String)
+    expect(described_class.model).to be_a(String)
   end
 
   example 'freq works as expected' do
     expect{ described_class.freq }.not_to raise_error
-    expect(described_class.freq).to be_kind_of(Numeric)
+    expect(described_class.freq).to be_a(Numeric)
   end
 
   example 'num_cpu works as expected' do
     expect{ described_class.num_cpu }.not_to raise_error
-    expect(described_class.num_cpu).to be_kind_of(Numeric)
+    expect(described_class.num_cpu).to be_a(Numeric)
   end
 
   example 'bogus methods are not picked up by method_missing' do

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.1.0')
+    expect(Sys::CPU::VERSION).to eq('1.2.0')
   end
 
   example 'version number is frozen' do

data/spec/sys_cpu_windows_spec.rb

@@ -10,20 +10,20 @@ require 'spec_helper'
 require 'sys/cpu'
 require 'socket'
 
-RSpec.describe Sys::CPU, :windows => true do
+RSpec.describe Sys::CPU, :windows do
   let(:host) { Socket.gethostname }
 
   example 'architecture' do
     expect(described_class).to respond_to(:architecture)
     expect{ described_class.architecture }.not_to raise_error
     expect{ described_class.architecture(host) }.not_to raise_error
-    expect(described_class.architecture).to be_kind_of(String)
+    expect(described_class.architecture).to be_a(String)
   end
 
   example 'freq basic functionality' do
     expect(described_class).to respond_to(:freq)
     expect{ described_class.freq }.not_to raise_error
-    expect(described_class.freq).to be_kind_of(Integer)
+    expect(described_class.freq).to be_a(Integer)
   end
 
   example 'freq with arguments' do
@@ -35,28 +35,28 @@ RSpec.describe Sys::CPU, :windows => true do
     expect(described_class).to respond_to(:model)
     expect{ described_class.model }.not_to raise_error
     expect{ described_class.model(host) }.not_to raise_error
-    expect(described_class.model).to be_kind_of(String)
+    expect(described_class.model).to be_a(String)
   end
 
   example 'num_cpu' do
     expect(described_class).to respond_to(:num_cpu)
     expect{ described_class.num_cpu }.not_to raise_error
     expect{ described_class.num_cpu(host) }.not_to raise_error
-    expect(described_class.num_cpu).to be_kind_of(Integer)
+    expect(described_class.num_cpu).to be_a(Integer)
   end
 
   example 'cpu_type' do
     expect(described_class).to respond_to(:cpu_type)
     expect{ described_class.cpu_type }.not_to raise_error
     expect{ described_class.cpu_type(host) }.not_to raise_error
-    expect(described_class.cpu_type).to be_kind_of(String)
+    expect(described_class.cpu_type).to be_a(String)
   end
 
   example 'load_avg' do
     expect(described_class).to respond_to(:load_avg)
     expect{ described_class.load_avg }.not_to raise_error
     expect{ described_class.load_avg(0, host) }.not_to raise_error
-    expect(described_class.load_avg).to be_kind_of(Integer).or be_kind_of(NilClass)
+    expect(described_class.load_avg).to be_a(Integer).or be_a(NilClass)
   end
 
   example 'processors' do

data/sys-cpu.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-cpu'
-  spec.version    = '1.1.0'
+  spec.version    = '1.2.0'
   spec.author     = 'Daniel J. Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.license    = 'Apache-2.0'
@@ -17,6 +17,10 @@ Gem::Specification.new do |spec|
   # and Linux was worth the tradeoff of not having to create 3 separate gems.
   spec.add_dependency('ffi', '~> 1.1')
 
+  if Gem.win_platform?
+    spec.add_dependency('win32ole')
+  end
+
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rubocop')
   spec.add_development_dependency('rspec', '~> 3.9')
@@ -30,7 +34,8 @@ Gem::Specification.new do |spec|
     'source_code_uri'       => 'https://github.com/djberg96/sys-cpu',
     'wiki_uri'              => 'https://github.com/djberg96/sys-cpu/wiki',
     'rubygems_mfa_required' => 'true',
-    'github_repo'           => 'https://github.com/djberg96/sys-cpu'
+    'github_repo'           => 'https://github.com/djberg96/sys-cpu',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.description = <<-EOF

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sys-cpu
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-06-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -157,7 +156,7 @@ metadata:
   wiki_uri: https://github.com/djberg96/sys-cpu/wiki
   rubygems_mfa_required: 'true'
   github_repo: https://github.com/djberg96/sys-cpu
-post_install_message:
+  funding_uri: https://github.com/sponsors/djberg96
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A Ruby interface for providing CPU information
 test_files: