immortalize 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/immortalize

@@ -28,8 +28,15 @@ To add (and start) a command:
 #{$0} run "command" --notification_recipient admin@email.com --max_failures 5
 To change a command's options, just re-add it.
 
+To stop a daemon:
+#{$0} stop "command"
+#{$0} stop 1 # <- 1 is an index as in 'immortalize list' below
+#{$0} stop all
+
 To remove a command:
 #{$0} remove "command"
+#{$0} remove 1 # <- 1 is an index as in 'immortalize list' below
+#{$0} remove all
 
 To inspect the current list of immortal commands:
 #{$0} list
@@ -44,17 +51,17 @@ Options:
 ENDBANNER
 
   $options[:notification_recipient] = nil
-  opts.on( '--notify=EMAIL', "The email address to which failure notifications should be sent." ) do |email|
+  opts.on( '--notify EMAIL', "The email address to which failure notifications should be sent." ) do |email|
     $options[:notification_recipient] = email
   end
 
   $options[:max_failures] = 5
-  opts.on('--max_failures=NUM', "Notify on NUM or more failures within an hour (default 5)") do |num|
+  opts.on('--max_failures NUM', "Notify on NUM or more failures within an hour (default 5)") do |num|
     $options[:max_failures] = num.to_i
   end
 
   $log_location = "#{ENV['HOME']}/.immortalize"
-  opts.on('--log-location=PATH', "Manually set the location for immortalize to keep its registry and cron.log (default #{$log_location})") do |path|
+  opts.on('--log-location PATH', "Manually set the location for immortalize to keep its registry and cron.log (default #{$log_location})") do |path|
     if !File.directory?(path)
       warn "`#{path}' is not a valid path."
       exit 1
@@ -172,7 +179,7 @@ class Immortal
 end
 
 # Curate the command string
-if ARGV[1].to_s.length > 1 && ARGV[1] !~ /^\d+$/
+if ARGV[1].to_s.length > 1 && ARGV[1] !~ /^\d+$/ && ARGV[1] != 'all'
   $command_string = ARGV[1]
   # Complain about the string if it does not have proper output redirections
   cmds = $command_string.split(/; ?/)
@@ -198,13 +205,8 @@ unless ::Object.const_defined?(:IRB)
   case $action
   when 'setup'
     crons = `crontab -l 2>/dev/null`.split(/\n/)
-    immortalize_cmd = `which immortalize`.chomp
-    if immortalize_cmd.empty?
-      warn "Couldn't find installed version of the 'immortalize' command! (Try `which immortalize`)"
-      exit
-    end
-    crons.reject! {|c| c =~ /immortalize.*>> #{$log_location}\/cron.log/}
-    crons << "* * * * * #{immortalize_cmd} --log-location=\"#{$log_location}\" >> #{$log_location}/cron.log 2>&1\n"
+    crons.reject! {|c| c =~ /immortalize.*>?> #{$log_location}\/cron.log/}
+    crons << "* * * * * #{$0} --log-location=\"#{$log_location}\" >> #{$log_location}/cron.log 2>&1\n"
     puts "Installing crons:\n\t#{crons.join("\n\t")}"
     f = IO.popen("crontab -", 'w')
     f << crons.join("\n")
@@ -224,11 +226,18 @@ unless ::Object.const_defined?(:IRB)
   when 'stop'
     if ARGV[1] =~ /^\d+$/
       identifier = $registry.keys.sort[ARGV[1].to_i-1]
+      immortal = Immortal.new(identifier)
+      immortal.stop!
+    elsif ARGV[1] == 'all'
+      $registry.keys.each do |identifier|
+        immortal = Immortal.new(identifier)
+        immortal.stop!
+      end
     else
       identifier = SHA1.hexdigest($command_string)
+      immortal = Immortal.new(identifier)
+      immortal.stop!
     end
-    immortal = Immortal.new(identifier)
-    immortal.stop!
     
   when 'run'
     if $options[:notification_recipient].nil?
@@ -257,11 +266,18 @@ unless ::Object.const_defined?(:IRB)
   when 'remove'
     if ARGV[1] =~ /^\d+$/
       identifier = $registry.keys.sort[ARGV[1].to_i-1]
+      reg = $registry.delete(identifier)
+      puts "Deleted #{identifier}: \"#{reg[:command]}\""
+    elsif ARGV[1] == 'all'
+      $registry.keys.each do |identifier|
+        reg = $registry.delete(identifier)
+        puts "Deleted #{identifier}: \"#{reg[:command]}\""
+      end
     else
       identifier = SHA1.hexdigest($command_string)
+      reg = $registry.delete(identifier)
+      puts "Deleted #{identifier}: \"#{reg[:command]}\""
     end
-    reg = $registry.delete(identifier)
-    puts "Deleted #{identifier}: \"#{reg[:command]}\""
 
   when nil
     # Running bare from cron.
@@ -280,7 +296,7 @@ unless ::Object.const_defined?(:IRB)
         # Notify if failures have been frequent
         if immortal.frequent_failures?
           puts "  #{i+1}) FREQUENT FAILURE ON #{identifier} (`#{immortal[:command]}')"
-          notify(immortal, "ImmortalCommand failure!\n\nCommand `#{immortal[:command]}' failed, threshold is #{immortal[:max_failures]} / hour.\n\n#{immortal.failures_today.size} failures so far today, #{immortal.failures_this_hour.size} in the past hour.")
+          notify(immortal, "ImmortalCommand failure!\n\nCommand `#{immortal[:command]}' failed at #{Time.now}, threshold is #{immortal[:max_failures]} / hour.\n\n#{immortal.failures_today.size} failures so far today, #{immortal.failures_this_hour.size} in the past hour.")
         end
         # Start it
         immortal.start!

data/immortalize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{immortalize}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BehindLogic"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-04-06}
   s.default_executable = %q{immortalize}
   s.description = %q{Watch a specific process, restart it if it dies.}
   s.email = %q{gems@behindlogic.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - BehindLogic
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: immortalize
 dependencies: []