better retry logic

lib/gizzard/commands.rb

@@ -41,16 +41,37 @@ def output(string)
       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
 

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