ps 0.0.2 → 0.0.4

data/lib/ps.rb

@@ -3,7 +3,7 @@ require "ps/version"
 module PS
   extend self
 
-  ALL_OPTS = `ps -L`.chomp.split(/[\s\n]/).freeze
+  ALL_FORMATS = `ps -L`.chomp.split(/[\s\n]/).freeze
   FORMAT_ALIASES = {
     'pcpu' => '%cpu',
     'pmem' => '%mem',
@@ -23,11 +23,6 @@ module PS
     'vsize' => 'vsz'
   }
 
-  def default_formatting
-    @default_formatting ||= ALL_OPTS
-  end
-  attr_writer :default_formatting
-
   DEFAULT_FORMATTING = %w{pid ppid pgid rss vsz %mem %cpu ruser
     user uid gid lstart state command}
 
@@ -41,15 +36,29 @@ module PS
   end
 
   def pid *pids
-    opts = pids.pop if pids.last.is_a?(Hash)
+    opts = pids.pop if pids.last.is_a?(Hash) || pids.last.nil?
     opts ||= {}
-    opts[:flag] ||= %w{A}
+    opts[:flag] ||= %w{}
     opts[:pid] = pids
     opts[:format] ||= DEFAULT_FORMATTING
 
     c = Command.new(opts)
     c.to_processes
   end
+
+  def from_lsof match, args={}
+    lines = `lsof -i #{match} -sTCP:LISTEN`.chomp.split("\n")
+    lines.shift # remove header
+    
+    pids = lines.collect do |line|
+      if m = line.match(/\s*\w+\s+(\d+)/)
+        m[1].to_i
+      end
+    end.compact
+
+    pids << args
+    pid(*pids)
+  end
 end
 
 require 'ps/command'
@@ -59,11 +68,16 @@ require 'ps/process_list'
 def PS *args
   case args[0]
   when Regexp
-    procs = PS.all(args[1])
-    procs.select {|proc| proc.command =~ args[0]}
+    opts = args[1] || {}
+    procs = PS.all(opts)
+    procs = procs.select {|proc| proc.command =~ args[0]}
+    procs = procs.select {|proc| proc.pid != Process.pid} unless opts[:include_self]
+    procs
   when Integer
-    PS.pid(args[0],args[1]).first
+    PS.pid(*args).first
   when Hash
-    PS.all(args[0])
+    PS.all(*args)
+  when /\:\d+$/
+    PS.from_lsof(*args)
   end
 end

data/lib/ps/command.rb

@@ -76,6 +76,7 @@ module PS
 
     def parse_formats!
       @formats.each do |format|
+        format = format.sub('=','')
         unless DEFAULT_FORMATTING.include?(format)
           warn("Untested formatting option: #{format}")
         end

data/lib/ps/process.rb

@@ -1,7 +1,7 @@
 module PS
   class Process
 
-    ALL_OPTS.each do |opt|
+    ALL_FORMATS.each do |opt|
       define_method opt do
         @data[opt]
       end
@@ -40,5 +40,30 @@ module PS
       rss/1024.0 if rss
     end
 
+    def alive?
+      return unless pid
+      Process.getpgid(pid)
+      true
+    rescue Errno::ESRCH
+      false
+    end
+
+    def display
+      disp = []
+      disp << pid
+      disp << user
+      disp << lstart
+      disp << pcpu
+      disp << pmem
+      disp << mem
+      disp << command
+      disp.compact.join(' ')
+    end
+
+    def kill!(sig=nil)
+      sig ||= 'INT'
+      ::Process.kill(sig, pid) if pid
+    end
+
   end
 end

data/lib/ps/version.rb

@@ -1,3 +1,3 @@
 module PS
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ps
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec