ps 0.0.5 → 0.0.6

data/lib/ps.rb

@@ -64,13 +64,14 @@ end
 require 'ps/command'
 require 'ps/process'
 require 'ps/process_list'
+require 'ps/process_list_printer'
 
 def PS *args
   case args[0]
   when Regexp
     opts = args[1] || {}
     procs = PS.all(opts)
-    procs = procs.command(args[0])
+    procs = procs.select {|proc| proc.command =~ args[0]}
     procs = procs.select {|proc| proc.pid != Process.pid} unless opts[:include_self]
     procs
   when Integer

data/lib/ps/process_list.rb

@@ -13,15 +13,69 @@ module PS
     end
 
     def over val, amnt
-      select do |proc|
+      find_all do |proc|
         proc.__send__(val) >= amnt
       end
     end
 
+    def to_a
+      @target
+    end
+
+    def print headers=nil, to=nil
+      to ||= STDOUT
+      printer = Printer.new(self,headers)
+      to.send :puts, printer.to_s
+    end
+
+    def choose question=nil
+      if empty?
+        puts "No processes found."
+        return self
+      end
+      question ||= 'Select process(s):'
+      self.print
+      puts "\n#{question}"
+      proc_ids = STDIN.gets.chomp
+      proc_ids = '*' if proc_ids.empty?
+      proc_ids = proc_ids.split(/[,\s]/)
+
+      if proc_ids.include?('*')
+        proc_ids = (0..self.size).to_a
+      else
+        proc_ids = proc_ids.collect do |proc_id|
+          case proc_id
+          when /^\d+$/
+            proc_id.to_i
+          when /^(\d+)(\.{2,3})(\d*)$/
+            if $3.empty?
+              ($1.to_i..self.size).to_a
+            elsif $2.size === 3
+              ($1.to_i...$3.to_i).to_a
+            else
+              ($1.to_i..$3.to_i).to_a
+            end
+          when /^(\d+)\-(\d+)$/
+            ($1.to_i..$2.to_i).to_a
+          end
+        end.flatten.uniq
+      end
+
+      procs = self.class.new
+
+      proc_ids.each do |proc_id|
+        proc = @target[proc_id.to_i]
+
+        procs << proc
+      end
+
+      procs
+    end
+
     # Ugh shoot me for using method missing, couldn't get
     # it to work any other way.
-    def method_missing(name, *args, &blk)
-      new_target = @target.send(name, *args, &blk)
+    def method_missing(*args, &blk)
+      new_target = @target.send(*args, &blk)
        
       new_target.class == @target.class ? self.class.new(new_target) : new_target
     end

data/lib/ps/process_list_printer.rb

@@ -0,0 +1,118 @@
+require 'ansi/core'
+require 'ansi/terminal'
+require 'ansi/string'
+
+module PS
+  class ProcessList
+    class Printer
+
+      def initialize pl, headers=nil
+        @headers = headers || %w{# pid ppid user pcpu mem command}
+        @process_list = pl
+      end
+
+      def data
+        data = []
+
+        data << header_cells = @headers.collect do |header|
+          {:val => header, :header => header}
+        end
+
+        @process_list.to_a.each_with_index do |proc,i|
+          data << @headers.collect do |header|
+            val = header == '#' ? i : proc.send(header)
+            
+            cell = {:val => val, :header => header}
+
+            case header
+            when 'pid'
+              cell[:format] = [:blue]
+            when '#'
+              cell[:format] = [:yellow]
+              cell[:align] = :right
+            when 'user','ruser'
+              cell[:align] = :center
+            when 'mem'
+              cell[:val] = val.round.to_s + 'mb'
+              cell[:align] = :right
+            when 'pcpu', 'pmem'
+              cell[:align] = :right
+              cell[:format] = case cell[:val]
+              when 0.0...25.0
+                []
+              when 25.0..75.0
+                [:red]
+              else
+                [:white,:on_red]
+              end
+              
+              cell[:val] = (cell[:val]).to_i.to_s+'%'
+            end
+
+            cell
+          end
+        end
+
+        data
+      end
+
+      def to_s
+        printgrid(data)
+      end
+
+      private
+
+      def printgrid(table)
+        strs = []
+        strings = table.map do |row|
+          row.map { |cell| cell[:val].to_s }
+        end
+
+        column_widths = []
+        strings.each do |row|
+          row.each_with_index do |cell,i|
+            column_widths[i] = [column_widths[i] || 0, cell.length].max
+          end
+        end
+
+        row_separator = column_widths.map { |width| "-" * (width+2) }.join("+")[0...ANSI::Terminal.terminal_width]
+
+        # strs << row_separator
+        table.each_with_index do |row,ri|
+          diff = 0
+          justified_row = row.enum_for(:map).with_index do |cell,ci|
+            val = cell[:val].to_s
+
+            str = " "
+
+            padded_val = case cell[:align]
+            when :right
+              val.rjust(column_widths[ci])
+            when :center
+              val.center(column_widths[ci])
+            else
+              val.ljust(column_widths[ci])
+            end
+
+            # padded_val.sub!(val,val.ansi(*cell[:format])) if cell[:format] && !cell[:format].empty?
+            if cell[:format] && !cell[:format].empty?
+              orig_len = padded_val.length
+              padded_val.ansi!(*cell[:format])
+              diff += padded_val.length - orig_len
+            end
+
+            str << padded_val
+
+            str << " "
+            str
+          end
+          strs << justified_row.join("|")[0...ANSI::Terminal.terminal_width+diff]
+          strs << row_separator if ri == 0
+        end
+
+        strs.join("\n")
+      end
+
+    end
+  end
+end

data/lib/ps/version.rb

@@ -1,3 +1,3 @@
 module PS
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/ps.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec"
+  s.add_runtime_dependency 'ansi'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ps
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -31,6 +31,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ansi
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: A ruby utility for interacting with the unix tool 'ps'
 email: 
 - me@tal.by
@@ -50,6 +64,7 @@ files:
 - lib/ps/command.rb
 - lib/ps/process.rb
 - lib/ps/process_list.rb
+- lib/ps/process_list_printer.rb
 - lib/ps/version.rb
 - ps.gemspec
 - spec/command_spec.rb