(PDK-871) Relax dependencies on tty-* gems

lib/pdk/cli/exec.rb

@@ -2,12 +2,12 @@
 require 'childprocess'
 require 'English'
 require 'tempfile'
-require 'tty-spinner'
 require 'tty-which'
 
 require 'pdk/util'
 require 'pdk/util/git'
 require 'pdk/util/ruby_version'
+require 'pdk/cli/util/spinner'
 
 module PDK
   module CLI

lib/pdk/cli/exec/command.rb

@@ -2,12 +2,13 @@
 require 'childprocess'
 require 'English'
 require 'tempfile'
-require 'tty-spinner'
 require 'tty-which'
 
 require 'pdk/util'
 require 'pdk/util/git'
 require 'pdk/util/ruby_version'
+require 'pdk/cli/util/spinner'
+
 
 module PDK
   module CLI

lib/pdk/cli/exec_group.rb

@@ -1,7 +1,7 @@
-require 'tty-spinner'
 require 'tty-which'
 
 require 'pdk/util'
+require 'pdk/cli/util/spinner'
 
 module PDK
   module CLI

lib/pdk/cli/util/interview.rb

@@ -4,6 +4,8 @@ module PDK
   module CLI
     module Util
       class Interview < TTY::Prompt::AnswersCollector
+        READER = defined?(TTY::Reader) ? TTY::Reader : TTY::Prompt::Reader
+
         def pastel
           @pastel ||= Pastel.new
         end
@@ -60,7 +62,7 @@ def run
             @prompt.puts ''
           end
           @answers
-        rescue TTY::Prompt::Reader::InputInterrupt
+        rescue READER::InputInterrupt
           nil
         end
       end

lib/pdk/cli/util/spinner.rb

@@ -0,0 +1,13 @@
+require 'tty-spinner'
+
+require 'pdk/cli/util'
+
+# Replace the built-in tty check in tty-spinner with our own implementation
+# that allows us to mock the behaviour during acceptance tests.
+module TTY
+  class Spinner
+    def tty?
+      PDK::CLI::Util.interactive?
+    end
+  end
+end

pdk.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'minitar', '~> 0.6.1'
   spec.add_runtime_dependency 'net-ssh', '~> 4.2.0'
   spec.add_runtime_dependency 'pathspec', '~> 0.2.1'
-  spec.add_runtime_dependency 'tty-prompt', '0.13.1'
-  spec.add_runtime_dependency 'tty-spinner', '0.5.0'
-  spec.add_runtime_dependency 'tty-which', '0.3.0'
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.13'
+  spec.add_runtime_dependency 'tty-spinner', '~> 0.5'
+  spec.add_runtime_dependency 'tty-which', '~> 0.3'
 
   # Analytics dependencies
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.1.5'

spec/spec_helper.rb

@@ -95,3 +95,11 @@
     ]
   end
 end
+
+# Add method to StringIO needed for TTY::TestPrompt to work on tty-prompt >=
+# 0.19 (see https://github.com/piotrmurach/tty-prompt/issues/104)
+class StringIO
+  def wait_readable(*)
+    true
+  end
+end