kestrel-client 0.5.8 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.6.0

data/kestrel-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kestrel-client}
-  s.version = "0.5.8"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Rael Dornfest"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-10-07}
   s.description = %q{Ruby client for the Kestrel queue server}
   s.email = %q{rael@twitter.com}
   s.extra_rdoc_files = [

data/lib/kestrel/client/transactional.rb

@@ -8,6 +8,13 @@ class Kestrel::Client::Transactional < Kestrel::Client::Proxy
   # there is no current open transaction
   class NoOpenTransaction < StandardError; end
 
+  # Raised when a retry fails when max retries is exceeded
+  class RetriesExceeded < StandardError
+    def initialize(job)
+      super "Max retries of #{job.retries} exceeded for item: #{job.job.inspect}"
+    end
+  end
+
   class RetryableJob < Struct.new(:retries, :job); end
 
   # Number of times to retry a job before giving up
@@ -94,10 +101,14 @@ class Kestrel::Client::Transactional < Kestrel::Client::Proxy
 
     job.retries += 1
 
-    client.set(current_queue + "_errors", job) if job.retries < @max_retries
-    close_last_transaction
+    if job.retries < @max_retries
+      client.set(current_queue + "_errors", job)
+    else
+      raise RetriesExceeded.new(job)
+    end
 
-    job.retries < @max_retries
+  ensure
+    close_last_transaction
   end
 
   private

data/spec/kestrel/client/transactional_spec.rb

@@ -83,7 +83,7 @@ describe "Kestrel::Client::Transactional" do
       get_job.should == :mcguffin
       @kestrel.current_try.should == Kestrel::Client::Transactional::DEFAULT_RETRIES
 
-      @kestrel.retry
+      lambda { @kestrel.retry }.should raise_error(Kestrel::Client::Transactional::RetriesExceeded)
       @kestrel.get(@queue) # simulate next get run
     end
   end
@@ -207,7 +207,7 @@ describe "Kestrel::Client::Transactional" do
         mock(@raw_kestrel_client).set(@queue + "_errors", anything).never
         mock(@raw_kestrel_client).get_from_last(@queue + "_errors/close")
         @kestrel.get(@queue)
-        @kestrel.retry.should be_false
+        lambda { @kestrel.retry }.should raise_error(Kestrel::Client::Transactional::RetriesExceeded)
       end
 
       it "closes an open transaction with no retries" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kestrel-client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -07:00
+date: 2010-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency