tomo 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfaf239a0381aeb001061664581633beaed57f0dd70afb00f46c059917404941
-  data.tar.gz: 90091440ac547e2d1d72f14abea0108b42fad6a96a393dca9375a44bcb4d0558
+  metadata.gz: 24569b9d203580630d124df5ed6d5f42c4c5c8a8d7c2c9e6c2844abb662f03fb
+  data.tar.gz: f154292556548e3dab819e4fdd3e57395f4ebd0fef3ad17cf291689ea848aee8
 SHA512:
-  metadata.gz: 395f0de0988086e308c786b6a0de6ef7b6915966a4fda2398b1b5fe378e055768cbf3e884154cf5fccd350355c228ca78fba1cd13323560c35f6f27a85083a0b
-  data.tar.gz: 26e2966999b8fd0049e5a073ed2f6f504df0be16edd587ef4fb9376427d66ea31d5a5afdece8cfaf7910b4c204f31d6ef4d590db715b8342dd3aeb33b76cf824
+  metadata.gz: 4e6ded002068ec55394a73e0799e5c1d0f4ae68b1c549cfe438f7ff665d003d9a9d102f3b10cb8515e47013117f38a076c373c9f74cb21735524887be6a21c65
+  data.tar.gz: ab85142a4744db02d8a0e5be818175e292531dfaef14626c35e9c0e9dc36793330e5c44b9e12cf3769c36c1b0087f5571a89f5c5ec010defcef9561b64ec57b8

data/lib/tomo/console.rb

@@ -5,6 +5,7 @@ module Tomo
   class Console
     autoload :KeyReader, "tomo/console/key_reader"
     autoload :Menu, "tomo/console/menu"
+    autoload :NonInteractiveError, "tomo/console/non_interactive_error"
 
     class << self
       extend Forwardable
@@ -46,14 +47,13 @@ module Tomo
     CI_VARS = %w[
       JENKINS_HOME
       JENKINS_URL
+      GITHUB_ACTION
       TRAVIS
       CIRCLECI
-      CI
       TEAMCITY_VERSION
-      GO_PIPELINE_NAME
       bamboo_buildKey
       GITLAB_CI
-      XCS
+      CI
     ].freeze
     private_constant :CI_VARS
 
@@ -66,13 +66,10 @@ module Tomo
     end
 
     def raise_non_interactive
-      raise "An interactive console is required" unless ci?
-
-      env_var = (env.keys & CI_VARS).first
-      raise <<~ERROR
-        This appears to be a CI environment because the #{env_var} env var is set.
-        Tomo::Console cannot be used in a non-interactive CI environment.
-      ERROR
+      NonInteractiveError.raise_with(
+        task: Runtime::Current.task,
+        ci_var: (env.keys & CI_VARS).first
+      )
     end
   end
 end

data/lib/tomo/console/non_interactive_error.rb

@@ -0,0 +1,27 @@
+module Tomo
+  class Console
+    class NonInteractiveError < Tomo::Error
+      attr_accessor :task, :ci_var
+
+      def to_console
+        error = ""
+        error << "#{operation_name} requires an interactive console."
+        error << "\n\n#{seems_like_ci}" if ci_var
+        error
+      end
+
+      private
+
+      def seems_like_ci
+        <<~ERROR
+          This appears to be a non-interactive CI environment because the
+          #{yellow(ci_var)} environment variable is set.
+        ERROR
+      end
+
+      def operation_name
+        task ? "The #{yellow(task)} task" : "Tomo::Console"
+      end
+    end
+  end
+end

data/lib/tomo/plugin/env/tasks.rb

@@ -14,6 +14,7 @@ module Tomo::Plugin::Env
       modify_bashrc
     end
 
+    # rubocop:disable Metrics/MethodLength
     def update
       return if settings[:env_vars].empty?
 
@@ -21,11 +22,15 @@ module Tomo::Plugin::Env
         settings[:env_vars].each do |name, value|
           next if value == :prompt && contains_entry?(env, name)
 
-          value = prompt_for(name) if value == :prompt
+          value = prompt_for(name, message: <<~MSG) if value == :prompt
+            The remote host needs a value for the $#{name} environment variable.
+            Please provide a value at the prompt.
+          MSG
           replace_entry(env, name, value)
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def set
       return if settings[:run_args].empty?
@@ -88,11 +93,12 @@ module Tomo::Plugin::Env
       text.match?(/^export #{Regexp.quote(name.to_s.shellescape)}=/)
     end
 
-    def prompt_for(name)
+    def prompt_for(name, message: nil)
       synchronize do
         @answers ||= {}
         next @answers[name] if @answers.key?(name)
 
+        logger.info(message) if message
         @answers[name] = Tomo::Console.prompt("#{name}? ")
       end
     end

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.17.0".freeze
+  VERSION = "0.18.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.79.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
 - lib/tomo/console.rb
 - lib/tomo/console/key_reader.rb
 - lib/tomo/console/menu.rb
+- lib/tomo/console/non_interactive_error.rb
 - lib/tomo/error.rb
 - lib/tomo/error/suggestions.rb
 - lib/tomo/host.rb