sys-cpu 0.5.5-mswin32 → 0.6.0-mswin32

data/CHANGES

@@ -1,3 +1,15 @@
+== 0.6.0 - 11-Apr-2007
+* Added support for most BSD flavors, including OS X. The freebsd.c file is
+  now just bsd.c.
+* The CPU.type method for Solaris has been changed to CPU.cpu_type to avoid
+  conflicting with the Object.type method.
+* Added a Rakefile. There are now tasks for building, testing and installing,
+  among other things. Run 'rake -T' to check your options.
+* Many internal directory layout changes - C source files are now under the
+  'ext' directory.
+* Improved RDoc comments in the C source files.
+* Changed CPUError to CPU::Error.
+
 == 0.5.5 - 17-Nov-2006
 * Fixed a bug in the Linux version where there could be a key but no
    associated value, causing a String#strip! call to fail.  Now the value is

data/MANIFEST

@@ -0,0 +1,28 @@
+* install.rb
+* MANIFEST
+* CHANGES
+* Rakefile
+* README
+* sys-cpu.gemspec
+* doc/bsd.txt
+* doc/hpux.txt
+* doc/linux.txt
+* doc/sunos.txt
+* doc/windows.txt
+* examples/test_cpu_freebsd.rb
+* examples/test_cpu_hpux.rb
+* examples/test_cpu_linux.rb
+* examples/test_cpu_sunos.rb
+* examples/test_cpu_windows.rb
+* ext/extconf.rb
+* ext/version.h
+* ext/bsd/bsd.c
+* ext/hpux/hpux.c
+* ext/sunos/sunos.c
+* lib/sys/linux.rb
+* lib/sys/windows.rb
+* test/tc_bsd.rb
+* test/tc_hpux.rb
+* test/tc_sunos.rb
+* test/tc_linux.rb
+* test/tc_windows.rb

data/README

@@ -2,26 +2,27 @@
    A Ruby interface for getting cpu information.
 
 = Installation
-=== Linux and Windows:
-   ruby test/ts_all.rb (optional)
-   ruby install.rb
-
-=== All other platforms:
-   ruby extconf.rb
-   make
-   ruby test/ts_all.rb (optional)
-   make site-install
+== Standard Installation
+   rake test (optional)
+   rake install (non-gem)
+== Gem installation
+   rake test (optional)
+   ruby sys-cpu.gemspec
+   gem install sys-cpu-X.Y.Z.gem # where 'X.Y.Z' corresponds to the version.
 
 = Notes
 === All Platforms
    As of version 0.5.0 Ruby 1.8.0 or later is required.  It may work with
-   earlier versions, but I will not support it.  In addition, a test file is
-   no longer auto-generated for you.  If wish to run the test suite, cd to the
-   'test' directory and run the test suite appropriate for your platform.
+   earlier versions, but I will not support it.
 
 === Solaris
    Currently there is no 'processors()' iterative method for multi-cpu systems.
    I plan to add it this in a future release.
+   
+=== OS X
+   The CPU.freq method is not supported at the moment. The sysctl() approach
+   returns a bogus, hard coded value of some sort. I suspect it's possible
+   by using kernel modules via kldload(), but I'm not sure how yet.
 
 === Linux
    This is pure Ruby.  This version reads information out of /proc/cpuinfo and
@@ -35,14 +36,14 @@
    The text documentation for Linux is dynamically generated during the
    build process because the fields vary depending on your setup.  So, don't
    look at it until *after* you've installed it.  You will see a doc/linux.txt
-   file after you run install.rb.
+   file after you run 'rake install' (via install.rb).
 
 === HP-UX
    Unlike other platforms, you can get load averages for an individual cpu (in
-   multi-cpu systems).  See documentation for more details.
+   multi-cpu systems). See documentation for more details.
 
-=== Win32
-   This is a pure Ruby implementation using the win32ole package + WMI.  The C
+=== MS Windows
+   This is a pure Ruby implementation using the win32ole package + WMI. The C
    version has been scrapped. 
 
    As of version 0.5.0, the CPU.usage method has been removed in favor of the
@@ -56,15 +57,15 @@
    http://www.rubyforge.org/projects/sysutils.
 
 = Future Plans
-=== Solaris
    Add iterative CPU.processors method.
+   Make CPU.freq work on OS X.
    Add more information in general, such as what 'prtdiag' shows.
 
 = License
    Ruby's.
 
 = Copyright
-   (C) 2003-2006 Daniel J. Berger
+   (C) 2003-2007 Daniel J. Berger
    All Rights Reserved
 
 = Warranty
@@ -74,5 +75,5 @@
 
 = Author
    Daniel J. Berger
-   djberg96 at gmail dot com
+   djberg96 at nospam at gmail dot com
    imperator on IRC (irc.freenode.net)

data/doc/{freebsd.txt → bsd.txt}

@@ -5,7 +5,7 @@
    require "sys/cpu"
    include Sys
 
-   # FreeBSD
+   # BSD and OS X
    puts "Architecture: " + CPU.architecture
    puts "Machine: " + CPU.machine
    puts "Mhz: " + CPU.cpu_freq.to_s
@@ -24,6 +24,8 @@ CPU.architecture
 CPU.freq
    Returns an integer indicating the speed (i.e. frequency in Mhz) of
    the cpu.
+   
+   Not supported on OS X.
     
 CPU.load_avg
    Returns an array of three floats indicating the 1, 5 and 15 minute load
@@ -39,16 +41,16 @@ CPU.num_cpu
    Returns an integer indicating the number of cpu's on the system.
     
 = Error Classes
-CPUError < StandardError
+CPU::Error < StandardError
    Raised is response to internal function errors, usually relating to an
    invalid cpu number.
     
 = Known Bugs
    None known.  Please post bug reports to the SourceForge home page at
-   http://www.rubyforge.org/projects/sysutils
+   http://www.rubyforge.org/projects/sysutils 
     
 = Copyright
-   (C) 2003-2006 Daniel J. Berger
+   (C) 2003-2007 Daniel J. Berger
    All Rights Reserved
     
 = Warranty
@@ -61,5 +63,5 @@ CPUError < StandardError
     
 = Author
    Daniel J. Berger
-   djberg96 at yahoo dot com
-   imperator/rubyhacker1 on IRC (Freenode)
+   djberg96 at nospam at gmail dot com
+   imperator on IRC (Freenode)

data/doc/hpux.txt

@@ -46,7 +46,7 @@ CPU.num_active_cpu
    Returns an integer indicating the number of active cpu's on the system.
     
 = Error Classes
-CPUError < StandardError
+CPU::Error < StandardError
    Raised is response to internal function errors, usually relating to an
    invalid cpu number.
     
@@ -58,7 +58,7 @@ CPUError < StandardError
    Add cpu model and type
    
 = Copyright
-   (C) 2003-2006 Daniel J. Berger
+   (C) 2003-2007 Daniel J. Berger
    All Rights Reserved
     
 = Warranty
@@ -71,5 +71,5 @@ CPUError < StandardError
     
 = Author
    Daniel J. Berger
-   djberg96 at yahoo dot com
-   imperator/rubyhacker1 on IRC (Freenode)
+   djberg96 at nospam at gmail dot com
+   imperator on IRC (Freenode)

data/doc/sunos.txt

@@ -48,7 +48,7 @@ CPU.state(cpu_num)
    Returns a string indicating the cpu state of 'cpu_num'.
     
 = Error Classes
-CPUError < StandardError
+CPU::Error < StandardError
    Raised is response to internal function errors, usually relating to an
    invalid cpu number.
     
@@ -61,7 +61,7 @@ CPUError < StandardError
    Get the model() method to display more specific information.
     
 = Copyright
-   (C) 2003-2006 Daniel J. Berger
+   (C) 2003-2007 Daniel J. Berger
    All Rights Reserved
     
 = Warranty
@@ -74,3 +74,5 @@ CPUError < StandardError
     
 = Author
    Daniel J. Berger
+   djberg96 at nospam at gmail dot com
+   imperator on IRC (Freenode)

data/doc/windows.txt

@@ -102,7 +102,7 @@ CPU.type(host=localhost)
     Returns a string indicating the type of processor, e.g. GenuineIntel.
     
 = Exception Classes
-CPUError < StandardError
+CPU::Error < StandardError
    Raised is response to internal function errors, most likely to be raised
    in the event that in invalid cpu number is provided for the 'freq'
    method.
@@ -135,7 +135,7 @@ CPUError < StandardError
    Win32_PerfFormattedData_PerfOS_Processor class.
     
 = Copyright
-   (C) 2003-2006 Daniel J. Berger
+   (C) 2003-2007 Daniel J. Berger
    All Rights Reserved
     
 = Warranty
@@ -148,5 +148,5 @@ CPUError < StandardError
     
 = Author
    Daniel J. Berger
-   djberg96 at yahoo dot com
+   djberg96 at nospam at gmail dot com
    imperator/rubyhacker1 on IRC (Freenode)

data/lib/sys/cpu.rb

@@ -2,10 +2,10 @@ require 'win32ole'
 require 'socket'
 
 module Sys
-   class CPUError < StandardError; end
-
    class CPU
-      VERSION = '0.5.5'
+      class Error < StandardError; end
+
+      VERSION = '0.6.0'
       
       fields = %w/
          address_width
@@ -64,7 +64,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             self.get_cpu_arch(wmi.Architecture)
          end
@@ -73,14 +73,14 @@ module Sys
       # Returns an integer indicating the speed (i.e. frequency in Mhz) of
       # +cpu_num+ on +host+, or the localhost if no +host+ is specified.
       # If +cpu_num+ +1 is greater than the number of cpu's on your system
-      # or this call fails for any other reason, a CPUError is raised.
+      # or this call fails for any other reason, a Error is raised.
       #
       def self.freq(cpu_num = 0, host = Socket.gethostname)
          cs = "winmgmts://#{host}/root/cimv2:Win32_Processor='cpu#{cpu_num}'"    
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             return wmi.CurrentClockSpeed
          end
@@ -99,7 +99,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             return wmi.LoadPercentage
          end    
@@ -112,7 +112,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             return wmi.Name
          end
@@ -127,7 +127,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             return wmi.NumberOfProcessors
          end
@@ -187,7 +187,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect("winmgmts://#{host}/root/cimv2")
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             wmi.InstancesOf("Win32_Processor").each{ |cpu|
                yield CPUStruct.new(
@@ -247,7 +247,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise CPUError, e
+            raise Error, e
          else
             return wmi.Manufacturer
          end

data/test/tc_bsd.rb

@@ -0,0 +1,56 @@
+#############################################################
+# tc_bsd.rb
+#
+# The test case for sys-cpu on BSD flavors, including OS X.
+#############################################################
+require "sys/cpu"
+require "test/unit"
+require "tc_version"
+include Sys
+
+class TC_BSD < Test::Unit::TestCase
+   def test_architecture
+      assert_respond_to(CPU, :architecture)
+      assert_nothing_raised{ CPU.architecture }
+      assert_kind_of(String, CPU.architecture)
+      assert_raises(ArgumentError){ CPU.architecture(0) }
+   end
+
+   unless RUBY_PLATFORM.match('darwin')
+      def test_cpu_freq
+         assert_respond_to(CPU, :freq)
+         assert_nothing_raised{ CPU.freq }
+         assert_kind_of(Integer, CPU.freq)
+         assert_raises(ArgumentError){ CPU.freq(0) }
+      end
+   end
+
+   def test_load_avg
+      assert_respond_to(CPU, :load_avg)
+      assert_nothing_raised{ CPU.load_avg }
+      assert_kind_of(Array, CPU.load_avg)
+      assert_equal(3,CPU.load_avg.length)
+      assert_raises(ArgumentError){ CPU.load_avg(0) }
+   end
+   
+   def test_machine
+      assert_respond_to(CPU, :machine)
+      assert_nothing_raised{ CPU.machine }
+      assert_kind_of(String, CPU.machine)
+      assert_raises(ArgumentError){ CPU.machine(0) }
+   end
+
+   def test_model
+      assert_respond_to(CPU, :model)
+      assert_nothing_raised{ CPU.model }
+      assert_kind_of(String, CPU.model)
+      assert_raises(ArgumentError){ CPU.model(0) }
+   end
+
+   def test_num_cpu
+      assert_respond_to(CPU, :num_cpu)
+      assert_nothing_raised{ CPU.num_cpu }
+      assert_kind_of(Integer, CPU.num_cpu)
+      assert_raises(ArgumentError){ CPU.num_cpu(0) }
+   end
+end

data/test/tc_cpu.rb

@@ -0,0 +1,17 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+require 'tc_version'
+
+case RUBY_PLATFORM
+   when /bsd|darwin|mach|osx/i
+      require 'tc_bsd'
+   when /hpux/i
+      require 'tc_hpux'
+   when /linux/i
+      require 'tc_linux'
+   when /sunos/i
+      require 'tc_sunos'
+   when /mswin|win32|dos|mingw|cygwin/i
+      require 'tc_windows'
+   else
+      raise "Platform not supported"
+end

data/test/tc_hpux.rb

@@ -1,26 +1,12 @@
-####################################################
+#####################################################################
 # tc_hpux.rb
 #
-# Test suite for the HP-UX platform.  Note that this should only
-# be run *after* the make process.
-####################################################
-base = File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-cpu/
-   require "ftools"
-   Dir.chdir ".." if base == "test"
-   
-   Dir.mkdir("sys") unless File.exists?("sys")
-   if File.exist?("cpu.sl")
-      File.copy("cpu.sl","sys")
-   else
-      puts "No cpu.sl file found.  Please run extconf.rb and make first"
-      exit
-   end
-   $LOAD_PATH.unshift Dir.pwd
-end
-
+# Test suite for the HP-UX platform. This should be run via the
+# 'rake test' task.
+#####################################################################
 require "sys/cpu"
 require "test/unit"
+require "tc_version"
 include Sys
 
 class TC_HPUX < Test::Unit::TestCase
@@ -28,25 +14,25 @@ class TC_HPUX < Test::Unit::TestCase
       assert_respond_to(CPU, :freq)
       assert_nothing_raised{ CPU.freq }
       assert_nothing_raised{ CPU.freq(0) }
-      assert_kind_of(Integer,CPU.freq,"Invalid Type")
+      assert_kind_of(Integer, CPU.freq, "Invalid Type")
    end
 
    def test_num_cpu
       assert_respond_to(CPU, :num_cpu)
       assert_nothing_raised{ CPU.num_cpu }
-      assert_kind_of(Integer,CPU.num_cpu,"Invalid Type")
+      assert_kind_of(Integer, CPU.num_cpu, "Invalid Type")
    end
 
    def test_num_active_cpu
       assert_respond_to(CPU, :num_active_cpu)
       assert_nothing_raised{ CPU.num_active_cpu }
-      assert_kind_of(Integer,CPU.num_active_cpu,"Invalid Type")
+      assert_kind_of(Integer, CPU.num_active_cpu, "Invalid Type")
    end
 
    def test_cpu_architecture
       assert_respond_to(CPU, :architecture)
       assert_nothing_raised{ CPU.architecture }
-      assert_kind_of(String,CPU.architecture,"Invalid Type")
+      assert_kind_of(String, CPU.architecture, "Invalid Type")
    end
 
    def test_load_avg
@@ -55,9 +41,9 @@ class TC_HPUX < Test::Unit::TestCase
       assert_nothing_raised{ CPU.load_avg(0) }
       assert_nothing_raised{ CPU.load_avg{ |e| } }
       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(0).length,"Bad number of elements")
+      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(0).length, "Bad number of elements")
    end
 end

data/test/tc_linux.rb

@@ -1,19 +1,12 @@
-########################################
+###########################################################
 # tc_linux.rb
 #
-# Test Suite for sys-cpu for Linux
-########################################
-base = File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-cpu/
-   require "ftools"
-   Dir.chdir ".." if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("lib/sys/linux.rb","sys/cpu.rb")
-   $LOAD_PATH.unshift Dir.pwd
-end
-
+# Test Suite for sys-cpu for Linux. This should be run via
+# the 'rake test' task.
+###########################################################
 require "sys/cpu"
 require "test/unit"
+require "tc_version"
 include Sys
 
 class TC_Linux < Test::Unit::TestCase

data/test/tc_sunos.rb

@@ -1,31 +1,14 @@
 ###########################################################
 # tc_sunos.rb
 #
-# Test suite for sys-cpu on Solaris.  This should only be
-# run *after* the make process.
+# Test suite for sys-cpu on Solaris. This should be run
+# via the 'rake test' task.
 ###########################################################
-base = File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-cpu/
-   require "ftools"
-   Dir.chdir ".." if base == "test"
-   
-   Dir.mkdir("sys") unless File.exist?("sys")
-
-   if File.exist?("cpu.so")
-      File.copy("cpu.so","sys")
-   else
-      puts "No cpu.so file found.  Please run extconf.rb and make first"
-      exit
-   end
-
-   $LOAD_PATH.unshift Dir.pwd
-end
-
 require "sys/cpu"
 require "test/unit"
+require "tc_version"
 include Sys
 
-# I could really use a mock object here
 class TC_SunOS < Test::Unit::TestCase
    def test_cpu_freq
       assert_respond_to(CPU, :freq)
@@ -35,9 +18,9 @@ class TC_SunOS < Test::Unit::TestCase
    end
 
    def test_cpu_type
-      assert_respond_to(CPU, :type)
-      assert_nothing_raised{ CPU.type }
-      assert_kind_of(String, CPU.type)
+      assert_respond_to(CPU, :cpu_type)
+      assert_nothing_raised{ CPU.cpu_type }
+      assert_kind_of(String, CPU.cpu_type)
    end
 
    def test_fpu_type
@@ -74,9 +57,9 @@ class TC_SunOS < Test::Unit::TestCase
    end
 
    def test_exceptions
-      assert_raises(Sys::CPUError){ CPU.state(55) }
+      assert_raises(Sys::CPU::Error){ CPU.state(55) }
       assert_raises(TypeError){ CPU.state("yo") }
-      assert_raises(Sys::CPUError){ CPU.freq(999) }
+      assert_raises(Sys::CPU::Error){ CPU.freq(999) }
       assert_raises(TypeError){ CPU.freq("yo") }
    end
 end

data/test/tc_version.rb

@@ -5,40 +5,12 @@
 # version.  This reduces the pain of having separate tests
 # for the VERSION constant in every single test case.
 ###########################################################
-base = File.basename(Dir.pwd)
-
-if base == "test" || base =~ /sys-cpu/
-   require "ftools"
-
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exist?("sys")
-
-   case RUBY_PLATFORM
-      when /mswin|dos|cygwin|mingw/i
-         file = 'lib/sys/windows.rb'
-      when /linux/i
-         file = 'lib/sys/linux.rb'
-      else
-         require "rbconfig"
-         file = "cpu." << Config::CONFIG["DLEXT"]
-   end
-
-   if File.exist?(file)
-      File.copy(file, "sys/cpu.rb")
-   else
-      puts "No '#{file}' file found.  Please run extconf.rb and make first"
-      exit
-   end
-
-   $LOAD_PATH.unshift Dir.pwd
-end
-
 require "sys/cpu"
 require "test/unit"
 include Sys
 
 class TC_Sys_CPU_VERSION < Test::Unit::TestCase
    def test_version
-      assert_equal('0.5.5', CPU::VERSION)
+      assert_equal('0.6.0', CPU::VERSION)
    end
 end

data/test/tc_windows.rb

@@ -1,19 +1,12 @@
 ######################################################################
 # tc_windows.rb
 #
-# Test suite for Win32 systems.
+# Test suite for MS Windows systems. This should be run via the
+# 'rake test' task.
 ######################################################################
-base =  File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-cpu/
-   require "ftools" if base == "test"
-   Dir.chdir '..'
-   Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("lib/sys/windows.rb","sys/cpu.rb")
-   $LOAD_PATH.unshift Dir.pwd
-end
-
 require "test/unit"
 require "sys/cpu"
+require "tc_version"
 require "socket"
 include Sys
 
@@ -26,43 +19,43 @@ class TC_Windows_CPU < Test::Unit::TestCase
       assert_respond_to(CPU, :architecture)
       assert_nothing_raised{ CPU.architecture }
       assert_nothing_raised{ CPU.architecture(@host) }
-      assert_kind_of(String,CPU.architecture,"Invalid Type")
+      assert_kind_of(String, CPU.architecture, "Invalid Type")
    end
    
    def test_freq
       assert_respond_to(CPU, :freq)
       assert_nothing_raised{ CPU.freq }
       assert_nothing_raised{ CPU.freq(0) }
-      assert_nothing_raised{ CPU.freq(0,@host) }
-      assert_kind_of(Integer,CPU.freq,"Invalid Type")
+      assert_nothing_raised{ CPU.freq(0, @host) }
+      assert_kind_of(Integer, CPU.freq, "Invalid Type")
    end
     
    def test_model
       assert_respond_to(CPU, :model)
       assert_nothing_raised{ CPU.model }
       assert_nothing_raised{ CPU.model(@host) }
-      assert_kind_of(String,CPU.model,"Invalid Type")
+      assert_kind_of(String, CPU.model, "Invalid Type")
    end
    
    def test_num_cpu
       assert_respond_to(CPU, :num_cpu)
       assert_nothing_raised{ CPU.num_cpu }
       assert_nothing_raised{ CPU.num_cpu(@host) }
-      assert_kind_of(Integer,CPU.num_cpu,"Invalid Type")
+      assert_kind_of(Integer, CPU.num_cpu, "Invalid Type")
    end
    
    def test_type
       assert_respond_to(CPU, :type)
       assert_nothing_raised{ CPU.type }
       assert_nothing_raised{ CPU.type(@host) }
-      assert_kind_of(String,CPU.type,"Invalid Type")
+      assert_kind_of(String, CPU.type, "Invalid Type")
    end
    
    def test_load_avg
       assert_respond_to(CPU, :load_avg)
       assert_nothing_raised{ CPU.load_avg }
-      assert_nothing_raised{ CPU.load_avg(0,@host) }
-      assert_kind_of(Integer,CPU.load_avg,"Invalid Type")
+      assert_nothing_raised{ CPU.load_avg(0, @host) }
+      assert_kind_of(Integer, CPU.load_avg, "Invalid Type")
    end
    
    def test_processors

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: sys-cpu
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
-date: 2006-11-18 00:00:00 -07:00
+  version: 0.6.0
+date: 2007-04-26 00:00:00 -06:00
 summary: A Ruby interface for providing CPU information
 require_paths: 
 - lib
-email: djberg96@gmail.com
+email: djberg96 at nospam at gmail dot com
 homepage: http://www.rubyforge.org/projects/sysutils
 rubyforge_project: sysutils
 description: A Ruby interface for providing CPU information
@@ -29,28 +29,31 @@ post_install_message:
 authors: 
 - Daniel J. Berger
 files: 
-- doc/freebsd.txt
+- doc/bsd.txt
 - doc/hpux.txt
 - doc/linux.txt
 - doc/sunos.txt
 - doc/windows.txt
-- test/tc_freebsd.rb
+- test/tc_bsd.rb
+- test/tc_cpu.rb
 - test/tc_hpux.rb
 - test/tc_linux.rb
 - test/tc_sunos.rb
 - test/tc_version.rb
 - test/tc_windows.rb
-- test/ts_all.rb
 - CHANGES
 - README
+- MANIFEST
 - lib/sys/cpu.rb
 test_files: 
-- test/ts_all.rb
+- test/tc_windows.rb
 rdoc_options: []
 
 extra_rdoc_files: 
 - CHANGES
 - README
+- MANIFEST
+- lib/sys/cpu.rb
 executables: []
 
 extensions: []

data/test/tc_freebsd.rb

@@ -1,71 +0,0 @@
-###########################################################
-# tc_freebsd.rb
-#
-# Test suite for sys-cpu on FreeBSD.  This should only be
-# run *after* the make process.
-###########################################################
-base = File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-cpu/
-   require "ftools"
-   Dir.chdir ".." if base == "test"
-   
-   Dir.mkdir("sys") unless File.exist?("sys")
-
-   if File.exist?("cpu.so")
-      File.copy("cpu.so","sys")
-   else
-      puts "No cpu.so file found.  Please run extconf.rb and make first"
-      exit
-   end
-
-   $LOAD_PATH.unshift Dir.pwd
-end
-
-require "sys/cpu"
-require "test/unit"
-include Sys
-
-class TC_FreeBSD < Test::Unit::TestCase
-   def test_architecture
-      assert_respond_to(CPU, :architecture)
-      assert_nothing_raised{ CPU.architecture }
-      assert_kind_of(String,CPU.architecture)
-      assert_raises(ArgumentError){ CPU.architecture(0) }
-   end
-
-   def test_cpu_freq
-      assert_respond_to(CPU, :freq)
-      assert_nothing_raised{ CPU.freq }
-      assert_kind_of(Integer,CPU.freq)
-      assert_raises(ArgumentError){ CPU.freq(0) }
-   end
-
-   def test_load_avg
-      assert_respond_to(CPU, :load_avg)
-      assert_nothing_raised{ CPU.load_avg }
-      assert_kind_of(Array,CPU.load_avg)
-      assert_equal(3,CPU.load_avg.length)
-      assert_raises(ArgumentError){ CPU.load_avg(0) }
-   end
-   
-   def test_machine
-      assert_respond_to(CPU, :machine)
-      assert_nothing_raised{ CPU.machine }
-      assert_kind_of(String,CPU.machine)
-      assert_raises(ArgumentError){ CPU.machine(0) }
-   end
-
-   def test_model
-      assert_respond_to(CPU, :model)
-      assert_nothing_raised{ CPU.model }
-      assert_kind_of(String,CPU.model)
-      assert_raises(ArgumentError){ CPU.model(0) }
-   end
-
-   def test_num_cpu
-      assert_respond_to(CPU, :num_cpu)
-      assert_nothing_raised{ CPU.num_cpu }
-      assert_kind_of(Integer,CPU.num_cpu)
-      assert_raises(ArgumentError){ CPU.num_cpu(0) }
-   end
-end

data/test/ts_all.rb

@@ -1,17 +0,0 @@
-$LOAD_PATH.unshift Dir.pwd
-$LOAD_PATH.unshift Dir.pwd + '/test'
-
-require 'tc_version'
-
-case RUBY_PLATFORM
-   when /sunos|solaris/i
-      require 'tc_sunos'
-   when /linux/i
-      require 'tc_linux'
-   when /mswin|cygwin|mingw/i
-      require 'tc_windows'
-   when /hpux/i
-      require 'tc_hpux'
-   when /bsd/i
-      require 'tc_freebsd'
-end