sys-cpu 0.7.1 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5a8e944d3ba7367653fde3b252a10381b3e20871
+  data.tar.gz: 9791c3ff4bd7adcc847a67d7064517bd818e9f0f
+SHA512:
+  metadata.gz: a71eca1b427859d7486637ca9016f209fad1c1cccce23b6c370ed0f33090b93077ec4946485621bfdeddd9d54c9a5852aa5c4ebfe5888921e38e8c17b7070dab
+  data.tar.gz: 86571ddb4165ba50cf9afa7c073d55b345cf36f4a6dceb56af67672ec209b01a1c6d7160da137c17233de79b09e379621cd425fd7fb5c3473abe17d09f589776

data/CHANGES

@@ -1,3 +1,10 @@
+== 0.7.2 - 5-Sep-2015
+* Replaced a global array with a constant in the Linux version. Thanks go
+  to Yorick Peterse for the patch.
+* Added method comments back to the Unix version.
+* Added a sys-cpu.rb stub file for your convenience.
+* This gem is now signed.
+
 == 0.7.1 - 2-May-2013
 * Added a workaround for a win32ole bug in the Windows version.
 * Reorganized code so that there is now a single gem rather than three

data/MANIFEST

@@ -4,6 +4,7 @@
 * Rakefile
 * README
 * sys-cpu.gemspec
+* certs/djberg96_pub.pem
 * doc/bsd.txt
 * doc/hpux.txt
 * doc/linux.txt

data/README

@@ -61,7 +61,7 @@
   Artistic 2.0
 
 = Copyright
-  (C) 2003-2013 Daniel J. Berger, All Rights Reserved
+  (C) 2003-2015 Daniel J. Berger, All Rights Reserved
 
 = Warranty
   This package is provided "as is" and without any express or

data/Rakefile

@@ -9,14 +9,16 @@ CLEAN.include('**/*.gem', '**/*.rbc', '**/*.rbx')
 namespace 'gem' do
   desc "Create the sys-cpu gem"
   task :create => [:clean] do
+    require 'rubygems/package'
     spec = eval(IO.read('sys-cpu.gemspec'))
-    Gem::Builder.new(spec).build
+    spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
+    Gem::Package.build(spec)
   end
 
   desc "Install the sys-cpu gem"
   task :install => [:create] do
     file = Dir["*.gem"].first
-    sh "gem install #{file}"
+    sh "gem install -l #{file}"
   end
 end
 

data/certs/djberg96_pub.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+tGSHgAmcLlkdGgan182qsE/4kKM=
+-----END CERTIFICATE-----

data/lib/sys-cpu.rb

@@ -0,0 +1 @@
+require_relative 'sys/cpu'

data/lib/sys/cpu.rb

@@ -2,6 +2,13 @@
 # depending on which platform you're on.
 require 'rbconfig'
 
+module Sys
+  class CPU
+    # The version of the sys-cpu gem.
+    VERSION = '0.7.2'
+  end
+end
+
 case RbConfig::CONFIG['host_os']
   when /linux/i
     require File.join(File.dirname(__FILE__), 'linux', 'sys', 'cpu')

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

@@ -7,7 +7,7 @@ module Sys
 
   cpu_file   = "/proc/cpuinfo"
   cpu_hash   = {}
-  $cpu_array = []
+  CPU_ARRAY = []
 
   # Parse the info out of the /proc/cpuinfo file
   IO.foreach(cpu_file){ |line|
@@ -21,7 +21,7 @@ module Sys
     val.strip! if val
 
     if cpu_hash.has_key?(key)
-      $cpu_array.push(cpu_hash.dup)
+      CPU_ARRAY.push(cpu_hash.dup)
       cpu_hash.clear
     end
 
@@ -35,18 +35,15 @@ module Sys
     cpu_hash[key] = val
   }
 
-  $cpu_array.push(cpu_hash)
+  CPU_ARRAY.push(cpu_hash)
 
   # :startdoc:
 
   class CPU
 
-    # The version of the sys-cpu library.
-    VERSION = '0.7.1'
-
     # :stopdoc:
 
-    CPUStruct = Struct.new("CPUStruct", *$cpu_array.first.keys)
+    CPUStruct = Struct.new("CPUStruct", *CPU_ARRAY.first.keys)
 
     # :startdoc:
 
@@ -57,7 +54,7 @@ module Sys
     #
     def self.processors
       array = []
-      $cpu_array.each{ |hash|
+      CPU_ARRAY.each{ |hash|
         struct = CPUStruct.new
         struct.members.each{ |m| struct.send("#{m}=", hash["#{m}"]) }
         if block_given?
@@ -74,10 +71,10 @@ module Sys
     # Create singleton methods for each of the attributes.
     #
     def self.method_missing(id, arg=0)
-      rv = $cpu_array[arg][id.to_s]
+      rv = CPU_ARRAY[arg][id.to_s]
       if rv.nil?
         id = id.to_s + "?"
-        rv = $cpu_array[arg][id]
+        rv = CPU_ARRAY[arg][id]
       end
       rv
     end

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

@@ -9,9 +9,6 @@ module Sys
     # Error raised if any of the CPU methods fail.
     class Error < StandardError; end
 
-    # The version of the sys-cpu library
-    VERSION = '0.7.1'
-
     CTL_HW = 6 # Generic hardware/cpu
 
     HW_MACHINE      = 1  # Machine class
@@ -89,6 +86,10 @@ module Sys
       )
     end
 
+    # 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.
+    #
     def self.architecture
       if respond_to?(:sysinfo, true)
         buf = 0.chr * 257
@@ -131,6 +132,10 @@ module Sys
       end
     end
 
+    # Returns the number of cpu's on your system. Note that each core on
+    # multi-core systems are counted as a cpu, e.g. one dual core cpu would
+    # return 2, not 1.
+    #
     def self.num_cpu
       if respond_to?(:sysctlbyname, true)
         optr = FFI::MemoryPointer.new(:long)
@@ -167,6 +172,10 @@ module Sys
       end
     end
 
+    # Returns the cpu's class type. On most systems this will be identical
+    # to the CPU.architecture method. On OpenBSD it will be identical to the
+    # CPU.model method.
+    #
     def self.machine
       if respond_to?(:sysctl, true)
         buf  = 0.chr * 32
@@ -192,6 +201,8 @@ module Sys
       end
     end
 
+    # Returns a string indicating the cpu model.
+    #
     def self.model
       if RbConfig::CONFIG['host_os'] =~ /darwin/i
         ptr  = FFI::MemoryPointer.new(:long)
@@ -242,6 +253,8 @@ module Sys
       end
     end
 
+    # Returns an integer indicating the speed of the CPU.
+    #
     def self.freq
       if respond_to?(:sysctlbyname, true)
         optr = FFI::MemoryPointer.new(:long)
@@ -291,6 +304,9 @@ module Sys
       end
     end
 
+    # Returns an array of three floats indicating the 1, 5 and 15 minute load
+    # average.
+    #
     def self.load_avg
       if respond_to?(:getloadavg, true)
         loadavg = FFI::MemoryPointer.new(:double, 3)
@@ -303,6 +319,10 @@ module Sys
       end
     end
 
+    # Returns the floating point processor type.
+    #
+    # Not supported on all platforms.
+    #
     def self.fpu_type
       raise NoMethodError unless respond_to?(:processor_info, true)
 
@@ -317,6 +337,11 @@ module Sys
       pinfo[:pi_fputypes].to_s
     end
 
+    # Returns the current state of processor +num+, or 0 if no number is
+    # specified.
+    #
+    # Not supported on all platforms.
+    #
     def self.state(num = 0)
       raise NoMethodError unless respond_to?(:processor_info, true)
 

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

@@ -17,9 +17,6 @@ module Sys
     # Error raised if any of the Sys::CPU methods fail.
     class Error < StandardError; end
 
-    # The version of the sys-cpu library
-    VERSION = '0.7.1'
-
     private
 
     # Base connect string

data/sys-cpu.gemspec

@@ -1,24 +1,26 @@
 require 'rubygems'
 
 Gem::Specification.new do |spec|
-  spec.name      = 'sys-cpu'
-  spec.version   = '0.7.1'
-  spec.author    = 'Daniel J. Berger'
-  spec.email     = 'djberg96 at nospam at gmail dot com'
-  spec.homepage  = 'https://github.com/djberg96/sys-cpu'
-  spec.summary   = 'A Ruby interface for providing CPU information'
-  spec.test_file = 'test/test_sys_cpu.rb'
-  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.name       = 'sys-cpu'
+  spec.version    = '0.7.2'
+  spec.author     = 'Daniel J. Berger'
+  spec.email      = 'djberg96 at nospam at gmail dot com'
+  spec.license    = 'Artistic 2.0'
+  spec.homepage   = 'https://github.com/djberg96/sys-cpu'
+  spec.summary    = 'A Ruby interface for providing CPU information'
+  spec.test_file  = 'test/test_sys_cpu.rb'
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.cert_chain = ['certs/djberg96_pub.pem']
 
-  spec.rubyforge_project = 'sysutils'
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
 
   # The ffi dependency is only relevent for the Unix version. Given the
   # ubiquity of ffi these days, I felt a bogus dependency on ffi for Windows
-  # and Linux was worth the tradeoff of having to create 3 separate gems.
-  spec.add_dependency('ffi', '>= 1.0.0')
+  # and Linux was worth the tradeoff of not having to create 3 separate gems.
+  spec.add_dependency('ffi')
 
-  spec.add_development_dependency('test-unit', '>= 2.4.0')
+  spec.add_development_dependency('test-unit')
+  spec.add_development_dependency('rake')
 
   spec.description = <<-EOF
     The sys-cpu library provides an interface for gathering information

data/test/test_sys_cpu_version.rb

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

metadata

@@ -1,51 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: sys-cpu
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+  cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+  bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+  tGSHgAmcLlkdGgan182qsE/4kKM=
+  -----END CERTIFICATE-----
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
-description: ! "    The sys-cpu library provides an interface for gathering information\n
-  \   about your system's processor(s). Information includes speed, type,\n    and
-  load average.\n"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      The sys-cpu library provides an interface for gathering information
+      about your system's processor(s). Information includes speed, type,
+      and load average.
 email: djberg96 at nospam at gmail dot com
 executables: []
 extensions: []
@@ -54,56 +86,58 @@ extra_rdoc_files:
 - README
 - MANIFEST
 files:
-- doc/windows.txt
-- doc/sunos.txt
+- CHANGES
+- MANIFEST
+- README
+- Rakefile
+- certs/djberg96_pub.pem
 - doc/bsd.txt
 - doc/hpux.txt
 - doc/linux.txt
-- test/test_sys_cpu_version.rb
-- test/test_sys_cpu_linux.rb
-- test/test_sys_cpu_windows.rb
-- test/test_sys_cpu_bsd.rb
-- test/test_sys_cpu.rb
-- test/test_sys_cpu_sunos.rb
-- test/test_sys_cpu_hpux.rb
-- Rakefile
-- MANIFEST
-- CHANGES
-- sys-cpu.gemspec
+- doc/sunos.txt
+- doc/windows.txt
+- examples/example_sys_cpu_bsd.rb
+- examples/example_sys_cpu_hpux.rb
+- examples/example_sys_cpu_linux.rb
+- examples/example_sys_cpu_sunos.rb
+- examples/example_sys_cpu_windows.rb
+- install.rb
+- lib/sys-cpu.rb
 - lib/sys/cpu.rb
-- lib/sys/unix/sys/cpu.rb
 - lib/sys/linux/sys/cpu.rb
+- lib/sys/unix/sys/cpu.rb
 - lib/sys/windows/sys/cpu.rb
-- install.rb
-- README
-- examples/example_sys_cpu_windows.rb
-- examples/example_sys_cpu_hpux.rb
-- examples/example_sys_cpu_sunos.rb
-- examples/example_sys_cpu_linux.rb
-- examples/example_sys_cpu_bsd.rb
+- sys-cpu.gemspec
+- test/test_sys_cpu.rb
+- test/test_sys_cpu_bsd.rb
+- test/test_sys_cpu_hpux.rb
+- test/test_sys_cpu_linux.rb
+- test/test_sys_cpu_sunos.rb
+- test/test_sys_cpu_version.rb
+- test/test_sys_cpu_windows.rb
 homepage: https://github.com/djberg96/sys-cpu
-licenses: []
+licenses:
+- Artistic 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sysutils
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby interface for providing CPU information
 test_files:
 - test/test_sys_cpu.rb

metadata.gz.sig

@@ -0,0 +1,2 @@
+U��2�����kKlh��k�Qp��`�����V~�1���8m�'9�=:�x���L��!c�
+�ڢ%��c�U5����<�¶6�