die 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/die

@@ -2,4 +2,4 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'die'
 
-Die.new.run
+Die.run_from_options

data/die.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{die}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Billy Reisinger"]
-  s.date = %q{2011-11-07}
+  s.date = %q{2011-11-08}
   s.default_executable = %q{die}
   s.description = %q{Kill one or more processes by command name via an interactive script.  Die will find processes that match a given command name, and give you the opportunity to kill one, several, all, or none of them.}
   s.email = %q{billy.reisinger@gmail.com}

data/lib/die.rb

@@ -1,12 +1,16 @@
+require 'optparse'
+
 class Die
+  attr_accessor :signal, :search
+
   def kill_phash_entry(entry)
     pid = entry[0].strip.to_i
-    Process.kill("KILL", pid)
-    puts "Killed #{pid} #{entry[1]}"
+    Process.kill(self.signal, pid)
+    puts "#{self.signal} #{pid} #{entry[1]}"
   end
 
   def processes
-    @processes ||= `ps -ae -o pid,command | grep -i #{ARGV[0]} | egrep -v "(#{$0}|grep)"`.split("\n").map(&:strip)
+    @processes ||= `ps -ae -o pid,command | egrep -i '(#{self.search.join("|")})' | egrep -v \"(#{$0}|grep)\"`.split("\n").map(&:strip)
   end
 
   # {
@@ -22,14 +26,21 @@ class Die
     p_hash
   end
 
+  def initialize(opts={})
+    self.signal = (opts[:signal] || "KILL").upcase
+    if !Signal.list.has_key?(self.signal)
+      raise Exception.new "Unknown signal #{self.signal}. Available signals: #{Signal.list.keys.sort.join(", ")}"
+    end
+    self.search = opts[:search] || ""
+  end
+
   def run
     unless processes.empty?
       p_hash = process_hash
-
       puts
       puts processes
       puts
-      puts " Type 'all' to kill 'em all, or the numbers (separated by a space) to kill some. Type anything else to quit."
+      puts " Type 'all' to #{self.signal} 'em all, or the numbers (separated by a space) to kill some. Type anything else to quit."
       inp = $stdin.gets.strip
       if(inp =~ /^a(ll)?/i)
         p_hash.each do |k,v|
@@ -44,4 +55,39 @@ class Die
       puts "No processes matching #{ARGV[0]}"
     end
   end
+
+  def self.run_from_options
+    opts = {:signal => "KILL", :search => ARGV[0..-1]}
+    o = OptionParser.new do |opt|
+      opt.banner = self.help
+      opt.on("-v", "--version", "Show version") do
+        puts "#{self.to_s} #{File.read(File.join(File.dirname(__FILE__, '..', 'VERSION')))}"
+        exit
+      end
+      opt.on("-s", "--signal SIGNAL", "Signal (defaults to KILL)") do |sig|
+        puts sig, '00' * 100
+        opts[:signal] = sig
+      end
+    end
+    o.parse!
+    self.new(opts).run
+  end
+
+  def self.help
+    <<-STR
+Description
+Kill (or send a different signal to) one or more processes by search string. 
+Multiple search strings can be provided, separated by a space.  
+The default signal is KILL; a different one can be provided with the
+-s switch (see below).
+
+Usage
+#{$0} search_string1 [...search_string2 [...]]
+
+Available signals
+#{Signal.list.keys.join(", ")}
+
+Options
+    STR
+  end
 end

data/test/test_die.rb

@@ -54,4 +54,26 @@ class TestDie < Test::Unit::TestCase
     Process.expects(:kill).with("KILL", 249)
     d.run
   end
+
+  def test_different_signal
+    d = Die.new(:signal => "ABRT")
+    d.stubs(:processes).returns([
+      "42 /usr/sbin/httpd -D FOREGROUND",
+      "249 /usr/sbin/httpd -D FOREGROUND"
+    ])
+    d.stubs(:process_hash).returns({
+      1 => ["42", "/usr/sbin/httpd", "-D", "FOREGROUND"],
+      2 => ["249", "/usr/sbin/httpd", "-D", "FOREGROUND"]
+    })
+    $stdin.stubs(:gets).returns("1 2")
+    Process.expects(:kill).with("ABRT", 42)
+    Process.expects(:kill).with("ABRT", 249)
+    d.run
+  end
+
+  def test_exception_on_unknown_signal
+    assert_raise(Exception) do
+      Die.new(:signal => "DONKEY")
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: die
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Billy Reisinger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 -06:00
+date: 2011-11-08 00:00:00 -06:00
 default_executable: die
 dependencies: 
 - !ruby/object:Gem::Dependency