right_chimp 1.1.0 → 1.1.1

data/CHANGES

@@ -121,3 +121,7 @@ Version 1.0.9
 Version 1.1.0
 -------------
 * Feature: Add a job state called 'holding' where jobs can be held until the user queues them
+
+Version 1.1.1
+-------------
+* Bugfix: Enable timeouts on server arrays

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (1.0.7)
+    right_chimp (1.1.1)
       nokogiri (~> 1.5.9)
       progressbar (~> 0.11.0)
       rake (~> 0.9.2.2)
@@ -11,23 +11,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
-    highline (1.6.19)
-    i18n (0.6.1)
-    json (1.8.0)
-    mime-types (1.23)
-    multi_json (1.7.7)
-    net-ssh (2.6.7)
+    highline (1.6.20)
+    i18n (0.6.5)
+    json (1.8.1)
+    mime-types (2.0)
+    multi_json (1.8.2)
+    net-ssh (2.7.0)
     nokogiri (1.5.10)
     progressbar (0.11.0)
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rest_connection (1.0.10)
-      activesupport
+    rest_connection (1.0.11)
+      activesupport (< 4.0.0)
       highline
       json
       net-ssh

data/lib/right_chimp/Chimp.rb

@@ -652,6 +652,7 @@ module Chimp
               :exec => queue_executable,
               :inputs => @inputs,
               :template => queue_template,
+              :timeout => @timeout,
               :verbose => @@verbose,
               :quiet => @@quiet
             )

data/lib/right_chimp/exec/ExecArray.rb

@@ -8,11 +8,16 @@ module Chimp
         audit_entry = []
         options = @inputs
 
+        if @timeout < 300
+          Log.error "timeout was less than 5 minutes! resetting to 5 minutes"
+          @timeout = 300
+        end
+
         audit_entry = @array.run_script_on_instances(@exec, @server['href'], options)
 
         if audit_entry
           audit_entry.each do |a|
-            a.wait_for_completed
+            a.wait_for_completed("no audit link available",@timeout)
           end
         else
           Log.warn "No audit entries returned for job_id=#{@job_id}"

data/lib/right_chimp/exec/Executor.rb

@@ -6,9 +6,9 @@ module Chimp
   class Executor
     attr_accessor :server, :array, :exec, :inputs, :template, :owner, :group,
                   :job_id, :status, :dry_run, :verbose, :quiet, :timeout,
-                  :retry_count, :retry_sleep, :time_start, :time_end
+                  :retry_count, :retry_sleep, :time_start, :time_end, :error
     
-    attr_reader   :error, :results
+    attr_reader   :results
     
     STATUS_NONE =     :none
     STATUS_HOLDING =  :holding

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_connection