sys-cpu 0.7.0 → 0.7.1

data/CHANGES

@@ -1,3 +1,9 @@
+== 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
+  separate platform gems.
+* Updated test-unit dependency which let me simplify the test files a bit.
+
 == 0.7.0 - 14-Dec-2011
 * Code base now uses FFI. However, HP-UX is not currently supported.
   HP-UX users should continue to use the 0.6.x version. Note that

data/MANIFEST

@@ -14,13 +14,10 @@
 * examples/example_sys_cpu_linux.rb
 * examples/example_sys_cpu_sunos.rb
 * examples/example_sys_cpu_windows.rb
-* ext/extconf.rb
-* ext/version.h
-* ext/bsd/bsd.c
-* ext/hpux/hpux.c
-* ext/sunos/sunos.c
-* lib/linux/sys/cpu.rb
-* lib/windows/sys/cpu.rb
+* lib/sys/cpu.rb
+* lib/sys/linux/sys/cpu.rb
+* lib/sys/unix/sys/cpu.rb
+* lib/sys/windows/sys/cpu.rb
 * test/test_sys_cpu.rb
 * test/test_sys_cpu_bsd.rb
 * test/test_sys_cpu_hpux.rb

data/README

@@ -4,11 +4,6 @@
 = Installation
   gem install sys-cpu
 
-  If that doesn't work try one of these:
-
-  gem install sys-cpu --platform linux   # Linux
-  gem install sys-cpu --platform mingw32 # MS Windows
-
 = Notes
 == Solaris
   Currently there is no 'processors()' iterative method for multi-cpu systems.
@@ -66,7 +61,7 @@
   Artistic 2.0
 
 = Copyright
-  (C) 2003-2011 Daniel J. Berger, All Rights Reserved
+  (C) 2003-2013 Daniel J. Berger, All Rights Reserved
 
 = Warranty
   This package is provided "as is" and without any express or

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
-include Config
+include RbConfig
 
 CLEAN.include('**/*.gem', '**/*.rbc', '**/*.rbx')
 
@@ -43,14 +43,6 @@ task :example => [:clean] do
 end
 
 Rake::TestTask.new do |t|
-  if CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|windows/i
-    t.libs << 'lib/windows'
-  elsif CONFIG['host_os'] =~ /linux/i
-    t.libs << 'lib/linux'
-  else
-    t.libs << 'lib/unix'
-  end
-
   t.libs << 'test'
   t.test_files = FileList['test/test_sys_cpu.rb']
 end

data/lib/sys/cpu.rb

@@ -0,0 +1,12 @@
+# This is just a stub file that requires the appropriate version
+# depending on which platform you're on.
+require 'rbconfig'
+
+case RbConfig::CONFIG['host_os']
+  when /linux/i
+    require File.join(File.dirname(__FILE__), 'linux', 'sys', 'cpu')
+  when /windows|mswin|mingw|cygwin|dos/i
+    require File.join(File.dirname(__FILE__), 'windows', 'sys', 'cpu')
+  else
+    require File.join(File.dirname(__FILE__), 'unix', 'sys', 'cpu')
+end

data/lib/{linux → sys/linux}/sys/cpu.rb

@@ -42,7 +42,7 @@ module Sys
   class CPU
 
     # The version of the sys-cpu library.
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
 
     # :stopdoc:
 
@@ -59,7 +59,7 @@ module Sys
       array = []
       $cpu_array.each{ |hash|
         struct = CPUStruct.new
-        struct.members.each{ |m| struct.send("#{m}=", hash[m]) }
+        struct.members.each{ |m| struct.send("#{m}=", hash["#{m}"]) }
         if block_given?
           yield struct
         else

data/lib/{unix → sys/unix}/sys/cpu.rb

@@ -10,7 +10,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-cpu library
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
 
     CTL_HW = 6 # Generic hardware/cpu
 

data/lib/{windows → sys/windows}/sys/cpu.rb

@@ -1,6 +1,15 @@
 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
@@ -9,7 +18,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-cpu library
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
 
     private
 

data/sys-cpu.gemspec

@@ -2,11 +2,10 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-cpu'
-  spec.version   = '0.7.0'
+  spec.version   = '0.7.1'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96 at nospam at gmail dot com'
-  spec.homepage  = 'http://www.rubyforge.org/projects/sysutils'
-  spec.platform  = Gem::Platform::RUBY
+  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') }
@@ -14,30 +13,16 @@ Gem::Specification.new do |spec|
   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')
-  spec.add_development_dependency('test-unit', '>= 2.1.2')
+
+  spec.add_development_dependency('test-unit', '>= 2.4.0')
 
   spec.description = <<-EOF
     The sys-cpu library provides an interface for gathering information
     about your system's processor(s). Information includes speed, type,
     and load average.
   EOF
-
-  case Config::CONFIG['host_os']
-    when /mswin|dos|windows|win32|mingw|cygwin/i
-      spec.require_paths = ['lib', 'lib/windows']
-      spec.extra_rdoc_files << 'lib/windows/sys/cpu.rb'
-      spec.platform = Gem::Platform::CURRENT
-      spec.platform.cpu = 'universal'
-      spec.platform.version = nil
-      spec.original_platform = spec.platform
-    when /linux/i
-      spec.require_paths = ['lib', 'lib/linux']
-      spec.extra_rdoc_files << 'lib/linux/sys/cpu.rb'
-      spec.platform = Gem::Platform.new('universal-linux')
-      spec.original_platform = spec.platform
-    else
-      spec.require_paths = ['lib', 'lib/unix']
-      spec.extra_rdoc_files << 'lib/unix/sys/cpu.rb'
-   end
 end

data/test/test_sys_cpu.rb

@@ -7,7 +7,7 @@
 require 'rbconfig'
 require 'test_sys_cpu_version'
 
-case Config::CONFIG['host_os']
+case RbConfig::CONFIG['host_os']
   when /bsd|darwin|mach|osx/i
     require 'test_sys_cpu_bsd'
   when /hpux/i

data/test/test_sys_cpu_bsd.rb

@@ -3,12 +3,9 @@
 #
 # The test case for sys-cpu on BSD flavors, including OS X.
 #############################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'sys/cpu'
 require 'rbconfig'
-require 'test/unit'
+require 'test-unit'
 require 'test_sys_cpu_version'
 include Sys
 

data/test/test_sys_cpu_hpux.rb

@@ -4,11 +4,8 @@
 # Test suite for the HP-UX platform. This should be run via the
 # 'rake test' task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'sys/cpu'
-require 'test/unit'
+require 'test-unit'
 require 'test_sys_cpu_version'
 include Sys
 
@@ -46,7 +43,7 @@ class TC_Sys_CPU_HPUX < Test::Unit::TestCase
       assert_raises(ArgumentError){ CPU.load_avg(0){ } }
       assert_kind_of(Array, CPU.load_avg, 'Invalid Type')
       assert_kind_of(Array, CPU.load_avg(0), 'Invalid Type')
-      assert_equal(3, CPU.load_avg.length, 'Bad number of elements') 
+      assert_equal(3, CPU.load_avg.length, 'Bad number of elements')
       assert_equal(3, CPU.load_avg(0).length, 'Bad number of elements')
    end
 end

data/test/test_sys_cpu_linux.rb

@@ -4,11 +4,8 @@
 # Test Suite for sys-cpu for Linux. This should be run via
 # the 'rake test' task.
 ###########################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'sys/cpu'
-require 'test/unit'
+require 'test-unit'
 require 'test_sys_cpu_version'
 include Sys
 

data/test/test_sys_cpu_sunos.rb

@@ -4,10 +4,8 @@
 # Test suite for sys-cpu on Solaris. This should be run
 # via the 'rake test' task.
 ###########################################################
-require 'rubygems'
-gem 'test-unit'
 require 'sys/cpu'
-require 'test/unit'
+require 'test-unit'
 include Sys
 
 class TC_Sys_CPU_SunOS < Test::Unit::TestCase

data/test/test_sys_cpu_version.rb

@@ -5,14 +5,11 @@
 # This reduces the pain of having separate tests for the VERSION
 # constant in every single test case.
 #######################################################################
-require 'rubygems'
-gem 'test-unit'
-
 require 'sys/cpu'
-require 'test/unit'
+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.0', Sys::CPU::VERSION)
+    assert_equal('0.7.1', Sys::CPU::VERSION)
   end
 end

metadata

@@ -1,125 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sys-cpu
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.7.1
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :development
-  version_requirements: *id002
-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"
+  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"
 email: djberg96 at nospam at gmail dot com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
-- lib/unix/sys/cpu.rb
-files: 
-- CHANGES
+files:
+- doc/windows.txt
+- doc/sunos.txt
 - doc/bsd.txt
 - doc/hpux.txt
 - doc/linux.txt
-- 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/linux/sys/cpu.rb
-- lib/unix/sys/cpu.rb
-- lib/windows/sys/cpu.rb
-- MANIFEST
-- Rakefile
-- README
-- 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_linux.rb
 - test/test_sys_cpu_windows.rb
-homepage: http://www.rubyforge.org/projects/sysutils
+- 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
+- lib/sys/cpu.rb
+- lib/sys/unix/sys/cpu.rb
+- lib/sys/linux/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
+homepage: https://github.com/djberg96/sys-cpu
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-- lib/unix
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sysutils
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for providing CPU information
-test_files: 
+test_files:
 - test/test_sys_cpu.rb