gizzmo 0.9.0 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/gizzmo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-11-02}
   s.default_executable = %q{gizzmo}
   s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
   s.email = %q{kmaxwell@twitter.com}

data/lib/gizzard/commands.rb

@@ -41,16 +41,37 @@ module Gizzard
       end
     end
   end
+  
+  class RetryProxy
+    def initialize(retries, object)
+      @inner = object
+      @retries_left = retries
+    end
+    
+    def method_missing(*args)
+      @inner.send(*args)
+    rescue
+      if @retries_left > 0
+        @retries_left -= 1
+        STDERR.puts "Retrying..."
+        method_missing(*args)
+      else
+        raise
+      end
+    end
+  end
 
   class ShardCommand < Command
     def self.make_service(global_options, log)
-      Gizzard::Thrift::ShardManager.new(global_options.host, global_options.port, log, global_options.dry)
+      RetryProxy.new global_options.retry.to_i, 
+        Gizzard::Thrift::ShardManager.new(global_options.host, global_options.port, log, global_options.dry)
     end
   end
 
   class JobCommand < Command
     def self.make_service(global_options, log)
-      Gizzard::Thrift::JobManager.new(global_options.host, global_options.port + 2, log, global_options.dry)
+      RetryProxy.new global_options.retry.to_i  ,
+        Gizzard::Thrift::JobManager.new(global_options.host, global_options.port + 2, log, global_options.dry)
     end
   end
 

data/lib/gizzmo.rb

@@ -370,21 +370,9 @@ def custom_timeout(seconds)
   end
 end
 
-tries_left = global_options.retry.to_i + 1
-begin
-  while (tries_left -= 1) >= 0
-    begin
-      custom_timeout(global_options.timeout) do
-        Gizzard::Command.run(subcommand_name, global_options, argv, subcommand_options, log)
-      end
-      break
-    rescue
-      if tries_left > 0
-        STDERR.puts "Retrying..."
-      else
-        raise
-      end
-    end
+begin      
+  custom_timeout(global_options.timeout) do
+    Gizzard::Command.run(subcommand_name, global_options, argv, subcommand_options, log)
   end
 rescue HelpNeededError => e
   if e.class.name != e.message

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-02 00:00:00 -07:00
 default_executable: gizzmo
 dependencies: []