bolt 3.19.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f615bd259875c82b953db516b48975c66863ef4f4002a4f55317f9f867a0cf6c
-  data.tar.gz: 0027a9463d88e77455c7a83e5716f3097d921a32f172b931530b5f58827f427e
+  metadata.gz: cc5c8a79673414cca60534c299b63106ad7abe696bc942e7f913deaf57aa893f
+  data.tar.gz: 0db5d813eb99b4d452e92bde9d8518b10c60b5613a18cb310dffbc7c86c87d64
 SHA512:
-  metadata.gz: 8c0d779b31ff416f05d625ba4effb197a7b453f02e19489220e228c3e35b20abf3bc04e85f09562faf8e0b12b415f20c8e6facfcded1d09212f45df2d2d73690
-  data.tar.gz: d5ed05307adf5ff3c71d6db4a076b972284259aa837945eaf389d71434d795f90bb95efb783006fee32076b6311c8b4baad11627511cfad9957fa60f726de937
+  metadata.gz: 2d67559bf87d79ec2adf72b6cf1d7de11a6b3ad925062ff7251e4be99240e551e9704c2fff1767979351f4485420cd7a62988f4f31c8bfe6cae940272898f564
+  data.tar.gz: 69c73373a0ee02aca8794f66c48cc0c84f9c6ce56c329648915b6cc15714e399f13716f93af439a8362bc1a6c17d736e76e1920d2243fc1f1cf76e7daeb11a49

data/lib/bolt/cli.rb

@@ -446,7 +446,7 @@ module Bolt
           check_gem_install
           warn_inventory_overrides_cli(config, options)
           submit_screen_view(analytics, config, inventory, options)
-          options[:targets] = process_target_list(plugins.puppetdb_client, @rerun, options)
+          options[:targets] = process_target_list(plugins, @rerun, options)
 
           # TODO: Fix casing issue in Windows.
           config.check_path_case('modulepath', config.modulepath)
@@ -689,14 +689,14 @@ module Bolt
     # Process the target list by turning a PuppetDB query or rerun mode into a
     # list of target names.
     #
-    # @param pdb_client [Bolt::PuppetDB::Client] The PuppetDB client.
+    # @param plugins [Bolt::Plugin] The Plugin instance.
     # @param rerun [Bolt::Rerun] The Rerun instance.
     # @param options [Hash] The CLI options.
     # @return [Hash] The target list.
     #
-    private def process_target_list(pdb_client, rerun, options)
+    private def process_target_list(plugins, rerun, options)
       if options[:query]
-        pdb_client.query_certnames(options[:query])
+        plugins.puppetdb_client.query_certnames(options[:query])
       elsif options[:rerun]
         rerun.get_targets(options[:rerun])
       elsif options[:targets]

data/lib/bolt/config/transport/options.rb

@@ -155,14 +155,15 @@ module Bolt
                          "`task.py`) and the extension is case sensitive. When a target's name is `localhost`, "\
                          "Ruby tasks run with the Bolt Ruby interpreter by default.",
             additionalProperties: {
-              type: String,
+              type: [String, Array],
               _plugin: false
             },
             propertyNames: {
               pattern: "^.?[a-zA-Z0-9]+$"
             },
             _plugin: true,
-            _example: { "rb" => "/usr/bin/ruby" }
+            _example: { "rb" => ["/usr/bin/ruby", "-r", "puppet"],
+                        ".py" => "/usr/bin/python3" }
           },
           "job-poll-interval" => {
             type: Integer,

data/lib/bolt/shell/bash.rb

@@ -100,7 +100,7 @@ module Bolt
 
             # Only use interpreter if script_interpreter config is enabled
             if options[:script_interpreter] && interpreter
-              exec_args.unshift(interpreter)
+              exec_args.unshift(interpreter).flatten!
               logger.trace("Running '#{script}' using '#{interpreter}' interpreter")
             end
 
@@ -254,7 +254,7 @@ module Bolt
         if interpreter
           StringIO.new(<<~SCRIPT)
             #!/bin/sh
-            '#{interpreter}' '#{task_path}' <<'EOF'
+            #{Array(interpreter).map { |word| "'#{word}'" }.join(' ')} '#{task_path}' <<'EOF'
             #{stdin}
             EOF
           SCRIPT
@@ -335,11 +335,7 @@ module Bolt
       # Returns string with the interpreter conditionally prepended
       def inject_interpreter(interpreter, command)
         if interpreter
-          if command.is_a?(Array)
-            command.unshift(interpreter)
-          else
-            command = [interpreter, command]
-          end
+          command = Array(command).unshift(interpreter).flatten
         end
 
         command.is_a?(String) ? command : Shellwords.shelljoin(command)

data/lib/bolt/shell/powershell.rb

@@ -214,8 +214,14 @@ module Bolt
                     else
                       interpreter = select_interpreter(script_path, target.options['interpreters'])
                       if options[:script_interpreter] && interpreter
-                        path = interpreter
-                        args = escape_arguments([script_path])
+                        # interpreter can be a String or Array here. Cast it to an array.
+                        interpreter_array = Array(interpreter)
+                        # Make path the first part of the array - this should be the binary
+                        path = interpreter_array.shift
+                        # Anything else in interpreters should get prepended to
+                        # the command. If interpreters was a string this will
+                        # just be [script_path]
+                        args = escape_arguments(interpreter_array + Array(script_path))
                         logger.trace("Running '#{script_path}' using '#{interpreter}' interpreter")
                       else
                         path, args = *process_from_extension(script_path)
@@ -268,8 +274,14 @@ module Bolt
                       run_ps_task(task_path, arguments, input_method)
                     else
                       if (interpreter = select_interpreter(task_path, target.options['interpreters']))
-                        path = interpreter
-                        args = [task_path]
+                        # interpreter can be a String or Array here. Cast it to an array.
+                        interpreter_array = Array(interpreter)
+                        # Make path the first part of the array - this should be the binary
+                        path = interpreter_array.shift
+                        # Anything else in interpreters should get prepended to
+                        # the command. If interpreters was a string this will
+                        # just be [task_path]
+                        args = interpreter_array + [task_path]
                       else
                         path, args = *process_from_extension(task_path)
                       end

data/lib/bolt/util.rb

@@ -65,6 +65,9 @@ module Bolt
         raise Bolt::FileError.new("Could not parse #{file_name} file at #{path}, line #{e.line}, "\
                                   "column #{e.column}\n#{e.problem}",
                                   path)
+      rescue Psych::BadAlias => e
+        raise Bolt::FileError.new('Bolt does not support the use of aliases in YAML files. Alias '\
+                                  "detected in #{file_name} file at #{path}\n#{e.message}", path)
       rescue Psych::Exception => e
         raise Bolt::FileError.new("Could not parse #{file_name} file at #{path}\n#{e.message}",
                                   path)

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -288,14 +288,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement