right_chimp 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ed40eaf076ab7641a5a8d8fae25363bfb58428
-  data.tar.gz: 55957f53d165514a7ce2c205f5c2fd8633f54fad
+  metadata.gz: e7af2f093be4858573827cdf6ec385ddc54e1f06
+  data.tar.gz: 595742deb978554cf377a4725ddc47cef94f4eac
 SHA512:
-  metadata.gz: 37e0b3980f158a0e0ef59ca1bb7ee808508e56c1d1e70b0ce31999e1fd16e3b37a4104c5fd09f5669290d8925d108be9be50fbc3f48a6b91656ebd1595e012b3
-  data.tar.gz: 08363318bf8ea6bda61ae086f9d132f55f7eb41c4751c62140c610d5b8971f5deb5d36c360ba99b0aa882c088294c2f20e6a21c2cbbc4e4332f4207ffb0590cc
+  metadata.gz: 9da4371d7ee3f666985c280ede3372f5a83b43c30af3f1df373077ed790a1b4c91dae15ae490818858c1aee118023c125f069ab7d887a53cb2001c067585600f
+  data.tar.gz: b080b64e7c69eaf648413e9a518951a66b2a711b7d8281ef696a965de4d388c365d374d22246fb1efb53023dd4f26587eb47d437d7148b5c55ebece30d902f33

data/CHANGES

@@ -1,3 +1,8 @@
+Version 2.2.2
+-------------
+* Feature: Now compatible with RightLink10 task states.
+* Bugfix: Fixes standalone retry execution. 
+
 Version 2.2
 --------------
 * Feature: Starting to add proper specs that do not rely on actual-real executions.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.2.1)
+    right_chimp (2.2.2)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)

data/lib/right_chimp/chimp.rb

@@ -1059,7 +1059,7 @@ module Chimp
         elsif command =~ /^r/i
           puts "Retrying..."
           ChimpQueue.instance.group[group].requeue_failed_jobs!
-          return "retry"
+          return 'retry'
         end
       end
     end
@@ -1112,6 +1112,8 @@ module Chimp
 
         if @interactive and @verify
           done = verify_results(@group)
+          # a retry means we are not done yet.
+          done = false if done == 'retry'
         else
           done = true
         end
@@ -1122,7 +1124,7 @@ module Chimp
         exit 1 if failed_workers.size > 0
       end
 
-      puts "chimp run complete"
+      puts 'chimp run complete'
     end
 
     #

data/lib/right_chimp/resources/task.rb

@@ -6,45 +6,47 @@ module Chimp
   # This class allows to check on the status of any of the tasks created.
   #
   class Task
-
     attr_writer :tasker
     attr_reader :tasker
 
-    def wait_for_state(desired_state, timeout=900)
-      while(timeout > 0)
-        state=self.tasker.show.summary
-        return true if self.state.match(desired_state)
+    def wait_for_state(desired_state, timeout = 900)
+      while timeout > 0
+        # Make compatible with RL10.
+        state = tasker.show.summary.downcase
+        return true if state.match(desired_state)
         friendly_url = Connection.audit_url + '/audit_entries/'
-        friendly_url += self.href.split(/\//).last
+        friendly_url += href.split(/\//).last
         friendly_url = friendly_url.gsub('ae-', '')
-        raise "FATAL error, #{tasker.show.summary}\n\n Audit: #{friendly_url}\n " if self.state.match("failed")
+        if state.match('failed') || state.match('aborted')
+          raise "FATAL error, #{tasker.show.summary}\n\n Audit: #{friendly_url}\n "
+        end
         sleep 30
         timeout -= 30
       end
       raise "FATAL: Timeout waiting for Executable to complete.  State was #{self.state}" if timeout <= 0
     end
 
-    def wait_for_completed(timeout=900)
+    def wait_for_completed(timeout = 900)
       wait_for_state('completed', timeout)
     end
 
     def state
-      self.tasker.show.summary
+      tasker.show.summary
     end
 
     def href
-      self.tasker.href
+      tasker.href
     end
 
     def friendly_url
-      friendly_url = Connection.audit_url+"/audit_entries/"
-      friendly_url += self.href.split(/\//).last
-      friendly_url = friendly_url.gsub("ae-","")
+      friendly_url = Connection.audit_url + '/audit_entries/'
+      friendly_url += href.split(/\//).last
+      friendly_url = friendly_url.gsub('ae-', '')
       friendly_url
     end
 
     def details
-      self.tasker.show(:view => "extended").detail
+      tasker.show(view: 'extended').detail
     end
   end
 end

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake