ironfan 4.9.8 → 4.9.9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.9.9
+* further fixes to tell_you_thrice, noted need for specs
+
 # v4.9.8
 * fixing rescue block in tell_you_thrice
 

data/VERSION

@@ -1 +1 @@
-4.9.8
+4.9.9

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.9.8"
+  s.version = "4.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-04-17"
+  s.date = "2013-04-18"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan.rb

@@ -144,9 +144,12 @@ module Ironfan
   #
   # Utility to retry a flaky operation three times, with ascending wait times
   #
+  # FIXME: Add specs to test the rescue here. It's a PITA to debug naturally or 
+  # 
+  # Manual test:
+  # bundle exec ruby -e "require 'chef'; require 'ironfan'; Ironfan.tell_you_thrice { p 'hah'; raise 'hell' }"
   def self.tell_you_thrice(options={})
     options = { name:           "problem",
-                problem:        nil,
                 error_class:    StandardError,
                 retries:        3,
                 multiplier:     3 }.merge!(options)
@@ -154,15 +157,12 @@ module Ironfan
     message = ''
 
     begin
+      try += 1
       yield
     rescue options[:error_class] => err
-      raise if try > retries
-      try += 1
-      pause_for = multiplier * try
-      message += "#{problem}, " unless problem.nil?
-      message += "sleeping #{pause_for} seconds"
-      Ironfan.step(name, message, :gray)
-      Chef::Log.debug "Error was #{err.inspect}"
+      raise unless try < options[:retries]
+      pause_for = options[:multiplier] * try
+      Chef::Log.debug "Caught error (was #{err.inspect}). Sleeping #{pause_for} seconds."
       sleep pause_for
       retry
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.9.8
+  version: 4.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 743785728479819122
+      hash: 1492496330454923424
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: