sys-proctable 0.9.1-universal-mingw32 → 0.9.2-universal-mingw32

data/CHANGES

@@ -1,3 +1,11 @@
+== 0.9.2 - 8-Oct-2012
+* Added cmdline support for OS X. Thanks go to Matthias Zirnstein for
+  the patch.
+* Warning cleanup for 1.9.
+* Updated the gem platform handling. Replaced the borked string approach
+  with a two element array for Gem::Platform.new.
+* MS date strings are now parse with DateTime instead of Date.
+
 == 0.9.1 - 3-Aug-2011
 * Added the pctcpu and pctmem members for Linux.
 * Added Errno::ESRCH to a rescue clause on Linux that fixed a bug

data/MANIFEST

@@ -1,30 +1,30 @@
-* CHANGES
-* MANIFEST
-* Rakefile
-* README
-* sys-proctable.gemspec
-* doc/bsd.txt
-* doc/hpux.txt
-* doc/linux.txt
-* doc/solaris.txt
-* doc/top.txt
-* doc/windows.txt
-* example/example_ps.rb
-* ext/bsd/extconf.rb
-* ext/bsd/sys/proctable.c
-* ext/darwin/extconf.rb
-* ext/darwin/sys/proctable.c
-* ext/hpux/extconf.rb
-* ext/hpux/sys/proctable.c
-* lib/sys/top.rb
-* lib/linux/sys/proctable.rb
-* lib/sunos/sys/proctable.rb
-* lib/windows/sys/proctable.rb
-* test/test_sys_proctable_all.rb
-* test/test_sys_proctable_darwin.rb
-* test/test_sys_proctable_hpux.rb
-* test/test_sys_proctable_bsd.rb
-* test/test_sys_proctable_linux.rb
-* test/test_sys_proctable_sunos.rb
-* test/test_sys_proctable_windows.rb
-* test/test_sys_top.rb
+* CHANGES
+* MANIFEST
+* Rakefile
+* README
+* sys-proctable.gemspec
+* doc/bsd.txt
+* doc/hpux.txt
+* doc/linux.txt
+* doc/solaris.txt
+* doc/top.txt
+* doc/windows.txt
+* example/example_ps.rb
+* ext/bsd/extconf.rb
+* ext/bsd/sys/proctable.c
+* ext/darwin/extconf.rb
+* ext/darwin/sys/proctable.c
+* ext/hpux/extconf.rb
+* ext/hpux/sys/proctable.c
+* lib/sys/top.rb
+* lib/linux/sys/proctable.rb
+* lib/sunos/sys/proctable.rb
+* lib/windows/sys/proctable.rb
+* test/test_sys_proctable_all.rb
+* test/test_sys_proctable_darwin.rb
+* test/test_sys_proctable_hpux.rb
+* test/test_sys_proctable_bsd.rb
+* test/test_sys_proctable_linux.rb
+* test/test_sys_proctable_sunos.rb
+* test/test_sys_proctable_windows.rb
+* test/test_sys_top.rb

data/README

@@ -20,6 +20,7 @@
   gem install sys-proctable --platform mswin32 # Windows
   gem install sys-proctable --platform sunos   # Solaris
   gem install sys-proctable --platform linux   # Linux
+  gem install sys-proctable --platform freebsd # BSD (any flavor)
 
 == Synopsis
   require 'sys/proctable'
@@ -58,15 +59,6 @@
   The cmdline member on Solaris is limited to 80 characters unless you (or
   your program) own the process. This is a Solaris design flaw/feature.
 
-=== OS X
-  At the moment you do not get the full command line string. The code required
-  to get this information is obnoxious and I don't have any compelling desire
-  to add it. However, if you're willing to submit a patch I'll accept it.
-
-  You can find a good starting point with the OS X code found in Dan Urist's
-  Proc::ProcessTable module. You can find that module on CPAN. Point your
-  browser at http://search.cpan.org.
-
 === Thread Safety
   I am not currently using a thread-safe version of readdir() for versions
   of this library that use C. I am not especially concerned about it either.
@@ -94,7 +86,8 @@
   euid, gid and guid info in the Linux version, along with some general
   debugging help.
    
-  Thanks go to David Felstead for the original OS X code.
+  Thanks go to David Felstead for the original OS X code. Thanks also go
+  to Matthias Zirnstein for adding cmdline support for OS X.
 
   Finally I'd like to thank all the folks who have submitted bug reports
   and/or patches.
@@ -112,7 +105,7 @@
   Artistic 2.0
     
 == Copyright
-  (C) 2003-2010 Daniel J. Berger
+  (C) 2003-2012 Daniel J. Berger
   All Rights Reserved.
 
 == Author

data/Rakefile

@@ -2,12 +2,13 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
-include Config
+include RbConfig
 
 CLEAN.include(
   '**/*.core',              # Core dump files
   '**/*.gem',               # Gem files
   '**/*.rbc',               # Rubinius
+  '.rbx', '**/*/.rbx',      # Rubinius
   '**/*.o',                 # C object file
   '**/*.log',               # Ruby extension build log
   '**/Makefile',            # C Makefile
@@ -17,7 +18,7 @@ CLEAN.include(
 
 desc 'Build the sys-proctable library for C versions of sys-proctable'
 task :build => [:clean] do
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /bsd/i
       dir = 'ext/bsd'
     when /darwin/i
@@ -26,11 +27,11 @@ task :build => [:clean] do
       dir = 'ext/hpux'
   end
 
-  unless Config::CONFIG['host_os'] =~ /win32|mswin|dos|cygwin|mingw|windows|linux|sunos|solaris/i
+  unless CONFIG['host_os'] =~ /win32|mswin|dos|cygwin|mingw|windows|linux|sunos|solaris/i
     Dir.chdir(dir) do
       ruby 'extconf.rb'
       sh 'make'
-      cp 'proctable.' + Config::CONFIG['DLEXT'], 'sys'
+      cp 'proctable.' + CONFIG['DLEXT'], 'sys'
     end
   end
 end
@@ -38,11 +39,11 @@ end
 desc 'Install the sys-proctable library'
 task :install => [:build] do
   file = nil
-  dir  = File.join(Config::CONFIG['sitelibdir'], 'sys')
+  dir  = File.join(CONFIG['sitelibdir'], 'sys')
 
   Dir.mkdir(dir) unless File.exists?(dir)
 
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /mswin|win32|msdos|cygwin|mingw|windows/i
       file = 'lib/windows/sys/proctable.rb'
     when /linux/i
@@ -62,13 +63,13 @@ end
 
 desc 'Uninstall the sys-proctable library'
 task :uninstall do
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /win32|mswin|dos|cygwin|mingw|windows|linux|sunos|solaris/i
-      dir  = File.join(Config::CONFIG['sitelibdir'], 'sys')
+      dir  = File.join(CONFIG['sitelibdir'], 'sys')
       file = File.join(dir, 'proctable.rb')
     else
-      dir  = File.join(Config::CONFIG['sitearchdir'], 'sys')
-      file = File.join(dir, 'proctable.' + Config::CONFIG['DLEXT'])
+      dir  = File.join(CONFIG['sitearchdir'], 'sys')
+      file = File.join(dir, 'proctable.' + CONFIG['DLEXT'])
   end
 
   rm(file) 
@@ -89,7 +90,7 @@ Rake::TestTask.new do |t|
   task :test => :build
   t.libs << 'test' << '.'
    
-  case Config::CONFIG['host_os']
+  case CONFIG['host_os']
     when /mswin|msdos|cygwin|mingw|windows/i
       t.test_files = FileList['test/test_sys_proctable_windows.rb']
       t.libs << 'lib/windows'
@@ -120,40 +121,38 @@ namespace :gem do
     # in order to get the universal platform settings I want because
     # of some bugginess in Rubygems' platform.rb.
     #
-    case Config::CONFIG['host_os']
+    case CONFIG['host_os']
       when /bsd/i
-         spec.platform = Gem::Platform.new('universal-bsd')
+         spec.platform = Gem::Platform.new(['universal', 'freebsd'])
+         spec.platform.version = nil
          spec.files << 'ext/bsd/sys/proctable.c'
          spec.extra_rdoc_files << 'ext/bsd/sys/proctable.c'
          spec.test_files << 'test/test_sys_proctable_bsd.rb'
          spec.extensions = ['ext/bsd/extconf.rb']
       when /darwin/i
-         spec.platform = Gem::Platform.new('universal-darwin')
+         spec.platform = Gem::Platform.new(['universal', 'darwin'])
          spec.files << 'ext/darwin/sys/proctable.c'
          spec.extra_rdoc_files << 'ext/darwin/sys/proctable.c'
          spec.test_files << 'test/test_sys_proctable_darwin.rb'
          spec.extensions = ['ext/darwin/extconf.rb']
       when /hpux/i
-         spec.platform = Gem::Platform.new('universal-hpux')
+         spec.platform = Gem::Platform.new(['universal', 'hpux'])
          spec.files << 'ext/hpux/sys/proctable.c'
          spec.extra_rdoc_files << 'ext/hpux/sys/proctable.c'
          spec.test_files << 'test/test_sys_proctable_hpux.rb'
          spec.extensions = ['ext/hpux/extconf.rb']
       when /linux/i
-         spec.platform = Gem::Platform.new('universal-linux')
+         spec.platform = Gem::Platform.new(['universal', 'linux'])
          spec.require_paths = ['lib', 'lib/linux']
          spec.files += ['lib/linux/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_linux.rb'
       when /sunos|solaris/i
-         spec.platform = Gem::Platform.new('universal-solaris10.0')
-         spec.platform.version = nil
+         spec.platform = Gem::Platform.new(['universal', 'solaris'])
          spec.require_paths = ['lib', 'lib/sunos']
          spec.files += ['lib/sunos/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_sunos.rb'
       when /mswin|win32|dos|cygwin|mingw|windows/i
-         spec.platform = Gem::Platform::CURRENT
-         spec.platform.cpu = 'universal'
-         spec.platform.version = nil
+         spec.platform = Gem::Platform.new(['universal', 'mingw32'])
          spec.require_paths = ['lib', 'lib/windows']
          spec.files += ['lib/windows/sys/proctable.rb']
          spec.test_files << 'test/test_sys_proctable_windows.rb'

data/benchmarks/bench_ps.rb

@@ -1,21 +1,21 @@
-########################################################################
-# bench_ps.rb
-#
-# Benchmark program to show overall speed and compare the block form
-# versus the non-block form. You should run this benchmark via the
-# 'rake bench' Rake task.
-########################################################################
-require 'benchmark'
-require 'sys/proctable'
-
-MAX = 10
-
-Benchmark.bm do |bench|
-   bench.report("Block form"){
-      MAX.times{ Sys::ProcTable.ps{} }
-   }
-
-   bench.report("Non-block form"){
-      MAX.times{ Sys::ProcTable.ps }
-   }
-end
+########################################################################
+# bench_ps.rb
+#
+# Benchmark program to show overall speed and compare the block form
+# versus the non-block form. You should run this benchmark via the
+# 'rake bench' Rake task.
+########################################################################
+require 'benchmark'
+require 'sys/proctable'
+
+MAX = 10
+
+Benchmark.bm do |bench|
+   bench.report("Block form"){
+      MAX.times{ Sys::ProcTable.ps{} }
+   }
+
+   bench.report("Non-block form"){
+      MAX.times{ Sys::ProcTable.ps }
+   }
+end

data/doc/top.txt

@@ -1,47 +1,47 @@
-= Description
-   A simple 'top' interface for Ruby
-
-= Prerequisites
-   Requires the "sys/proctable" package (which should be installed along
-   with this package).
-
-= Synopsis
-   require "sys/top"
-
-   Sys::Top.top(5).each{ |ps|
-      p ps
-   }
-	
-= Constants
-VERSION
-   Returns the version number of this package as a String.
-	
-= Class Methods
-Sys::Top.top(number=10, field="pctcpu")
-   Returns an array of ProcTableStruct's.  The size of the array (i.e. the
-   number of processes) that it returns is based on +number+, and sorted by
-   +pctcpu+.  By default, the size and field values are 10 and "pctcpu",
-   respectively.
-
-= Notes
-   Not all fields are available on all platforms.  Please check your
-   platform specific documentation for which fields are available.
-	
-= Bugs
-   None that I'm aware of.  Please log bug reports on the project page at
-   http://www.rubyforge.org/projects/sysutils
-	
-= License
-   Artistic 2.0
-	
-= Copyright
-   (C) 2004-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.
-
-= Author
+= Description
+   A simple 'top' interface for Ruby
+
+= Prerequisites
+   Requires the "sys/proctable" package (which should be installed along
+   with this package).
+
+= Synopsis
+   require "sys/top"
+
+   Sys::Top.top(5).each{ |ps|
+      p ps
+   }
+	
+= Constants
+VERSION
+   Returns the version number of this package as a String.
+	
+= Class Methods
+Sys::Top.top(number=10, field="pctcpu")
+   Returns an array of ProcTableStruct's.  The size of the array (i.e. the
+   number of processes) that it returns is based on +number+, and sorted by
+   +pctcpu+.  By default, the size and field values are 10 and "pctcpu",
+   respectively.
+
+= Notes
+   Not all fields are available on all platforms.  Please check your
+   platform specific documentation for which fields are available.
+	
+= Bugs
+   None that I'm aware of.  Please log bug reports on the project page at
+   http://www.rubyforge.org/projects/sysutils
+	
+= License
+   Artistic 2.0
+	
+= Copyright
+   (C) 2004-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.
+
+= Author
    Daniel J. Berger

data/examples/example_ps.rb

@@ -1,20 +1,20 @@
-#######################################################################
-# example_ps.rb
-#
-# Generic test program that demonstrates the use of ProcTable.ps. You
-# can run this via the 'rake example' task.
-#
-# Modify as you see fit
-#######################################################################
-require 'sys/proctable'
-include Sys
-
-puts "VERSION: " + ProcTable::VERSION
-sleep 2
-
-ProcTable.ps{ |s|
-   ProcTable.fields.each{ |field|
-      puts "#{field}: " + s.send(field).to_s    
-   }
-   puts '=' * 30
-}
+#######################################################################
+# example_ps.rb
+#
+# Generic test program that demonstrates the use of ProcTable.ps. You
+# can run this via the 'rake example' task.
+#
+# Modify as you see fit
+#######################################################################
+require 'sys/proctable'
+include Sys
+
+puts "VERSION: " + ProcTable::VERSION
+sleep 2
+
+ProcTable.ps{ |s|
+   ProcTable.fields.each{ |field|
+      puts "#{field}: " + s.send(field).to_s    
+   }
+   puts '=' * 30
+}

data/lib/sys/top.rb

@@ -1,32 +1,29 @@
-require 'sys/proctable'
-require 'rbconfig'
-
-# The Sys module serves as a namespace only
-module Sys
-
-  # The Top class serves as a toplevel name for the 'top' method.
-  class Top
-
-    # The version of the sys-top library
-    VERSION = '1.0.3'
-
-    # Returns an array of Struct::ProcTableStruct elements containing up
-    # to +num+ elements, sorted by +field+. The default number of elements
-    # is 10, while the default field is 'pctcpu'.
-    #
-    # Exception: the default sort field is 'pid' on Linux and Windows.
-    #
-    def self.top(num=10, field='pctcpu')
-      field = field.to_s if field.is_a?(Symbol)
-
-      windows = /mswin|win32|windows|dos|cygwin|mingw/i
-
-      # Sort by pid on Windows by default
-      if Config::CONFIG['host_os'].match(windows) && field == 'pctcpu'
-        field = 'pid'
-      end
-
-      Sys::ProcTable.ps.sort_by{ |obj| obj.send(field) || '' }[0..num-1]
-    end
-  end
-end
+require 'sys/proctable'
+
+# The Sys module serves as a namespace only
+module Sys
+
+  # The Top class serves as a toplevel name for the 'top' method.
+  class Top
+
+    # The version of the sys-top library
+    VERSION = '1.0.3'
+
+    # Returns an array of Struct::ProcTableStruct elements containing up
+    # to +num+ elements, sorted by +field+. The default number of elements
+    # is 10, while the default field is 'pctcpu'.
+    #
+    # Exception: the default sort field is 'pid' on Linux and Windows.
+    #
+    def self.top(num=10, field='pctcpu')
+      field = field.to_s if field.is_a?(Symbol)
+
+      # Sort by pid on Windows by default
+      if File::ALT_SEPARATOR && field == 'pctcpu'
+        field = 'pid'
+      end
+
+      Sys::ProcTable.ps.sort_by{ |obj| obj.send(field) || '' }[0..num-1]
+    end
+  end
+end