sys-cpu 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c889d0a79359903abbe62cbd38095a88335386cc3c930b61ad94c9000350956
-  data.tar.gz: b050390fc7fccbc4ad842f348e5dd702432f221c037a533bb4df2138d198d70c
+  metadata.gz: 465bd2540877db4c141949b95fb9c2d011497f532a9325d604da521ab98b878a
+  data.tar.gz: 27e1124d09070b074db611e9d392a32739f15554841ba0fe0b51c865414e592b
 SHA512:
-  metadata.gz: 780e4ee7023069eb9c0d6dc0beb296edacda8db250f84cabada5961d2ab6728acd311a7eab41c292703feec6904a3caee6927b676454db46f4e6c1a248a06d12
-  data.tar.gz: 310b45098badac319002989cd86009cb85fe4924300fb737f8de1b5c62fd2846f104c46a87233f2644dbc6527df1579cf5aa1eb78faea965eecd1648ddc46d15
+  metadata.gz: aece81104122383014b5e396a499550d3da21dadfb06846881786eb0898f2402452fe90a2f9c30a86ce89dbd6fad4bc16dfa9b0beafe3aa80cb8c120c3fbab05
+  data.tar.gz: 33e149e2e2ba7723609dc89ebb095f6df6496f7c2f4ef17656e2373fd004c88d51c3d75b3fec74dcaabcdd663289c00757771bd759869122c6935a4c3b972f75

data/CHANGES.rdoc

@@ -1,3 +1,10 @@
+== 0.9.0 - 12-May-2020
+* Added explicit freq, architecture, num_cpu and model methods to the Linux
+  version in an effort to create a common interface across platforms.
+* Modified the Linux version so that method_missing will raise a NoMethodError
+  if you try to call access an attribute that doesn't exist.
+* Some updates to the Linux tests.
+
 == 0.8.3 - 18-Mar-2020
 * Properly include a LICENSE file as per the Apache-2.0 license.
 

data/MANIFEST.rdoc

@@ -1,4 +1,5 @@
 * install.rb
+* LICENSE
 * MANIFEST.rdoc
 * CHANGES.rdoc
 * Rakefile

data/lib/sys/cpu.rb

@@ -5,7 +5,7 @@ require 'rbconfig'
 module Sys
   class CPU
     # The version of the sys-cpu gem.
-    VERSION = '0.8.3'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end
 

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

@@ -70,11 +70,43 @@ module Sys
       array unless block_given?
     end
 
+    # Return the total number of logical CPU on the system.
+    #
+    def self.num_cpu
+      CPU_ARRAY.size
+    end
+
+    # Return the architecture of the CPU.
+    #
+    def self.architecture
+      case CPU_ARRAY.first['cpu_family']
+      when '3'
+        "x86"
+      when '6'
+        "x86_64"
+      else
+        nil
+      end
+    end
+
+    # Returns a string indicating the CPU model.
+    #
+    def self.model
+      CPU_ARRAY.first['model_name']
+    end
+
+    # Returns an integer indicating the speed of the CPU.
+    #
+    def self.freq
+      CPU_ARRAY.first['cpu_mhz'].to_f.round
+    end
+
     private
 
     # Create singleton methods for each of the attributes.
     #
     def self.method_missing(id, arg=0)
+      raise NoMethodError, "'#{id}'" unless CPU_ARRAY[arg].has_key?(id.to_s)
       rv = CPU_ARRAY[arg][id.to_s]
       if rv.nil?
         id = id.to_s + "?"

data/sys-cpu.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-cpu'
-  spec.version    = '0.8.3'
+  spec.version    = '0.9.0'
   spec.author     = 'Daniel J. Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.license    = 'Apache-2.0'
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.metadata = {
     'homepage_uri'      => 'https://github.com/djberg96/sys-cpu',
     'bug_tracker_uri'   => 'https://github.com/djberg96/sys-cpu/issues',
-    'changelog_uri'     => 'https://github.com/djberg96/sys-cpu/blob/ffi/CHANGES',
+    'changelog_uri'     => 'https://github.com/djberg96/sys-cpu/blob/ffi/CHANGES.rdoc',
     'documentation_uri' => 'https://github.com/djberg96/sys-cpu/wiki',
     'source_code_uri'   => 'https://github.com/djberg96/sys-cpu',
     'wiki_uri'          => 'https://github.com/djberg96/sys-cpu/wiki'

data/test/test_sys_cpu_linux.rb

@@ -7,25 +7,48 @@
 require 'sys/cpu'
 require 'test-unit'
 require 'test_sys_cpu_version'
-include Sys
 
 class TC_Sys_CPU_Linux < Test::Unit::TestCase
-  def test_all_dynamic_methods
+  test "dynamic methods are defined as expected" do
     assert_nothing_raised{
-      CPU.processors{ |cs|
+      Sys::CPU.processors{ |cs|
         cs.members.each{ |m| cs[m].to_s }
       }
     }
   end
 
-  def test_load_avg
-    assert_nothing_raised{ CPU.load_avg }
-    assert_equal(3, CPU.load_avg.length)
+  test "load average works as expected" do
+    assert_nothing_raised{ Sys::CPU.load_avg }
+    assert_equal(3, Sys::CPU.load_avg.length)
   end
 
-  def test_cpu_stats
-    assert_nothing_raised{ CPU.cpu_stats }
-    assert_kind_of(Hash, CPU.cpu_stats)
-    assert_equal(true, CPU.cpu_stats['cpu0'].length >= 4)
+  test "cpu_stats works as expected" do
+    assert_nothing_raised{ Sys::CPU.cpu_stats }
+    assert_kind_of(Hash, Sys::CPU.cpu_stats)
+    assert_true(Sys::CPU.cpu_stats['cpu0'].length >= 4)
+  end
+
+  test "architecture works as expected" do
+    assert_nothing_raised{ Sys::CPU.architecture }
+    assert_kind_of(String, Sys::CPU.architecture)
+  end
+
+  test "model works as expected" do
+    assert_nothing_raised{ Sys::CPU.model }
+    assert_kind_of(String, Sys::CPU.model)
+  end
+
+  test "freq works as expected" do
+    assert_nothing_raised{ Sys::CPU.freq }
+    assert_kind_of(Numeric, Sys::CPU.freq)
+  end
+
+  test "num_cpu works as expected" do
+    assert_nothing_raised{ Sys::CPU.num_cpu }
+    assert_kind_of(Numeric, Sys::CPU.num_cpu)
+  end
+
+  test "bogus methods are not picked up by method_missing" do
+    assert_raise(NoMethodError){ Sys::CPU.bogus }
   end
 end

data/test/test_sys_cpu_version.rb

@@ -10,7 +10,7 @@ require 'test-unit'
 
 class TC_Sys_CPU_VERSION < Test::Unit::TestCase
   test "version number is set to the expected value" do
-    assert_equal('0.8.3', Sys::CPU::VERSION)
+    assert_equal('0.9.0', Sys::CPU::VERSION)
   end
 
   test "version number is frozen" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-cpu
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -87,59 +87,59 @@ email: djberg96@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGES.rdoc
-- MANIFEST.rdoc
 - README.rdoc
+- MANIFEST.rdoc
+- CHANGES.rdoc
 files:
-- install.rb
-- LICENSE
+- README.rdoc
+- examples
+- examples/example_sys_cpu_sunos.rb
+- examples/example_sys_cpu_windows.rb
+- examples/example_sys_cpu_hpux.rb
+- examples/example_sys_cpu_linux.rb
+- examples/example_sys_cpu_bsd.rb
+- sys-cpu.gemspec
+- MANIFEST.rdoc
+- certs
+- certs/djberg96_pub.pem
 - test
-- test/test_sys_cpu.rb
-- test/test_sys_cpu_windows.rb
 - test/test_sys_cpu_bsd.rb
 - test/test_sys_cpu_version.rb
+- test/test_sys_cpu.rb
+- test/test_sys_cpu_windows.rb
 - test/test_sys_cpu_sunos.rb
 - test/test_sys_cpu_hpux.rb
 - test/test_sys_cpu_linux.rb
-- Rakefile
-- certs
-- certs/djberg96_pub.pem
-- examples
-- examples/example_sys_cpu_linux.rb
-- examples/example_sys_cpu_hpux.rb
-- examples/example_sys_cpu_sunos.rb
-- examples/example_sys_cpu_bsd.rb
-- examples/example_sys_cpu_windows.rb
-- sys-cpu.gemspec
+- doc
+- doc/linux.txt
+- doc/windows.txt
+- doc/sunos.txt
+- doc/hpux.txt
+- doc/bsd.txt
+- install.rb
+- LICENSE
 - lib
+- lib/sys-cpu.rb
 - lib/sys
-- lib/sys/unix
-- lib/sys/unix/sys
-- lib/sys/unix/sys/cpu.rb
+- lib/sys/cpu.rb
 - lib/sys/linux
 - lib/sys/linux/sys
 - lib/sys/linux/sys/cpu.rb
-- lib/sys/cpu.rb
+- lib/sys/unix
+- lib/sys/unix/sys
+- lib/sys/unix/sys/cpu.rb
 - lib/sys/windows
 - lib/sys/windows/sys
 - lib/sys/windows/sys/cpu.rb
-- lib/sys-cpu.rb
+- Rakefile
 - CHANGES.rdoc
-- doc
-- doc/linux.txt
-- doc/sunos.txt
-- doc/windows.txt
-- doc/bsd.txt
-- doc/hpux.txt
-- MANIFEST.rdoc
-- README.rdoc
 homepage: https://github.com/djberg96/sys-cpu
 licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/djberg96/sys-cpu
   bug_tracker_uri: https://github.com/djberg96/sys-cpu/issues
-  changelog_uri: https://github.com/djberg96/sys-cpu/blob/ffi/CHANGES
+  changelog_uri: https://github.com/djberg96/sys-cpu/blob/ffi/CHANGES.rdoc
   documentation_uri: https://github.com/djberg96/sys-cpu/wiki
   source_code_uri: https://github.com/djberg96/sys-cpu
   wiki_uri: https://github.com/djberg96/sys-cpu/wiki