bluepill 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/bin/bluepill

@@ -26,8 +26,20 @@ controller = Bluepill::Controller.new(options.slice(:base_dir))
 
 if controller.list.include?(ARGV.first)
   options[:application] = ARGV.shift 
-elsif controller.list.length == 1 && ALLOWED_COMMANDS.include?(ARGV.first)
-  options[:application] = controller.list.first
+elsif ALLOWED_COMMANDS.include?(ARGV.first)
+  if controller.list.length == 1
+    options[:application] = controller.list.first
+  elsif controller.list.length > 1
+    $stderr.puts "You must specify an application name. Here's the list:"
+    controller.list.each_with_index do |app, index|
+      $stderr.puts "  #{index + 1}. #{app}"
+    end
+    $stderr.puts "Usage: bluepill [app] cmd [options]"
+    exit
+  else
+    $stderr.puts "There are no running bluepill daemons.\nTo start a bluepill daemon, use: bluepill load <config file>"
+    exit
+  end
 end
 
 options[:command] = ARGV.shift

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
-  s.date = %q{2009-11-05}
+  s.date = %q{2009-11-06}
   s.default_executable = %q{bluepill}
   s.description = %q{Bluepill keeps your daemons up while taking up as little resources as possible. After all you probably want the resources of your server to be used by whatever daemons you are running rather than the thing that's supposed to make sure they are brought back up, should they die or misbehave.}
   s.email = %q{entombedvirus@gmail.com}

data/lib/bluepill/controller.rb

@@ -11,12 +11,25 @@ module Bluepill
       self.pids_dir = File.join(base_dir, 'pids')
       self.applications = Hash.new 
       setup_dir_structure
+      cleanup
     end
     
     def list
       Dir[File.join(sockets_dir, "*.sock")].map{|x| File.basename(x, ".sock")}
     end
     
+    def cleanup
+      self.list.each do |app|
+        pid = pid_for(app)
+        if !pid || !alive?(pid)
+          pid_file = File.join(self.pids_dir, "#{app}.pid")
+          sock_file = File.join(self.sockets_dir, "#{app}.sock")
+          File.unlink(pid_file) if File.exists?(pid_file)
+          File.unlink(sock_file) if File.exists?(sock_file)
+        end
+      end
+    end
+    
     def send_cmd(application, command, *args)
       applications[application] ||= Application.new(application, {:base_dir => base_dir})
       applications[application].send(command.to_sym, *args.compact)
@@ -24,6 +37,21 @@ module Bluepill
     
     private
     
+    def pid_for(app)
+      pid_file = File.join(self.pids_dir, "#{app}.pid")
+      File.exists?(pid_file) && File.read(pid_file).to_i
+    end
+    
+    
+    def alive?(pid)
+      begin
+        ::Process.kill(0, pid)
+        true
+      rescue Errno::ESRCH
+        false
+      end
+    end
+    
     def setup_dir_structure
       [@sockets_dir, @pids_dir].each do |dir|
         FileUtils.mkdir_p(dir) unless File.exists?(dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-11-06 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency