right_chimp 2.1.15 → 2.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28fe644c07a27aea21a4cd11a7b21223bda8159
-  data.tar.gz: 8e1c12689609f5424d40b3835d6f0c11d0f081dc
+  metadata.gz: b9005af94e19fd62dbd5336cf810c160fae7a201
+  data.tar.gz: 35be5f24c076f7b019df1ba91d5d9166143cb2c1
 SHA512:
-  metadata.gz: a3e7a74d5476dcfb2baefec3af913f834203118816e1ebfdb67fc736208e0bd5d0ccc365bed2782d2a9a86ebfa4c8367130119790efed28f4cd0778606313c50
-  data.tar.gz: 61e8b9ea7fd1363c3207890e8ca99f0b9be7189bd370ca0fc7f7e679d22ec3c91ece3c8f9f26e2737ac88095e5108dd5d3722cac8add253fbb6b1f77cdf156c0
+  metadata.gz: 21cca557f34763e5c50be7462be5c519b101f4ffd9599426188af4e74671f7a59bd0c520f943823d7bb2f28eab697fef2a4cbfa83fd53589d91850a8686bf74f
+  data.tar.gz: 51c6a7fe550bfe69e559124acbee9b23d6827d264325717e9af0404328f42db1df6e31121cc6ed03ba8d0375b7a99dd057811fbe03e9a5a5db792bc7119688d7

data/CHANGES

@@ -159,4 +159,12 @@ Version 2.1.13
 
 Version 2.1.15
 ---------------
-* Feature: We now are able to query a subset of job_uuids and total stats format. 
+* Feature: We now are able to query a subset of job_uuids and total stats format.
+
+Version 2.1.16
+--------------
+* Bugfix: chimp --wait-until-done now honors the noprompt flag.
+
+Version 2.1.17
+--------------
+* Bugfix: we now use 'safe_yaml' to prevent erroring out on a 422 response from the api.

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.15)
+    right_chimp (2.1.16)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)
       rake (~> 10.4.2)
       right_api_client (> 1.5)
+      safe_yaml
 
 GEM
   remote: https://rubygems.org/
   specs:
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.0)
+    coderay (1.1.1)
     debug_inspector (0.0.2)
     diff-lcs (1.1.3)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     highline (1.7.8)
     http-cookie (1.0.2)
@@ -29,7 +30,7 @@ GEM
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     progressbar (0.11.0)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -53,6 +54,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    safe_yaml (1.0.4)
     slop (3.6.0)
     unf (0.1.4)
       unf_ext
@@ -68,4 +70,4 @@ DEPENDENCIES
   rspec (~> 2.6.0)
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/chimp.gemspec

@@ -1,33 +1,32 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "right_chimp/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'right_chimp/version'
 
 Gem::Specification.new do |s|
-  s.name        = "right_chimp"
+  s.name        = 'right_chimp'
   s.license = 'MIT'
 
   s.version     = Chimp::VERSION
-  s.authors     = ["RightScale Operations"]
-  s.email       = ["ops@rightscale.com"]
-  s.homepage    = "https://github.com/rightscale/right_chimp"
-  s.summary     = %q{RightScale platform command-line tool}
-  s.description = %q{The Chimp is a tool for managing servers using the RightScale platform.}
-
-  # s.rubyforge_project = "chimp"
+  s.authors     = ['RightScale Operations']
+  s.email       = ['ops@rightscale.com']
+  s.homepage    = 'https://github.com/rightscale/right_chimp'
+  s.summary     = 'RightScale platform command-line tool'
+  s.description = 'The Chimp is a tool for managing servers using the RightScale platform.'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency "rake", "~> 10.4.2"
-  s.add_dependency "nokogiri", "~> 1.6.7.1"
-  s.add_dependency "progressbar", "~> 0.11.0"
-  s.add_dependency "right_api_client", "> 1.5"
-  s.add_dependency "highline", "~> 1.7.2"
+  s.add_dependency 'rake', '~> 10.4.2'
+  s.add_dependency 'nokogiri', '~> 1.6.7.1'
+  s.add_dependency 'progressbar', '~> 0.11.0'
+  s.add_dependency 'right_api_client', '> 1.5'
+  s.add_dependency 'highline', '~> 1.7.2'
+  s.add_dependency 'safe_yaml'
 
-  s.add_development_dependency "rspec", "~> 2.6.0"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "pry-stack_explorer"
+  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-stack_explorer'
 
 end

data/lib/right_chimp.rb

@@ -11,6 +11,7 @@ require 'rake'
 require 'progressbar'
 require 'json'
 require 'yaml'
+require 'safe_yaml'
 
 require 'highline/import'
 

data/lib/right_chimp/Chimp.rb

@@ -34,6 +34,7 @@ module Chimp
       @retry_count  = 0
       @hold         = false
       @timeout      = 900
+      @paused       = false
 
       @limit_start  = 0
       @limit_end    = 0
@@ -415,7 +416,7 @@ module Chimp
             when '--chimpd'
               @use_chimpd = true
               unless arg.empty?
-                if arg =~ /[\d]+\.[\d]+\.[\d]+\.[\d]+:[\d]+/ 
+                if arg =~ /[\d]+\.[\d]+\.[\d]+\.[\d]+:[\d]+/
                   @chimpd_host, @chimpd_port = arg.split(':')
                   @chimpd_port = @chimpd_port.to_i
                 else
@@ -991,12 +992,19 @@ module Chimp
       #
       # If no workers failed, then we're done.
       #
-      return true if failed_workers.empty?
-
+      if failed_workers.empty?
+        @paused = false
+        return "continue"
+      end
       #
       # Some workers failed; offer the user a chance to retry them
       #
-      verify("The following objects failed:", results_display, false)
+      verify("The following objects failed:", results_display, false) unless @paused
+
+      unless @prompt
+        @paused = true
+        return "pause"
+      end
 
       while true
         puts "(R)etry failed jobs"
@@ -1013,7 +1021,7 @@ module Chimp
         elsif command =~ /^r/i
           puts "Retrying..."
           ChimpQueue.instance.group[group].requeue_failed_jobs!
-          return false
+          return "retry"
         end
       end
     end
@@ -1183,12 +1191,16 @@ module Chimp
           end
 
           #
-          # If verify_results returns true, then ask chimpd to requeue all failed jobs.
+          # If verify_results returns false, then ask chimpd to requeue all failed jobs.
           #
-          if verify_results(@group)
+          case verify_results(@group)
+          when "continue"
             break
-          else
+          when "retry"
             ChimpDaemonClient.retry_group(@chimpd_host, @chimpd_port, @group)
+          when "pause"
+            @paused = true
+            #stuck in this loop until action is taken
           end
         end
       ensure

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.15"
+  VERSION = "2.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.17
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement