epitools 0.4.18 → 0.4.19

data/README.rdoc

@@ -3,15 +3,15 @@
 Useful miscellaneous improvements for base Ruby objects, plus some extra
 data structures and handy wrappers.
 
-Base classess have been enhanced: {Enumerable}[http://rdoc.info/gems/epitools/Enumerable], {Hash}[http://rdoc.info/gems/epitools/Hash], {String}[http://rdoc.info/gems/epitools/String], {Array}[http://rdoc.info/gems/epitools/Array], {Object}[http://rdoc.info/gems/epitools/Object], {Integer}[http://rdoc.info/gems/epitools/Integer], etc.
+Base classess have been enhanced: {Enumerable}[http://rdoc.info/github/epitron/epitools/master/Enumerable], {Hash}[http://rdoc.info/github/epitron/epitools/master/Hash], {String}[http://rdoc.info/github/epitron/epitools/master/String], {Array}[http://rdoc.info/github/epitron/epitools/master/Array], {Object}[http://rdoc.info/github/epitron/epitools/master/Object], {Integer}[http://rdoc.info/github/epitron/epitools/master/Integer], etc.
 
 Extras:
 
-* {Colored}[http://rdoc.info/gems/epitools/Colored] (enhanced version of defunkt's colored -- adds ANSI colouring methods to String, eg: #red, #green, #light_blue, etc.)
-* {Path}[http://rdoc.info/gems/epitools/Path] (a better Pathname)
-* {Rash}[http://rdoc.info/gems/epitools/Rash] (a hash which can have Regexps as keys, allowing a single (key,value) pair to match many keys.)
-* {Progressbar}[http://rdoc.info/gems/epitools/Progressbar] (better than the progressbar gem)
-* {Browser}[http://rdoc.info/gems/epitools/Browser] (a fake browser, using mechanize, Progressbar, and CacheDB)
+* {Colored}[http://rdoc.info/github/epitron/epitools/master/Colored] (enhanced version of defunkt's colored -- adds ANSI colouring methods to String, eg: #red, #green, #light_blue, etc.)
+* {Path}[http://rdoc.info/github/epitron/epitools/master/Path] (a better Pathname)
+* {Rash}[http://rdoc.info/github/epitron/epitools/master/Rash] (a hash which can have Regexps as keys, allowing a single (key,value) pair to match many keys.)
+* {Progressbar}[http://rdoc.info/github/epitron/epitools/master/Progressbar] (better than the progressbar gem)
+* {Browser}[http://rdoc.info/github/epitron/epitools/master/Browser] (a fake browser, using mechanize, Progressbar, and CacheDB)
   
 == Installing
 
@@ -21,7 +21,7 @@ Extras:
 
 This is basically a collection of enhancements to the ruby base types (Hash, Array,
 Enumerable, etc.). To learn how it works, read the specs in spec/*.rb,
-or check out the rdoc: http://rdoc.info/gems/epitools/frames
+or check out the rdoc: http://rdoc.info/github/epitron/epitools/master/frames
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.4.18
+0.4.19

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.18"
+  s.version = "0.4.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2011-03-25}
+  s.date = %q{2011-03-30}
   s.description = %q{Miscellaneous utility libraries to make my life easier.}
   s.email = %q{chris@ill-logic.com}
   s.extra_rdoc_files = [
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/epitron/epitools}
   s.licenses = ["WTFPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{NOT UTILS... METILS!}
   s.test_files = [
     "spec/basetypes_spec.rb",
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/epitools/sys.rb

@@ -8,6 +8,56 @@ module Sys
   
   #-----------------------------------------------------------------------------
 
+  #
+  # Return the current operating system: Darwin, Linux, or Windows. 
+  #
+  def self.os
+    return @os if @os
+
+    require 'rbconfig'
+    host_os = Config::CONFIG['host_os']
+    case host_os
+      when /darwin/
+        @os = "Darwin"
+      when /linux/
+        @os = "Linux"
+      when /mingw|mswin|cygwin/
+        @os = 'Windows'
+    else
+      raise "Unknown OS: #{host_os.inspect}"
+    end
+
+    @os
+  end
+  
+  #
+  # Is this Linux?
+  #
+  def self.linux?
+    os == "Linux"
+  end
+
+  #
+  # Is this Windows?
+  #
+  def self.windows?
+    os == "Windows"
+  end
+
+  #
+  # Is this Darwin?
+  #
+  def self.darwin?
+    os == "Darwin"
+  end
+
+  #
+  # Is this a Mac? (aka. Darwin?)
+  #
+  def self.mac?; darwin?; end
+
+  #-----------------------------------------------------------------------------
+
   PS_FIELD_TABLE = [
     [:pid,    :to_i],
     [:pcpu,   :to_f],
@@ -33,6 +83,8 @@ module Sys
   # The following attribute accessor methods are available:
   #
   #    pid     (integer)
+  #    command (string -- the 'ps' name)
+  #    name    (alias for 'command')
   #    pcpu    (float)
   #    pmem    (float)
   #    stat    (string)
@@ -41,9 +93,12 @@ module Sys
   #    user    (string)
   #    majflt  (integer)
   #    minflt  (integer)
-  #    command (string)
   #    state   (array of symbols; see DARWIN_STATES or LINUX_STATES)
   #
+  # Only on linux:
+  #    exename (string -- path to the binary)
+  #    fds     (array -- list of open file descriptors)
+  #
   class ProcessInfo < Struct.new(*PS_FIELDS+[:state])
 
     DARWIN_STATES = {
@@ -125,7 +180,23 @@ module Sys
       members.each { |member| self[member] = updated_process[member] }
       self
     end
+    
+    alias_method :name, :command
 
+    # Linux-specific methods    
+    if Sys.linux?
+      
+      def exename
+        @exename ||= File.readlink("/proc/#{pid}/exe") rescue :unknown
+        @exename == :unknown ? nil : @exename
+      end
+      
+      def fds
+        Dir["/proc/#{pid}/fd/*"].map { |fd| File.readlink(fd) rescue nil }
+      end
+      
+    end
+    
     private 
     
     def stat_to_state(str)
@@ -137,7 +208,6 @@ module Sys
       
       str.scan(/./).map { |char| states[char] }.compact
     end
-    
   end
 
   #-----------------------------------------------------------------------------
@@ -150,12 +220,12 @@ module Sys
     options = PS_FIELDS.join(',')
     
     if pids.any?
-      command = "ps -p #{pids.join(',')} -o #{options}"
+      command = "ps -p #{pids.map(&:to_i).join(',')} -o #{options}"
     else
       command = "ps ax -o #{options}"
     end
 
-    lines = `#{command}`.to_a        
+    lines = `#{command}`.lines.to_a        
 
     lines[1..-1].map do |line|
       fields = line.split
@@ -171,56 +241,6 @@ module Sys
   
   #-----------------------------------------------------------------------------
 
-  #
-  # Return the current operating system: Darwin, Linux, or Windows. 
-  #
-  def self.os
-    return @os if @os
-
-    require 'rbconfig'
-    host_os = Config::CONFIG['host_os']
-    case host_os
-      when /darwin/
-        @os = "Darwin"
-      when /linux/
-        @os = "Linux"
-      when /mingw|mswin|cygwin/
-        @os = 'Windows'
-    else
-      raise "Unknown OS: #{host_os.inspect}"
-    end
-
-    @os
-  end
-  
-  #
-  # Is this Linux?
-  #
-  def self.linux?
-    os == "Linux"
-  end
-
-  #
-  # Is this Windows?
-  #
-  def self.windows?
-    os == "Windows"
-  end
-
-  #
-  # Is this Darwin?
-  #
-  def self.darwin?
-    os == "Darwin"
-  end
-
-  #
-  # Is this a Mac? (aka. Darwin?)
-  #
-  def self.mac?; darwin?; end
-  
-  #-----------------------------------------------------------------------------
-
   #
   # Trap signals!
   #

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epitools
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.18
+  hash: 41
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 19
+  version: 0.4.19
 platform: ruby
 authors: 
 - epitron
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
+date: 2011-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
   type: :development
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id002
@@ -43,6 +58,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -110,17 +128,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: NOT UTILS... METILS!