opswalrus 1.0.43 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c95b5c18a56463ccb9dd8db68875978eb57e3e5311a73825e27b1c893486d1ec
-  data.tar.gz: '05889e0f2398083e580406575914265488eb97ce98db67aeac92536dc6bc1294'
+  metadata.gz: ab0f69f8661c6d29f48d0ad70f4046b6d53a3dbe167958668e09005b2086f175
+  data.tar.gz: 5159cfc4bb7cb0ed366b9f3197d3926c77bd22a6482f2a376c9f6baf4fb36238
 SHA512:
-  metadata.gz: 8147ed4fa64cdd0c8125ef6c885fac72075fe4e211e8b31275b7961689d370f44ea10cde45f83df352e35dab4d06c1a4cadd063286bb34d9d29312f8a943213c
-  data.tar.gz: fdb7a00079382392fc1631f85a64f8939936e9731586fed8c9a63c42557f59540665889376f4e2deec382c08c39d32bab52ce9e62dabbfd50eba87bd1d1397be
+  metadata.gz: 445960c704e60c61b49a54eb3ea9950fda2f8b0c124bb7d7876849a5d9985fc3eeba80d907d6fb0a90305eff6139bfde886756bdf5dc2d43b04685191dd872ad
+  data.tar.gz: c78e9d383c7f9351d47b67b92664d5e407344ed305fc78bc15fb74829a68033c7d0f754c8f1e5d26ab06d61325a6ba9a09d7f9324d5676ec08008dd9b6d497d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.43)
+    opswalrus (1.0.45)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)
       citrus (~> 3.0)

data/build.ops

@@ -53,6 +53,6 @@ if bw_status_json['status'] != 'unlocked'
 end
 
 totp = sh("Get Rubygems OTP") { 'bw get totp Rubygems' }
-sh("Push gem", input: {"You have enabled multi-factor authentication. Please enter OTP code." => "#{totp}\n"}) { 'gem push opswalrus-{{ version }}.gem' }
+sh("Push gem", input: {/You have enabled multi-factor authentication. Please enter OTP code./ => "#{totp}\n"}) { 'gem push opswalrus-{{ version }}.gem' }
 sh("Build docker image") { 'docker build -t ghcr.io/opswalrus/ops:latest -t ghcr.io/opswalrus/ops:{{ version }} -t opswalrus/ops:latest -t opswalrus/ops:{{ version }} .' }
 sh("Push docker image to ghcr.io/opswalrus/ops") { 'docker push ghcr.io/opswalrus/ops:latest' }

data/lib/opswalrus/host.rb

@@ -427,7 +427,7 @@ module OpsWalrus
       sudo_password_args = {}
       sudo_password_args[:sudo_password] = ssh_password unless ops_prompt_for_sudo_password
       sudo_password_args[:ops_sudo_password] = ssh_password if ops_prompt_for_sudo_password
-      @runtime_env.handle_input(input_mapping, **sudo_password_args) do |interaction_handler|
+      @runtime_env.handle_input(input_mapping, **sudo_password_args, inherit_existing_mappings: false) do |interaction_handler|
         # @sshkit_backend.capture(*args, interaction_handler: interaction_handler, verbosity: SSHKit.config.output_verbosity)
         App.instance.debug("Host#execute_cmd(#{args.inspect}) with input mappings #{interaction_handler.input_mappings.inspect} given sudo_password_args: #{sudo_password_args.inspect})")
         @sshkit_backend.capture(*args, interaction_handler: interaction_handler)
@@ -443,7 +443,7 @@ module OpsWalrus
       sudo_password_args = {}
       sudo_password_args[:sudo_password] = ssh_password unless ops_prompt_for_sudo_password
       sudo_password_args[:ops_sudo_password] = ssh_password if ops_prompt_for_sudo_password
-      @runtime_env.handle_input(input_mapping, **sudo_password_args) do |interaction_handler|
+      @runtime_env.handle_input(input_mapping, **sudo_password_args, inherit_existing_mappings: false) do |interaction_handler|
         App.instance.debug("Host#execute_cmd(#{args.inspect}) with input mappings #{interaction_handler.input_mappings.inspect} given sudo_password_args: #{sudo_password_args.inspect})")
         @sshkit_backend.execute_cmd(*args, interaction_handler: interaction_handler)
       end

data/lib/opswalrus/interaction_handlers.rb

@@ -33,7 +33,7 @@ module OpsWalrus
     # when the given block returns, then the temporary mapping is removed from the interaction handler
     #
     # mapping : Hash[ String | Regex => String ] | Nil
-    def with_mapping(mapping = nil, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: false)
+    def with_mapping(mapping = nil, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true)
       new_mapping = inherit_existing_mappings ? @input_mappings : {}
 
       if mapping

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -264,9 +264,10 @@ module OpsWalrus
       out, err, exit_status = if App.instance.dry_run?
         ["", "", 0]
       else
-        sshkit_cmd = @runtime_env.handle_input(input) do |interaction_handler|
+        sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true) do |interaction_handler|
           # self is a Module instance that is serving as the evaluation context in an instance of a subclass of an Invocation; see Invocation#evaluate
           # backend.execute_cmd(cmd, interaction_handler: interaction_handler, verbosity: SSHKit.config.output_verbosity)
+          App.instance.debug("OpsFileScriptDSL#shell! cmd=#{cmd} with input mappings #{interaction_handler.input_mappings.inspect} given input: #{input.inspect})")
           backend.execute_cmd(cmd, interaction_handler: interaction_handler)
         end
         [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]

data/lib/opswalrus/runtime_environment.rb

@@ -258,7 +258,7 @@ module OpsWalrus
 
     # input_mapping : Hash[ String | Regex => String ]
     # sudo_password : String
-    def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: false, &block)
+    def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, &block)
       @interaction_handler.with_mapping(
         input_mapping,
         sudo_password: sudo_password,

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.43"
+  VERSION = "1.0.45"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.45
 platform: ruby
 authors:
 - David Ellis