sys-cpu 0.6.2 → 0.6.3

data/CHANGES

@@ -1,4 +1,12 @@
-== 0.6.2 - ???
+== 0.6.3 - 9-Oct-2010
+* Fixed a bug in the install.rb file and refactored it a bit. Thanks go
+  to Di-an Jan for the spot. Note, however, that this file will eventually
+  be removed and/or integrated into the Linux source file.
+* Fixed the example Rake task, and refactored some of the other tasks.
+* Fixed and updated the CPU.architecture method on MS Windows to handle IA64
+  and x64 architectures.
+
+== 0.6.2 - 1-Jan-2010
 * Fixed a bug in the cpu_freq function (which would only be noticed on
   certain platforms in cases where the CPU.freq method failed). Thanks
   go to Edho P Arief for the spot.

data/MANIFEST

@@ -19,8 +19,8 @@
 * ext/bsd/bsd.c
 * ext/hpux/hpux.c
 * ext/sunos/sunos.c
-* lib/sys/linux.rb
-* lib/sys/windows.rb
+* lib/linux/sys/cpu.rb
+* lib/windows/sys/cpu.rb
 * test/test_sys_cpu.rb
 * test/test_sys_cpu_bsd.rb
 * test/test_sys_cpu_hpux.rb

data/README

@@ -1,79 +1,76 @@
-== Description
+= Description
    A Ruby interface for getting cpu information.
 
-== Installation
-   gem install sys-cpu
-   gem install sys-cpu --platform mswin32 # MS Windows
+= Installation
+  gem install sys-cpu
+  gem install sys-cpu --platform mswin32 # MS Windows
 
-== 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.
-   
-   I do not support any Ruby 1.8.x branch after 1.8.6. It should work on those
-   versions of Ruby but if it breaks I'm not going to go out of my way to fix
-   it. I will, however, support the 1.9.x/2.x branch.
+= Notes
+== All Platforms
+  I do not support any Ruby 1.8.x branch after 1.8.6. It should work on those
+  versions of Ruby but if it breaks I'm not going to go out of my way to fix
+  it. I will, however, support the 1.9.x/2.x branch.
 
-=== Solaris
-   Currently there is no 'processors()' iterative method for multi-cpu systems.
-   I plan to add it this in a future release.
+== 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.
+== 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
-   /proc/loadavg, so if /proc isn't mounted it won't work.
+== Linux
+  This is pure Ruby. This version reads information out of /proc/cpuinfo and
+  /proc/loadavg, so if /proc isn't mounted it won't work.
 
-   The key-value information in /proc/cpuinfo is stored internally (i.e. in
-   memory) as an array of hashes when you first 'require' this package.  This
-   overhead is exceptionally minimal, given that your average cpuinfo file
-   contains less than 1k of text (and I don't store whitespace or newlines).
+  The key-value information in /proc/cpuinfo is stored internally (i.e. in
+  memory) as an array of hashes when you first 'require' this package.  This
+  overhead is exceptionally minimal, given that your average cpuinfo file
+  contains less than 1k of text (and I don't store whitespace or newlines).
 
-   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 'rake install' (via install.rb).
+  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 '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.
+== HP-UX
+  Unlike other platforms, you can get load averages for an individual cpu in
+  multi-cpu systems. See documentation for more details.
 
-=== MS Windows
-   This is a pure Ruby implementation using the win32ole package + WMI. The C
-   version has been scrapped. 
+== 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
-   CPU.load_avg method.  This does not (currently) use a perf counter, so there
-   is no longer any delay.  Also, the 'processors' method has been
-   added and the 'supported' method has been dropped.  See the documentation
-   for other changes.
+  As of version 0.5.0, the CPU.usage method has been removed in favor of the
+  CPU.load_avg method.  This does not (currently) use a perf counter, so there
+  is no longer any delay.  Also, the 'processors' method has been
+  added and the 'supported' method has been dropped.  See the documentation
+  for other changes.
    
-== Acknowledgements
-   Thanks go to the MPlayer team for some source code that helped me on
-   certain versions of FreeBSD.
+= Acknowledgements
+  Thanks go to the MPlayer team for some source code that helped me on
+  certain versions of FreeBSD.
 
-== Known Bugs
-   None that I'm aware of. Please report bugs on the project page at
-   http://www.rubyforge.org/projects/sysutils.
+= Known Bugs
+  None that I'm aware of. Please report bugs on the project page at
+  http://www.rubyforge.org/projects/sysutils.
 
-== Future Plans
-   Add iterative CPU.processors method.
-   Make CPU.freq work on OS X.
-   Add more information in general, such as what 'prtdiag' shows.
+= Future Plans
+  Add iterative CPU.processors method.
+  Make CPU.freq work on OS X.
+  Add more information in general, such as what 'prtdiag' shows.
 
-== License
-   Artistic 2.0
+= License
+  Artistic 2.0
 
-== Copyright
-   (C) 2003-2009 Daniel J. Berger, All Rights Reserved
+= Copyright
+  (C) 2003-2009 Daniel J. Berger, All Rights Reserved
 
-== Warranty
-   This package is provided "as is" and without any express or
-   implied warranties, including, without limitation, the implied
-   warranties of merchantability and fitness for a particular purpose.
+= Warranty
+  This package is provided "as is" and without any express or
+  implied warranties, including, without limitation, the implied
+  warranties of merchantability and fitness for a particular purpose.
 
-== Author
-   Daniel J. Berger
+= Author
+  Daniel J. Berger

data/Rakefile

@@ -3,50 +3,50 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
 
-desc "Clean the build files for the sys-cpu source for UNIX systems"
-task :clean do
-  FileUtils.rm_rf('sys') if File.exists?('sys')
-  FileUtils.rm_rf('lib/sys/cpu.rb') if File.exists?('lib/sys/cpu.rb')
-  Dir.chdir('ext') do
-    unless Config::CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|linux/i
-      FileUtils.rm_rf('sys') if File.exists?('sys')
-      FileUtils.rm_rf('cpu.c') if File.exists?('cpu.c')
-      build_file = 'cpu.' + Config::CONFIG['DLEXT']
-      sh 'make distclean' if File.exists?(build_file)
+namespace 'C' do
+  desc "Clean the build files for the sys-cpu source for UNIX systems"
+  task :clean do
+    Dir["*.gem"].each{ |f| File.delete(f) }
+    
+    rm_rf('sys') if File.exists?('sys')
+    rm_rf('lib/sys/cpu.rb') if File.exists?('lib/sys/cpu.rb')
+
+    Dir.chdir('ext') do
+      unless Config::CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|linux/i
+        rm_rf('conftest.dSYM') if File.exists?('conftest.dSYM') # OS X
+        rm_rf('sys') if File.exists?('sys')
+        rm_rf('cpu.c') if File.exists?('cpu.c')
+        build_file = 'cpu.' + Config::CONFIG['DLEXT']
+        sh 'make distclean' if File.exists?(build_file)
+      end
     end
   end
-end
 
-desc "Build the sys-cpu library on UNIX systems (but don't install it)"
-task :build => [:clean] do
-  Dir.chdir('ext') do
-    unless Config::CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|linux/i
-      ruby 'extconf.rb'
-      sh 'make'
-      build_file = 'cpu.' + Config::CONFIG['DLEXT']
-      Dir.mkdir('sys') unless File.exists?('sys')
-      FileUtils.cp(build_file, 'sys')
+  desc "Build the sys-cpu library on UNIX systems"
+  task :build => [:clean] do
+    Dir.chdir('ext') do
+      unless Config::CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|linux/i
+        ruby 'extconf.rb'
+        sh 'make'
+        build_file = 'cpu.' + Config::CONFIG['DLEXT']
+        Dir.mkdir('sys') unless File.exists?('sys')
+        FileUtils.cp(build_file, 'sys')
+      end
     end
   end
 end
 
-desc "Build the gem."
-task :gem do
-  spec = eval(IO.read('sys-cpu.gemspec'))
-  Gem::Builder.new(spec).build
-end
-
-if Config::CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|linux/i
-  desc "Install the sys-cpu library"
-  task :install do
-    sh 'ruby install.rb'
+namespace 'gem' do
+  desc "Create the sys-cpu gem"
+  task :create => ['C:clean'] do
+    spec = eval(IO.read('sys-cpu.gemspec'))
+    Gem::Builder.new(spec).build
   end
-else
-  desc "Install the sys-cpu library"
-  task :install => [:build] do
-    Dir.chdir('ext') do
-      sh 'make install'
-    end
+
+  desc "Install the sys-cpu gem"
+  task :install => [:create] do
+    file = Dir["*.gem"].first
+    sh "gem install #{file}"
   end
 end
 
@@ -55,26 +55,26 @@ task :example => [:build] do
   Dir.mkdir('sys') unless File.exists?('sys')
   if Config::CONFIG['host_os'] =~ /mswin|win32|mingw|cygwin|dos|linux/i
     if Config::CONFIG['host_os'].match('linux')
-       FileUtils.cp('lib/sys/linux.rb', 'sys/cpu.rb')
+      cp 'lib/linux/sys/cpu.rb', 'sys' 
     else
-       FileUtils.cp('lib/sys/windows.rb', 'sys/cpu.rb')
+      cp 'lib/windows/sys/cpu.rb', 'sys'
     end
   else
     build_file = 'ext/cpu.' + Config::CONFIG['DLEXT']
-    FileUtils.cp(build_file, 'sys')
+    cp build_file, 'sys'
   end
 
   case Config::CONFIG['host_os']
     when /bsd|darwin|mach|osx/i
-      file = 'examples/test_cpu_bsd.rb'
+      file = 'examples/example_sys_cpu_bsd.rb'
     when /hpux/i
-      file = 'examples/test_cpu_hpux.rb'
+      file = 'examples/example_sys_cpu_hpux.rb'
     when /linux/i
-      file = 'examples/test_cpu_linux.rb'
+      file = 'examples/example_sys_cpu_linux.rb'
     when /sunos|solaris/i
-      file = 'examples/test_cpu_sunos.rb'
+      file = 'examples/example_sys_cpu_sunos.rb'
     when /mswin|win32|cygwin|mingw|dos/i
-      file = 'examples/test_cpu_windows.rb'
+      file = 'examples/example_sys_cpu_windows.rb'
   end
   sh "ruby -I. -Iext -Ilib #{file}"
 end
@@ -85,7 +85,7 @@ Rake::TestTask.new do |t|
   elsif Config::CONFIG['host_os'] =~ /linux/i
     t.libs << 'lib/linux'
   else
-    task :test => :build
+    task :test => 'C:build'
     t.libs << 'ext'
     t.libs.delete('lib')
   end
@@ -93,3 +93,6 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/test_sys_cpu.rb']
 end
+
+task :default => :test
+task :clean => 'C:clean'

data/examples/example_sys_cpu_linux.rb

@@ -1,25 +1,24 @@
 #######################################################################
 # example_sys_cpu_linux.rb
 #
-# Sample cript for general futzing. You can run this code via the
+# Sample cript for general futzing. You should run this code via the
 # 'rake example' task.
 #
 # Modify as you see fit.
 #######################################################################
 require "sys/cpu"
 require "pp"
-include Sys
 
-puts "VERSION: " + CPU::VERSION
+puts "VERSION: " + Sys::CPU::VERSION
 puts "========"
 
-puts "Load Average: " + CPU.load_avg.join(", ")
+puts "Load Average: " + Sys::CPU.load_avg.join(", ")
 
 puts "Processor Info:"
 puts "==============="
-pp CPU.processors
+pp Sys::CPU.processors
 
 puts "CPU STATS:"
 puts "=========:"
 
-pp CPU.cpu_stats
+pp Sys::CPU.cpu_stats

data/ext/bsd/bsd.c

@@ -281,7 +281,7 @@ void Init_cpu()
     */
    cCPUError = rb_define_class_under(cCPU, "Error", rb_eStandardError);
 
-   /* 0.6.2: The version of the sys-cpu library */
+   /* 0.6.3: The version of the sys-cpu library */
    rb_define_const(cCPU, "VERSION", rb_str_new2(SYS_CPU_VERSION));
 
    /* Class Methods */

data/ext/extconf.rb

@@ -1,9 +1,10 @@
-require "mkmf"
-require "fileutils"
+require 'mkmf'
+require 'fileutils'
+require 'rbconfig'
 
 File.delete('cpu.c') if File.exists?('cpu.c')
 
-case RUBY_PLATFORM
+case Config::CONFIG['host_os']
    when /hpux/i
       FileUtils.cp("hpux/hpux.c", "cpu.c")
    when /sunos|solaris/i
@@ -17,7 +18,7 @@ case RUBY_PLATFORM
       have_library("kvm")
       have_header("kvm.h")
    when /linux|dos|windows|win32|mingw|cygwin/i
-      STDERR.puts "Run 'ruby install.rb' instead for this platform"
+      STDERR.puts "Run 'rake gem:install' instead for this platform"
    else
       STDERR.puts "This platform is not currently supported.  Exiting..."
 end

data/ext/hpux/hpux.c

@@ -203,7 +203,7 @@ void Init_cpu()
     */
    cCPUError = rb_define_class_under(cCPU, "Error", rb_eStandardError);
 
-   /* 0.6.2: The version of the sys-cpu library */
+   /* 0.6.3: The version of the sys-cpu library */
    rb_define_const(cCPU, "VERSION", rb_str_new2(SYS_CPU_VERSION));
 
    /* Class Methods */

data/ext/sunos/sunos.c

@@ -262,7 +262,7 @@ void Init_cpu()
     */
    cCPUError = rb_define_class_under(cCPU, "Error", rb_eStandardError);
 
-   /* 0.6.2: The version of the sys-cpu library */
+   /* 0.6.3: The version of the sys-cpu library */
    rb_define_const(cCPU, "VERSION", rb_str_new2(SYS_CPU_VERSION));
 
    /* Class Methods */

data/ext/version.h

@@ -1,2 +1,2 @@
 /* version.h - one version to rule them all */
-#define SYS_CPU_VERSION "0.6.2"
+#define SYS_CPU_VERSION "0.6.3"

data/install.rb

@@ -30,42 +30,43 @@ end
 # has already been written at some point previously and skip it.
 #######################################################################
 if CONFIG['host_os'] =~ /linux/
-   cpu_file = "/proc/cpuinfo"
-   text_file = "doc/linux.txt"
-   rb_file  = "lib/linux/sys/cpu.rb"
+  cpu_file  = "/proc/cpuinfo"
+  text_file = "doc/linux.txt"
+  rb_file   = "lib/linux/sys/cpu.rb"
 
-   if File.size(text_file) > 1400
-      puts "You appear to have already created the documentation."
-      puts "Skipping..."
-   else
-      puts "Dynamically generating documentation..."
-      fh = File.open(text_file,"a+")
+  if File.size(text_file) > 1400
+    puts "You appear to have already created the documentation."
+    puts "Skipping..."
+  else
+    puts "Dynamically generating documentation..."
+    fh = File.open(text_file, 'a')
+
+    IO.foreach(cpu_file){ |line|
+      next if line =~ /^$/
+      k,v = line.split(":")
+         
+      v = v.strip.chomp
+      k = k.strip.gsub(/\s+/, '_').downcase
+
+      k += "?" if v =~ /yes|no/i
 
-      IO.foreach(cpu_file){ |line|
-         next if line =~ /^$/
-         k,v = line.split(":")
-         v.strip!.chomp!
-         k.strip!.gsub!(/\s+/,"_")
-         k.downcase!
-         if v =~ /yes|no/i
-	        k += "?"
-         end
-         fh.puts("CPU.#{k}")
-         if v =~ /yes|no/i
-	        k.chop!
-	        msg = "     Returns true if a " + k.gsub(/_/," ") + "exists on"
-	        msg << " this system"
-	        fh.puts(msg)
-         else
-	        fh.puts("     Returns the " + k.gsub(/_/," "))
-         end
-         fh.puts # Add a blank line
-      }
+      fh.puts("CPU.#{k}")
 
-      fh.puts(doc)
-      fh.close
-      puts "Documentation creation complete"
-   end
+      if v =~ /yes|no/i
+        k.chop!
+        msg = "     Returns true if a " + k.gsub(/_/," ") + "exists on"
+        msg << " this system"
+        fh.puts(msg)
+      else
+        fh.puts("     Returns the " + k.gsub(/_/," "))
+      end
+
+      fh.puts # Add a blank line
+    }
+
+    fh.close
+    puts "Documentation creation complete"
+  end
 end
 
 # Create the 'sys' toplevel directory if it doesn't already exist