Merge pull request #88 from rightscale/OPS-3261_skip_interactive_prom…

…pts_in_non_interactive_scenarios OPS-3261 skip interactive prompt in automation
flexera-public · Aug 23, 2016 · 650cb38 · 650cb38
2 parents c7b5fb4 + f03636c
commit 650cb38
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -176,3 +176,7 @@ Version 2.1.20
 Version 2.1.21
 --------------
 * Bugfix: Pull the correct path whenever loading up the erb template in webui.
+
+Version 2.1.22
+--------------
+* Bugfix: use 'pause' behaviour if there are no contents in stdin
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.21)
+    right_chimp (2.1.22)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)

diff --git a/lib/right_chimp/Chimp.rb b/lib/right_chimp/Chimp.rb
@@ -1011,6 +1011,15 @@ def verify_results(group = :default)
         puts "(A)bort chimp run"
         puts "(I)gnore errors and continue"
         command = gets()
+        if command.nil?
+          #
+          # if command is nil, stdin is closed or its source ended
+          #  probably because we are in an automated environment,
+          #  then we pause like in '--no-prompt' scenario
+          #
+          puts 'Warning! stdin empty, using pause behaviour, use --no-prompt to avoid this message'
+          return 'pause'
+        end
 
         if command =~ /^a/i
           puts "Aborting!"

diff --git a/lib/right_chimp/version.rb b/lib/right_chimp/version.rb
@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.21"
+  VERSION = "2.1.22"
 end