lib/ps.rb in ps-0.0.2 vs lib/ps.rb in ps-0.0.4

@@ -1,11 +1,11 @@
 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',
     'acflg' => 'acflag',
     'f' => 'flags',
@@ -21,15 +21,10 @@
     'usrpri' => 'upr',
     'putime' => 'utime',
     '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}
 
   def all opts={}
     opts ||= {}
@@ -39,31 +34,50 @@
     c = Command.new(opts)
     c.to_processes
   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'
 require 'ps/process'
 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