blessing 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/blessing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "blessing"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Laas Toom"]
-  s.date = "2011-10-18"
+  s.date = "2011-11-04"
   s.description = "A group of Unicorns is called a blessing. Blessing gem provides an easy way to manage multiple Unicorn! Rack servers."
   s.email = "laas.toom@gmail.com"
   s.executables = ["blessing"]

data/lib/blessing/runner.rb

@@ -92,10 +92,11 @@ module Blessing
 
       # See if this Unicorn is alread dead
       if dead?
-        logger.warn "This Unicorn is dead: PID=#{pid}, conf=#{@config_file.inspect}"
         unless resurrect
+          logger.warn "Won't touch dead unicorn: PID=#{pid}, conf=#{@config_file.inspect}"
           return
         else 
+          logger.warn "This unicorn is dead: PID=#{pid}, conf=#{@config_file.inspect}"
           logger.warn "Resurrecting..."
         end
       end
@@ -109,11 +110,13 @@ module Blessing
       ensure_running
 
       # if it was dead and is now running, we are successful
-      if dead? && running?
-        logger.warn "Successfully resurrected (necromancy +1)!"
-        @dead = false
-      else
-        logger.warn "Resurrection failed!"
+      if dead?
+        if running?
+          logger.warn "Successfully resurrected (necromancy +1)!"
+          @dead = false
+        else
+          logger.warn "Resurrection failed!"
+        end
       end
     end
 
@@ -129,8 +132,10 @@ module Blessing
 
     # Verify the Unicorn! process is running
     def running?
+      p = pid
+      return false if p.nil?
       begin
-        Process.kill 0, pid
+        Process.kill 0, p
         true
       rescue Errno::ESRCH
         # just verifying; logging should be done elsewhere

data/spec/blessing_runner_spec.rb

@@ -55,13 +55,21 @@ describe Blessing::Runner do
       runner = Blessing::Runner.new(@conf)
 
       pid = 12345
-      runner.should_receive(:pid).and_return(pid)
-      Process.should_receive(:kill).with(0, pid).and_return(true)
+      runner.should_receive(:pid).ordered.and_return(pid)
+      Process.should_receive(:kill).ordered.with(0, pid).and_return(true)
       runner.running?.should be_true
 
       pid = 22345
-      runner.should_receive(:pid).and_return(pid)
-      Process.should_receive(:kill).with(0, pid) { raise Errno::ESRCH, "TestException" }
+      runner.should_receive(:pid).ordered.and_return(pid)
+      Process.should_receive(:kill).ordered.with(0, pid) { raise Errno::ESRCH, "TestException" }
+      runner.running?.should_not be_true
+    end
+    
+    it "assumes not running when PID is missing" do
+      runner = Blessing::Runner.new(@conf)
+      
+      runner.should_receive(:pid).and_return(nil)
+      Process.should_not_receive(:kill)
       runner.running?.should_not be_true
     end
 

data/spec/support/matchers/pid_matchers.rb

@@ -2,12 +2,20 @@
 RSpec::Matchers.define :contain_a_pid_number do
   match do |actual|
     if File.exists? actual
-      pid = File.read(actual).chomp
-      pid.to_i.to_s == pid.chomp
+      @pid = File.read(actual).chomp
+      @pid.to_i.to_s == @pid.chomp
     else
       false
     end
   end
+  
+  failure_message_for_should do |actual|
+    "File #{actual} expected to contain PID number instead of: #{@pid.inspect}"
+  end
+  
+  failure_message_for_should_not do |actual|
+    "File #{actual} expected not to contain PID number: #{@pid.inspect}"
+  end
 end
 
 # Check that the pid is still running

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blessing
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2011-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &2177673060 !ruby/object:Gem::Requirement
+  requirement: &2158816680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2177673060
+  version_requirements: *2158816680
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2177671740 !ruby/object:Gem::Requirement
+  requirement: &2158814700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2177671740
+  version_requirements: *2158814700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2177669440 !ruby/object:Gem::Requirement
+  requirement: &2158791100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2177669440
+  version_requirements: *2158791100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2177668660 !ruby/object:Gem::Requirement
+  requirement: &2158788900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2177668660
+  version_requirements: *2158788900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2177667980 !ruby/object:Gem::Requirement
+  requirement: &2158786800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *2177667980
+  version_requirements: *2158786800
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2177667100 !ruby/object:Gem::Requirement
+  requirement: &2158785080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2177667100
+  version_requirements: *2158785080
 description: A group of Unicorns is called a blessing. Blessing gem provides an easy
   way to manage multiple Unicorn! Rack servers.
 email: laas.toom@gmail.com
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3814883158345661566
+      hash: -2309482515618915654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: