bolt 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1bb84782f71c0faea509d91746ce03e9749432
-  data.tar.gz: 636871a24286b9ca256ffd8c3e31c3224a20ea97
+  metadata.gz: 6a4e9a05003d30c06467737a20e98334060a3954
+  data.tar.gz: ed19ba7afaab8ea3ff68b2dd5f53bc2830e7b6db
 SHA512:
-  metadata.gz: bede0c32f199f41154a2223f74e83c9c7e62a6ea32edadd0850db0bc6faa655603126750e949b1ee2a9192186c527ba3a848205688568bbfcf1bdcb7eab45129
-  data.tar.gz: b008ffcdd129e7b785a0d93cdb4c37b128d3ab28be930fd7f9e8e5fa40ac5b4250c094be60a2ba12117806c9194029298b6d89df638cc6e945585d9b9b523e0d
+  metadata.gz: 6836a6e4a272e4a95e3152b011cfc49af3fd1cc290eaf5660b241b5e2a96784d8b80e0b7c6dcd1ac3bca0452e9b53e10ffe1b1db2b7c9398f34f762f1a50585f
+  data.tar.gz: deb82053d48301c05eb9c51eda38232e8baf9f211c720d45c657b91cedf0cce3fdd8fab0cfd3e957ee667e7b18461a4033925b3e3f7fe3a0ba92f6bf460d833d

data/lib/bolt/cli.rb

@@ -100,7 +100,6 @@ HELP
                  'plan'    => %w[show run],
                  'file'    => %w[upload] }.freeze
     TRANSPORTS = %w[ssh winrm pcp].freeze
-    BOLTLIB_PATH = File.join(__FILE__, '../../../modules')
 
     attr_reader :parser, :config
     attr_accessor :options

data/lib/bolt/pal.rb

@@ -3,7 +3,7 @@ require 'bolt/error'
 
 module Bolt
   class PAL
-    BOLTLIB_PATH = File.join(__FILE__, '../../../modules')
+    BOLTLIB_PATH = File.join(__FILE__, '../../../bolt-modules')
 
     def initialize(config)
       # Nothing works without initialized this global state. Reinitializing

data/lib/bolt/transport/base.rb

@@ -42,12 +42,15 @@ module Bolt
 
       def with_events(target, callback)
         callback.call(type: :node_start, target: target) if callback
-        result = yield
-        @logger.debug("Result on #{target.uri}: #{JSON.dump(result.value)}")
+
+        result = begin
+          yield
+        rescue StandardError => ex
+          Bolt::Result.from_exception(target, ex)
+        end
+
         callback.call(type: :node_result, result: result) if callback
         result
-      rescue StandardError => ex
-        Bolt::Result.from_exception(target, ex)
       end
 
       def filter_options(target, options)

data/lib/bolt/transport/ssh.rb

@@ -44,7 +44,7 @@ module Bolt
               conn.write_remote_file(source, tmpfile)
               # pass over file ownership if we're using run-as to be a different user
               dir.chown(conn.run_as)
-              result = conn.execute("mv '#{tmpfile}' '#{destination}'", sudoable: true)
+              result = conn.execute(['mv', tmpfile, destination], sudoable: true)
               if result.exit_code != 0
                 message = "Could not move temporary file '#{tmpfile}' to #{destination}: #{result.stderr.string}"
                 raise Bolt::Node::FileError.new(message, 'MV_ERROR')
@@ -70,7 +70,7 @@ module Bolt
             conn.with_remote_tempdir do |dir|
               remote_path = conn.write_remote_executable(dir, script)
               dir.chown(conn.run_as)
-              output = conn.execute("'#{remote_path}' #{Shellwords.join(arguments)}", sudoable: true)
+              output = conn.execute([remote_path, *arguments], sudoable: true)
               Bolt::Result.for_command(target, output.stdout.string, output.stderr.string, output.exit_code)
             end
           end
@@ -81,31 +81,30 @@ module Bolt
         input_method = task.input_method
         with_connection(target) do |conn|
           conn.running_as(options['_run_as']) do
-            export_args = {}
             stdin, output = nil
 
+            command = []
+            execute_options = {}
+
             if STDIN_METHODS.include?(input_method)
               stdin = JSON.dump(arguments)
             end
 
             if ENVIRONMENT_METHODS.include?(input_method)
-              export_args = arguments.map do |env, val|
-                "PT_#{env}='#{val}'"
-              end.join(' ')
+              environment = arguments.inject({}) do |env, (param, val)|
+                env.merge("PT_#{param}" => val)
+              end
+              execute_options[:environment] = environment
             end
 
-            command = export_args.empty? ? '' : "#{export_args} "
-
-            execute_options = {}
-
             conn.with_remote_tempdir do |dir|
               remote_task_path = conn.write_remote_executable(dir, task.executable)
               if conn.run_as && stdin
                 wrapper = make_wrapper_stringio(remote_task_path, stdin)
                 remote_wrapper_path = conn.write_remote_executable(dir, wrapper, 'wrapper.sh')
-                command += "'#{remote_wrapper_path}'"
+                command << remote_wrapper_path
               else
-                command += "'#{remote_task_path}'"
+                command << remote_task_path
                 execute_options[:stdin] = stdin
               end
               dir.chown(conn.run_as)

data/lib/bolt/transport/ssh/connection.rb

@@ -1,4 +1,5 @@
 require 'logging'
+require 'shellwords'
 require 'bolt/node/errors'
 require 'bolt/node/output'
 
@@ -22,7 +23,7 @@ module Bolt
             return if owner.nil? || owner == @owner
 
             @owner = owner
-            result = @node.execute("chown -R '#{@owner}': '#{@path}'", sudoable: true, run_as: 'root')
+            result = @node.execute(['chown', '-R', "#{@owner}:", @path], sudoable: true, run_as: 'root')
             if result.exit_code != 0
               message = "Could not change owner of '#{@path}' to #{@owner}: #{result.stderr.string}"
               raise Bolt::Node::FileError.new(message, 'CHOWN_ERROR')
@@ -30,7 +31,7 @@ module Bolt
           end
 
           def delete
-            result = @node.execute("rm -rf '#{@path}'", sudoable: true, run_as: @owner)
+            result = @node.execute(['rm', '-rf', @path], sudoable: true, run_as: @owner)
             if result.exit_code != 0
               @logger.warn("Failed to clean up tempdir '#{@path}': #{result.stderr.string}")
             end
@@ -175,20 +176,32 @@ module Bolt
           result_output = Bolt::Node::Output.new
           run_as = options[:run_as] || self.run_as
           use_sudo = sudoable && run_as && @user != run_as
+
+          command_str = command.is_a?(String) ? command : Shellwords.shelljoin(command)
           if use_sudo
-            command = "sudo -S -u #{run_as} -p '#{sudo_prompt}' #{command}"
+            sudo_str = Shellwords.shelljoin(["sudo", "-S", "-u", run_as, "-p", sudo_prompt])
+            command_str = "#{sudo_str} #{command_str}"
+          end
+
+          # Including the environment declarations in the shelljoin will escape
+          # the = sign, so we have to handle them separately.
+          if options[:environment]
+            env_decls = options[:environment].map do |env, val|
+              "#{env}=#{Shellwords.shellescape(val)}"
+            end
+            command_str = "#{env_decls.join(' ')} #{command_str}"
           end
 
-          @logger.debug { "Executing: #{command}" }
+          @logger.debug { "Executing: #{command_str}" }
 
           session_channel = @session.open_channel do |channel|
             # Request a pseudo tty
             channel.request_pty if target.options[:tty]
 
-            channel.exec(command) do |_, success|
+            channel.exec(command_str) do |_, success|
               unless success
                 raise Bolt::Node::ConnectError.new(
-                  "Could not execute command: #{command.inspect}",
+                  "Could not execute command: #{command_str.inspect}",
                   'EXEC_ERROR'
                 )
               end
@@ -236,9 +249,9 @@ module Bolt
         def make_tempdir
           if target.options[:tmpdir]
             tmppath = "#{target.options[:tmpdir]}/#{SecureRandom.uuid}"
-            command = "mkdir -m 700 #{tmppath}"
+            command = ['mkdir', '-m', 700, tmppath]
           else
-            command = 'mktemp -d'
+            command = ['mktemp', '-d']
           end
           result = execute(command)
           if result.exit_code != 0
@@ -266,7 +279,7 @@ module Bolt
         end
 
         def make_executable(path)
-          result = execute("chmod u+x '#{path}'")
+          result = execute(['chmod', 'u+x', path])
           if result.exit_code != 0
             message = "Could not make file '#{path}' executable: #{result.stderr.string}"
             raise Bolt::Node::FileError.new(message, 'CHMOD_ERROR')

data/lib/bolt/transport/winrm.rb

@@ -84,7 +84,7 @@ catch
 
           if ENVIRONMENT_METHODS.include?(input_method)
             arguments.each do |(arg, val)|
-              cmd = "[Environment]::SetEnvironmentVariable('PT_#{arg}', '#{val}')"
+              cmd = "[Environment]::SetEnvironmentVariable('PT_#{arg}', @'\n#{val}\n'@)"
               result = conn.execute(cmd)
               if result.exit_code != 0
                 raise EnvironmentVarError(var, value)

data/lib/bolt/version.rb

@@ -1,3 +1,3 @@
 module Bolt
-  VERSION = '0.16.2'.freeze
+  VERSION = '0.16.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -332,6 +332,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bolt-modules/boltlib/lib/puppet/datatypes/result.rb
+- bolt-modules/boltlib/lib/puppet/datatypes/resultset.rb
+- bolt-modules/boltlib/lib/puppet/datatypes/target.rb
+- bolt-modules/boltlib/lib/puppet/functions/fail_plan.rb
+- bolt-modules/boltlib/lib/puppet/functions/file_upload.rb
+- bolt-modules/boltlib/lib/puppet/functions/get_targets.rb
+- bolt-modules/boltlib/lib/puppet/functions/run_command.rb
+- bolt-modules/boltlib/lib/puppet/functions/run_plan.rb
+- bolt-modules/boltlib/lib/puppet/functions/run_script.rb
+- bolt-modules/boltlib/lib/puppet/functions/run_task.rb
+- bolt-modules/boltlib/types/targetspec.pp
 - exe/bolt
 - lib/bolt.rb
 - lib/bolt/cli.rb
@@ -359,17 +370,6 @@ files:
 - lib/bolt/transport/winrm/connection.rb
 - lib/bolt/util.rb
 - lib/bolt/version.rb
-- modules/boltlib/lib/puppet/datatypes/result.rb
-- modules/boltlib/lib/puppet/datatypes/resultset.rb
-- modules/boltlib/lib/puppet/datatypes/target.rb
-- modules/boltlib/lib/puppet/functions/fail_plan.rb
-- modules/boltlib/lib/puppet/functions/file_upload.rb
-- modules/boltlib/lib/puppet/functions/get_targets.rb
-- modules/boltlib/lib/puppet/functions/run_command.rb
-- modules/boltlib/lib/puppet/functions/run_plan.rb
-- modules/boltlib/lib/puppet/functions/run_script.rb
-- modules/boltlib/lib/puppet/functions/run_task.rb
-- modules/boltlib/types/targetspec.pp
 - vendored/facter/lib/facter.rb
 - vendored/facter/lib/facter/Cfkey.rb
 - vendored/facter/lib/facter/application.rb