bolt 3.10.0 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa1075046a81e0596ff3f0483dc7b7a5913a073dd6e998f66c70687049531e74
-  data.tar.gz: 9cdb2d3503e1bd2d84fa7c0fc846e3f4d2293780f648d9d07d549fd50d2b1a51
+  metadata.gz: ef5e67102ddbc1b3ef1c0d08352fd5392766b73f3686e54ca62e9f5e09141356
+  data.tar.gz: dc371bb5483705f7c7dbca0be037aad53338e27480faf1f884eb669f8c14fbb2
 SHA512:
-  metadata.gz: 4b2f636ec7f5f038b69cd5c4f82e9fd93e59521035e15fa678cef67501a4e00287e29f40ce1672d2f5db0fa4972cbc26d9763f62480612e30ebcfae404d12a1f
-  data.tar.gz: f87b3966ea10cf5a5fe46937e9a47b73d4553924bff00ee578f6c659a70fe82864e2cc78b76a685dfb9e3d4a4e5a3fb7bea136730bf6b5160454e665f4f02ea8
+  metadata.gz: 7efd326949ec4d661ff4d4471d9626dcf2688a5e0f699f777d70537135493b2b55250054b6de1989f933a23c8aafb6e2124a7062d32f398218529fd6550ff2b7
+  data.tar.gz: ac92568d449f852bc39e0c824c9fe6e3c13cee329fa6c5a3bfc1794b01a9b4b9278124456fe4adfd9cebe2ec0056ab42651b5f1aa4f1a56402a743c7893e42a3

data/Puppetfile

@@ -6,13 +6,13 @@ moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
 mod 'puppetlabs-service', '2.0.0'
-mod 'puppetlabs-puppet_agent', '4.6.1'
+mod 'puppetlabs-puppet_agent', '4.7.0'
 mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6
 mod 'puppetlabs-augeas_core', '1.1.2'
 mod 'puppetlabs-host_core', '1.0.3'
-mod 'puppetlabs-scheduled_task', '3.0.0'
+mod 'puppetlabs-scheduled_task', '3.0.1'
 mod 'puppetlabs-sshkeys_core', '2.2.0'
 mod 'puppetlabs-zfs_core', '1.2.0'
 mod 'puppetlabs-cron_core', '1.0.5'
@@ -29,14 +29,14 @@ mod 'puppetlabs-python_task_helper', '0.5.0'
 mod 'puppetlabs-reboot', '4.0.2'
 mod 'puppetlabs-ruby_task_helper', '0.6.0'
 mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
-mod 'puppetlabs-stdlib', '7.0.1'
+mod 'puppetlabs-stdlib', '7.1.0'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'
 mod 'puppetlabs-azure_inventory', '0.5.0'
 mod 'puppetlabs-gcloud_inventory', '0.3.0'
 mod 'puppetlabs-http_request', '0.2.2'
-mod 'puppetlabs-pkcs7', '0.1.1'
+mod 'puppetlabs-pkcs7', '0.1.2'
 mod 'puppetlabs-secure_env_vars', '0.2.0'
 mod 'puppetlabs-terraform', '0.6.1'
 mod 'puppetlabs-vault', '0.4.0'

data/lib/bolt/bolt_option_parser.rb

@@ -718,7 +718,7 @@ module Bolt
           Run a script on the specified targets.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about running scrips at https://pup.pt/bolt-commands.
+          Learn more about running scripts at https://pup.pt/bolt-commands.
 
       #{colorize(:cyan, 'Actions')}
           run         Run a script on the specified targets.
@@ -740,7 +740,7 @@ module Bolt
           be quoted.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about running scrips at https://pup.pt/bolt-commands.
+          Learn more about running scripts at https://pup.pt/bolt-commands.
 
       #{colorize(:cyan, 'Examples')}
           bolt script run myscript.sh 'echo hello' --targets target1,target2

data/lib/bolt/module_installer/installer.rb

@@ -30,7 +30,7 @@ module Bolt
 
         settings = R10K::Settings.global_settings.evaluate(@config)
         R10K::Initializers::GlobalInitializer.new(settings).call
-        install_action = R10K::Action::Puppetfile::Install.new(r10k_opts, nil)
+        install_action = R10K::Action::Puppetfile::Install.new(r10k_opts, nil, {})
 
         # Override the r10k logger with a proxy to our own logger
         R10K::Logging.instance_variable_set(:@outputter, Bolt::R10KLogProxy.new)

data/lib/bolt/outputter/human.rb

@@ -174,11 +174,22 @@ module Bolt
           if result.message?
             @stream.puts(remove_trail(indent(2, result.message)))
           end
-
           case result.action
           when 'command', 'script'
             safe_value = result.safe_value
-            @stream.puts(indent(2, safe_value['merged_output'])) unless safe_value['merged_output'].strip.empty?
+            if safe_value["merged_output"]
+              @stream.puts(indent(2, safe_value['merged_output'])) unless safe_value['merged_output'].strip.empty?
+
+            else # output stdout or stderr
+              unless safe_value['stdout'].nil? || safe_value['stdout'].strip.empty?
+                @stream.puts(indent(2, "STDOUT:"))
+                @stream.puts(indent(4, safe_value['stdout']))
+              end
+              unless safe_value['stderr'].nil? || safe_value['stderr'].strip.empty?
+                @stream.puts(indent(2, "STDERR:"))
+                @stream.puts(indent(4, safe_value['stderr']))
+              end
+            end
           when 'lookup'
             @stream.puts(indent(2, result['value']))
           else

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable