bolt 3.17.0 → 3.21.0

data/lib/bolt.rb

@@ -4,5 +4,5 @@
 require 'logging_extensions/logging'
 
 module Bolt
-  require 'bolt/executor'
+  require_relative 'bolt/executor'
 end

data/lib/bolt_server/transport_app.rb

@@ -184,6 +184,7 @@ module BoltServer
             search_dirs << mod.pluginfacts if mod.pluginfacts?
             if tarball_type == 'all_plugins'
               search_dirs << mod.files if mod.files?
+              search_dirs << mod.scripts if mod.scripts?
               type_files = "#{mod.path}/types"
               search_dirs << type_files if File.exist?(type_files)
             end
@@ -413,6 +414,8 @@ module BoltServer
           'path' => case mount_segment
                     when 'files'
                       "/puppet/v3/file_content/modules/#{module_segment}/#{name_segment}"
+                    when 'scripts'
+                      "/puppet/v3/file_content/scripts/#{module_segment}/#{name_segment}"
                     when 'tasks'
                       "/puppet/v3/file_content/tasks/#{module_segment}/#{name_segment}"
                     when 'lib'
@@ -462,28 +465,46 @@ module BoltServer
     end
 
     def file_metadatas(versioned_project, module_name, file)
-      abs_file_path = @pal_mutex.synchronize do
+      result = @pal_mutex.synchronize do
         bolt_config = config_from_project(versioned_project)
         pal = pal_from_project_bolt_config(bolt_config)
         pal.in_bolt_compiler do
           mod = Puppet.lookup(:current_environment).module(module_name)
           raise BoltServer::RequestError, "module_name: '#{module_name}' does not exist" unless mod
-          mod.file(file)
+          # First, look in the 'old' location <module>/files/<path>.
+          # If not found, and the path starts with `files` or `scripts`, munge
+          # the path and look inside that directory.
+          if (abs_path = mod.file(file))
+            { abs_file_path: abs_path, puppetserver_root: "modules/#{module_name}/#{file}" }
+          else
+            subdir, relative_path = file.split(File::SEPARATOR, 2)
+            abs_path, mount = case subdir
+                              when 'files'
+                                [mod.file(relative_path), 'modules']
+                              when 'scripts'
+                                [mod.script(relative_path), 'scripts']
+                              end
+            next nil unless abs_path
+            { abs_file_path: abs_path, puppetserver_root: "#{mount}/#{module_name}/#{relative_path}" }
+          end
         end
       end
 
-      unless abs_file_path
+      unless result
         raise BoltServer::RequestError,
-              "file: '#{file}' does not exist inside the module's 'files' directory"
+              "file: '#{file}' does not exist inside #{module_name} 'files' or 'scripts' directories"
       end
 
+      abs_file_path = result[:abs_file_path]
+      puppetserver_root = result[:puppetserver_root]
+
       fileset = Puppet::FileServing::Fileset.new(abs_file_path, 'recurse' => 'yes')
       Puppet::FileServing::Fileset.merge(fileset).collect do |relative_file_path, base_path|
         metadata = Puppet::FileServing::Metadata.new(base_path, relative_path: relative_file_path)
         metadata.checksum_type = 'sha256'
         metadata.links = 'follow'
         metadata.collect
-        metadata.to_data_hash
+        metadata.to_data_hash.merge(puppetserver_root: puppetserver_root)
       end
     end
 

data/lib/bolt_spec/bolt_context.rb

@@ -39,13 +39,15 @@ require 'bolt/plugin'
 #
 # Stubs:
 # - allow_command(cmd), expect_command(cmd): expect the exact command
-# - allow_script(script), expect_script(script): expect the script as <module>/path/to/file
+# - allow_script(script), expect_script(script): expect the script as <module>/path/to/file or an absolute path
 # - allow_task(task), expect_task(task): expect the named task
 # - allow_download(file), expect_download(file): expect the identified source file
-# - allow_upload(file), expect_upload(file): expect the identified source file
+# - allow_upload(file), expect_upload(file): expect the source file as <module>/path/to/file or an absolute path
 # - allow_out_message, expect_out_message: expect a message to be passed to out::message (only modifiers are
 #   be_called_times(n), with_params(params), and not_be_called)
 #
+# Files with absolute path (for upload and script) must exist or those functions will fail.
+#
 # Stub modifiers:
 # - be_called_times(n): if allowed, fail if the action is called more than 'n' times
 #                       if expected, fail unless the action is called 'n' times
@@ -211,8 +213,8 @@ module BoltSpec
     # def allow_script(script_name)
     #
     # file uploads and downloads have a single destination and no arguments
-    # def allow_file_upload(source_name)
-    # def allow_file_download(source_name)
+    # def allow_upload(source_name)
+    # def allow_download(source_name)
     #
     # Most of the information in commands is in the command string itself
     # we may need more flexible allows than just the name/command string

data/lib/bolt_spec/plans/mock_executor.rb

@@ -44,7 +44,7 @@ module BoltSpec
 
       def module_file_id(file)
         modpath = @modulepath.select { |path| file =~ /^#{path}/ }
-        raise "Could not identify modulepath containing #{file}: #{modpath}" unless modpath.size == 1
+        return nil unless modpath.size == 1
 
         path = Pathname.new(file)
         relative = path.relative_path_from(Pathname.new(modpath.first))
@@ -66,7 +66,7 @@ module BoltSpec
       end
 
       def run_script(targets, script_path, arguments, options = {}, _position = [])
-        script = module_file_id(script_path)
+        script = module_file_id(script_path) || script_path
         result = nil
         if (doub = @script_doubles[script] || @script_doubles[:default])
           result = doub.process(targets, script, arguments, options)
@@ -116,7 +116,7 @@ module BoltSpec
       end
 
       def upload_file(targets, source_path, destination, options = {}, _position = [])
-        source = module_file_id(source_path)
+        source = module_file_id(source_path) || source_path
         result = nil
         if (doub = @upload_doubles[source] || @upload_doubles[:default])
           result = doub.process(targets, source, destination, options)

data/libexec/bolt_catalog

@@ -59,7 +59,7 @@ when "compile"
     puts({ message: message, backtrace: e.backtrace }.to_json)
     exit 1
   rescue StandardError => e
-    puts({ message: e.message }.to_json)
+    puts({ message: e.message, backtrace: e.backtrace }.to_json)
     exit 1
   end
 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.21.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: ruby_smb
   requirement: !ruby/object:Gem::Requirement
@@ -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