Skip to content

Commit

Permalink
Merge pull request #91 from rightscale/OPS-3261_skip_interactive_prom…
Browse files Browse the repository at this point in the history
…pts_in_non_interactive_scenarios

OPS-3261 don't show retry/abort/ignore prompt on pause mode
  • Loading branch information
Marc committed Aug 25, 2016
2 parents 3b6a849 + 748ee47 commit caabeea
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,7 @@ Version 2.1.21
Version 2.1.22
--------------
* Bugfix: use 'pause' behaviour if there are no contents in stdin

Version 2.1.22.1
--------------
* Bugfix: don't show retry/abort/ignore prompt in 'pause' mode
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
right_chimp (2.1.22)
right_chimp (2.1.22.1)
highline (~> 1.7.2)
nokogiri (~> 1.6.7.1)
progressbar (~> 0.11.0)
Expand Down
3 changes: 2 additions & 1 deletion lib/right_chimp/Chimp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ def verify_results(group = :default)
#
verify("The following objects failed:", results_display, false) unless @paused

unless @prompt
if !@prompt || @paused
@paused = true
return "pause"
end
Expand All @@ -1018,6 +1018,7 @@ def verify_results(group = :default)
# then we pause like in '--no-prompt' scenario
#
puts 'Warning! stdin empty, using pause behaviour, use --no-prompt to avoid this message'
@paused = true
return 'pause'
end

Expand Down
2 changes: 1 addition & 1 deletion lib/right_chimp/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Chimp
VERSION = "2.1.22"
VERSION = "2.1.22.1"
end

0 comments on commit caabeea

Please sign in to comment.