retryit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1aa72d40e7c8badd21382d2c3fd41ee6579b26
-  data.tar.gz: 2e9d14f94fec8bbf040b08c2fa462ed105ec6794
+  metadata.gz: af8eac7556a4bcd9b925a05bf1a28e3fa315dc53
+  data.tar.gz: 01eabeca7d901247988c8596236edae1ea819a09
 SHA512:
-  metadata.gz: 23ca9102779a73de3f60b3221021de7614d186305b0ec217f3ce85fde07b8774bc971f785d4b0d72d93075351f22539a19aa13d993cd94cea07b2094e5ed8124
-  data.tar.gz: dd75f23f180fe7aae37dbac236e7dbc05a01dcd62876af85e74e41344b7bfef7da2f53b105f9cd512a0a63cc5505f29482e0225ca80691a45671489fa842df6a
+  metadata.gz: b0b77b2c8329a1a419e5727fa3773788a477e5cd4655b30a5e193746b3f267d8f2c092b57bd6784d68242fb8204e4e710b4b07d387085c5be563a6b04bfe8dd5
+  data.tar.gz: 9b48898e4dfda35ab1b704798225f6b8d23699cf569915e4a0154ea0d508acc290c63048244e130d53899fb079aa0bd400e093e90fa633f14e735b1d483e99a0

data/README.md

@@ -15,8 +15,9 @@ Help:
 
 `retry -?`
 
-    Usage: retry [options] -e execute command
+    Usage: retry [options] [-f fail_script +commands] -e execute command
         -h, -?, --help
+        -f                               Execute fail script after all retries are exhausted
         -t, --tries=#                    Set max retries: Default 10
         -s, --sleep=secs                 Constant sleep amount (seconds)
         -m, --min=secs                   Exponenetial Backoff: minimum sleep amount (seconds): Default 0.3
@@ -24,6 +25,12 @@ Help:
 
 ### Examples
 
+No problem:
+
+`retry echo u work good`
+
+    u work good
+
 Test functionality:
 
 `retry 'echo "y u no work"; false'`
@@ -49,6 +56,7 @@ Test functionality:
     y u no work
     Before retry #10: sleeping 60.0 seconds
     y u no work
+    etc..
 
 Limit retries:
 
@@ -63,6 +71,7 @@ Limit retries:
     y u no work
     Before retry #4: sleeping 2.4 seconds
     y u no work
+    Retries exhausted
 
 Bad command:
 
@@ -70,6 +79,20 @@ Bad command:
 
     Command Failed: poop
 
+Fail command:
+
+`retry -t 3 -f echo "oh poopsickles" -e 'echo "y u no work"; false'`
+
+    y u no work
+    Before retry #1: sleeping 0.3 seconds
+    y u no work
+    Before retry #2: sleeping 0.6 seconds
+    y u no work
+    Before retry #3: sleeping 1.2 seconds
+    y u no work
+    Retries exhausted, running fail script
+    oh poopsickles
+
 ### License
 
 Apache 2.0 - go nuts

data/lib/retryit.rb

@@ -16,7 +16,7 @@ class RetryIt
     return if args.size < 1
 
     optparser = OptionParser.new do |opts|
-      opts.banner = "Usage: retry [options] -e execute command"
+      opts.banner = "Usage: retry [options] [-f fail_script +commands] -e execute command"
 
       opts.on("-h", "-?", "--help") do |v|
         puts opts
@@ -58,12 +58,24 @@ class RetryIt
       load_options(["-?"])
     end
 
-    idx = args.find_index("-e")
+    fail_command = nil
+
+    idx = args.find_index("-f") || args.find_index("-e")
     if !idx.nil?
       load_options(args[0...idx])
+      if (args[idx] == "-f")
+        e_idx = args.find_index("-e")
+        raise "fail script (-f) must be combined with execution script (-e)" if e_idx.nil?
+        raise "fail script not defined" if idx == e_idx
+        fail_command = args[(idx+1)..(e_idx-1)]
+        idx = e_idx
+      end
       args = args[(idx+1)..-1]
     end
 
+    #log_out("Run script #{args[0]} #{args[1..-1]}")
+    #log_out("Fail script #{fail_command[0]} #{fail_command[1..-1]}") unless fail_command.nil?
+
     raise "max_tries must be greater than 0" unless @max_tries > 0
     raise "minimum sleep cannot be greater than maximum sleep" unless @max_sleep >= @min_sleep
     raise "unknown execute command" unless args.size > 0
@@ -82,7 +94,16 @@ class RetryIt
       attempts += 1
     end
 
-    log_out("Command Failed: #{args[0]}") if success.nil?
+    if success.nil?
+      log_out("Command Failed: #{args[0]}")
+    elsif attempts > @max_tries
+      if !fail_command.nil?
+        log_out("Retries exhausted, running fail script")
+        system(fail_command[0], *fail_command[1..-1])
+      else
+        log_out("Retries exhausted")
+      end
+    end
     exit process.exitstatus
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retryit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Neville Kadwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies: []
 description: General purpose retry cli program for anything
 email: