bolt 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66234162abaa83dd3dd590b21dd87a54d10c3da44f0d50ccd8e28d82ddf76178
-  data.tar.gz: b056cb53e8fda46db48b7a7a1b63f8441f80342e11e5c0a7c50d1813cf852bbc
+  metadata.gz: bfc3f29c5078b142ebcebf3b104d0b8c1deb2357c319f1de58c270062c7db68c
+  data.tar.gz: '083d0c5d89a44757eb875c92d88e4378ea1922921aad4a225f8dda2b3e1cb0d5'
 SHA512:
-  metadata.gz: '079515ce4801e6913e2b75d276289985cf9eda0d9b60c10021a5b435c77ce69d0cc07d5a1708a4f7c43db4947fef918f5d14b8ccac8fdf6a55b5ccf5fce6cf62'
-  data.tar.gz: 94eba8ff4a83d463f4b5516eb69cd83d31b1fdc6c3673a0b0beda9ac5dc08becd9eb2d75953932c57345ab8099900884174df329d04f43637802df73a538a365
+  metadata.gz: f380074432d77f88c782dd725bc6f835c707de52266fb1c030a0b7490fd06af98b984d6f42bd1a02fde367d573ebf25a7fb1dfe6c5c643f613b8336444fb3f8e
+  data.tar.gz: 70b9128e64a00ee9efab71ad69937b61fcd5ed54c6ee787054942e3b3fd16060e7dd34c23ab10e50b0c02969cc7b8a47f2fc0c25a65a0911144887baf4456fc3

data/lib/bolt/transport/base.rb

@@ -95,15 +95,6 @@ module Bolt
         interpreters[Pathname(executable).extname] if interpreters
       end
 
-      def reject_transport_options(target, options)
-        if target.options['run-as']
-          options.reject { |k, _v| k == '_run_as' }
-        else
-          options
-        end
-      end
-      private :reject_transport_options
-
       # Transform a parameter map to an environment variable map, with parameter names prefixed
       # with 'PT_' and values transformed to JSON unless they're strings.
       def envify_params(params)
@@ -135,7 +126,7 @@ module Bolt
         target = targets.first
         with_events(target, callback) do
           @logger.debug { "Running task run '#{task}' on #{target.uri}" }
-          run_task(target, task, arguments, reject_transport_options(target, options))
+          run_task(target, task, arguments, options)
         end
       end
 
@@ -149,7 +140,7 @@ module Bolt
         target = targets.first
         with_events(target, callback) do
           @logger.debug("Running command '#{command}' on #{target.uri}")
-          run_command(target, command, reject_transport_options(target, options))
+          run_command(target, command, options)
         end
       end
 
@@ -163,7 +154,7 @@ module Bolt
         target = targets.first
         with_events(target, callback) do
           @logger.debug { "Running script '#{script}' on #{target.uri}" }
-          run_script(target, script, arguments, reject_transport_options(target, options))
+          run_script(target, script, arguments, options)
         end
       end
 
@@ -177,7 +168,7 @@ module Bolt
         target = targets.first
         with_events(target, callback) do
           @logger.debug { "Uploading: '#{source}' to #{destination} on #{target.uri}" }
-          upload(target, source, destination, reject_transport_options(target, options))
+          upload(target, source, destination, options)
         end
       end
 

data/lib/bolt/transport/ssh.rb

@@ -142,6 +142,7 @@ module Bolt
             stdin, output = nil
             command = []
             execute_options = {}
+            execute_options[:interpreter] = select_interpreter(executable, target.options['interpreters'])
 
             conn.with_remote_tempdir do |dir|
               if extra_files.empty?
@@ -167,7 +168,9 @@ module Bolt
               end
 
               if conn.run_as && stdin
-                wrapper = make_wrapper_stringio(remote_task_path, stdin)
+                # Inject interpreter in to wrapper script and remove from execute options
+                wrapper = make_wrapper_stringio(remote_task_path, stdin, execute_options[:interpreter])
+                execute_options.delete(:interpreter)
                 remote_wrapper_path = conn.write_remote_executable(dir, wrapper, 'wrapper.sh')
                 command << remote_wrapper_path
               else
@@ -177,7 +180,6 @@ module Bolt
               dir.chown(conn.run_as)
 
               execute_options[:sudoable] = true if conn.run_as
-              execute_options[:interpreter] = select_interpreter(executable, target.options['interpreters'])
               output = conn.execute(command, execute_options)
             end
             Bolt::Result.for_task(target, output.stdout.string,
@@ -187,13 +189,22 @@ module Bolt
         end
       end
 
-      def make_wrapper_stringio(task_path, stdin)
-        StringIO.new(<<-SCRIPT)
+      def make_wrapper_stringio(task_path, stdin, interpreter = nil)
+        if interpreter
+          StringIO.new(<<-SCRIPT)
+#!/bin/sh
+'#{interpreter}' '#{task_path}' <<'EOF'
+#{stdin}
+EOF
+SCRIPT
+        else
+          StringIO.new(<<-SCRIPT)
 #!/bin/sh
 '#{task_path}' <<'EOF'
 #{stdin}
 EOF
 SCRIPT
+        end
       end
 
       def connected?(target)

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '1.13.0'
+  VERSION = '1.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: ruby_smb
   requirement: !ruby/object:Gem::Requirement