bolt 0.21.6 → 0.21.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a8fef70687a1aeebc3a74ad7e4c6fcc69d84423c685e6c1d3d8f2b7a3121ce
-  data.tar.gz: 7e4952ea14da675182f14d52b02d6fb72d7ab0e073bb1392b083aa521db7523d
+  metadata.gz: af8e2b6778a6eefcb1efcafe215e6d0642cc1f1d59b656d12bf94d66e6136c73
+  data.tar.gz: 36cfe00c4670dec416489ab9212928071037fd5010e381d2aab07a5fd6914b81
 SHA512:
-  metadata.gz: 4d0a47e00bb2f14f998690878a2e78e89f3a7fe5ced902df07edd7bc5e5bdaf286058f39bf1cc62af387835e1ad2dfc7308e5ec23448107d774422dc7992ad53
-  data.tar.gz: 8affe263f9a2ae00c849c18188c7a1493a1ecda2b15e63a0a4fd03924817ce0008f0b3b588feda9422eb213355decb2770f7cda6b2fba294eb7a9efb6c9300d4
+  metadata.gz: d0f08cc1c6b9f3b407c0b292e842ae4b5e21f41857c78a768b7a965877d22cff0affe9a878ebb1c551a7fb81b05d9548d056ea172e1e8e1d6204b85a8f6ccf22
+  data.tar.gz: c68bd35efb219e3d836e5e77e497708b1c5b8a05c1a6dcdc0025d38a754fce5fd334a3f26e989e4f0bf2131a3df82a0bbbbc5b7a74247fdf262c5bd66563f050

data/bolt-modules/boltlib/lib/puppet/functions/run_plan.rb

@@ -53,36 +53,40 @@ Puppet::Functions.create_function(:run_plan, Puppet::Functions::InternalFunction
       )
     end
 
-    # TODO: Add profiling around this
     if (run_as = named_args['_run_as'])
       old_run_as = executor.run_as
       executor.run_as = run_as
     end
-    result = nil
-    begin
-      # If the plan does not throw :return by calling the return function it's result is
-      # undef/nil
-      result = catch(:return) do
-        func.class.dispatcher.dispatchers[0].call_by_name_with_scope(scope, params, true)
-        nil
-      end&.value
-      # Validate the result is a PlanResult
-      unless Puppet::Pops::Types::TypeParser.singleton.parse('Boltlib::PlanResult').instance?(result)
-        raise Bolt::InvalidPlanResult.new(plan_name, result.to_s)
+
+    # wrap plan execution in logging messages
+    executor.log_plan(plan_name) do
+      result = nil
+      begin
+        # If the plan does not throw :return by calling the return function it's result is
+        # undef/nil
+        result = catch(:return) do
+          func.class.dispatcher.dispatchers[0].call_by_name_with_scope(scope, params, true)
+          nil
+        end&.value
+        # Validate the result is a PlanResult
+        unless Puppet::Pops::Types::TypeParser.singleton.parse('Boltlib::PlanResult').instance?(result)
+          raise Bolt::InvalidPlanResult.new(plan_name, result.to_s)
+        end
+
+        result
+      rescue Puppet::PreformattedError => err
+        if named_args['_catch_errors'] && err.cause.is_a?(Bolt::Error)
+          result = err.cause.to_puppet_error
+        else
+          raise err
+        end
+      ensure
+        if run_as
+          executor.run_as = old_run_as
+        end
       end
+
       result
-    rescue Puppet::PreformattedError => err
-      if named_args['_catch_errors'] && err.cause.is_a?(Bolt::Error)
-        result = err.cause.to_puppet_error
-      else
-        raise err
-      end
-    ensure
-      if run_as
-        executor.run_as = old_run_as
-      end
     end
-
-    result
   end
 end

data/lib/bolt/executor.rb

@@ -134,6 +134,22 @@ module Bolt
       results
     end
 
+    def log_plan(plan_name)
+      log_method = @plan_logging ? :notice : :info
+      @logger.send(log_method, "Starting: plan #{plan_name}")
+      start_time = Time.now
+
+      results = nil
+      begin
+        results = yield
+      ensure
+        duration = Time.now - start_time
+        @logger.send(log_method, "Finished: plan #{plan_name} in #{duration.round(2)} sec")
+      end
+
+      results
+    end
+
     def report_transport(transport, count)
       name = transport.class.name.split('::').last.downcase
       @analytics&.event('Transport', 'initialize', name, count) unless @reported_transports.include?(name)

data/lib/bolt/puppetdb/config.rb

@@ -42,6 +42,7 @@ module Bolt
         elsif File.exist?(DEFAULT_TOKEN)
           @token = File.read(DEFAULT_TOKEN)
         end
+        @token = @token.strip if @token
       end
 
       def expand_paths

data/lib/bolt/version.rb

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

data/lib/bolt_spec/plans/mock_executor.rb

@@ -209,6 +209,10 @@ module BoltSpec
         @task_doubles[task_name] ||= TaskDouble.new
       end
 
+      def log_plan(_plan_name)
+        yield
+      end
+
       def report_function_call(_function); end
 
       def report_bundled_content(_mode, _name); end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.21.6
+  version: 0.21.7
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement