bolt 3.17.0 → 3.18.0

data/lib/bolt/inventory/inventory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/inventory/group'
-require 'bolt/inventory/target'
+require_relative '../../bolt/inventory/group'
+require_relative '../../bolt/inventory/target'
 
 module Bolt
   class Inventory
@@ -75,12 +75,6 @@ module Bolt
         end
       end
 
-      # Validates the inventory.
-      #
-      def validate
-        groups.validate
-      end
-
       def group_names_for(target_name)
         group_data_for(target_name).fetch('groups', [])
       end

data/lib/bolt/inventory/options.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/config/options'
+require_relative '../../bolt/config/options'
 
 module Bolt
   class Inventory

data/lib/bolt/inventory/target.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/resource_instance'
+require_relative '../../bolt/resource_instance'
 
 module Bolt
   class Inventory

data/lib/bolt/inventory.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'set'
-require 'bolt/config'
-require 'bolt/inventory/group'
-require 'bolt/inventory/inventory'
-require 'bolt/inventory/options'
-require 'bolt/target'
-require 'bolt/util'
-require 'bolt/plugin'
-require 'bolt/validator'
+require_relative '../bolt/config'
+require_relative 'inventory/group'
+require_relative 'inventory/inventory'
+require_relative 'inventory/options'
+require_relative '../bolt/target'
+require_relative '../bolt/util'
+require_relative '../bolt/plugin'
+require_relative '../bolt/validator'
 require 'yaml'
 
 module Bolt

data/lib/bolt/module_installer/installer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/r10k_log_proxy'
-require 'bolt/error'
+require_relative '../../bolt/r10k_log_proxy'
+require_relative '../../bolt/error'
 
 # This class is used to install modules from a Puppetfile to a module directory.
 #

data/lib/bolt/module_installer/puppetfile/forge_module.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'semantic_puppet'
-require 'bolt/module_installer/puppetfile/module'
+require_relative '../../../bolt/module_installer/puppetfile/module'
 
 # This class represents a resolved Forge module.
 #

data/lib/bolt/module_installer/puppetfile/git_module.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/module_installer/puppetfile/module'
+require_relative '../../../bolt/module_installer/puppetfile/module'
 
 # This class represents a resolved Git module.
 #

data/lib/bolt/module_installer/puppetfile/module.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
+require_relative '../../../bolt/error'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/module_installer/puppetfile.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/module_installer/puppetfile/forge_module'
-require 'bolt/module_installer/puppetfile/git_module'
+require_relative '../../bolt/error'
+require_relative 'puppetfile/forge_module'
+require_relative 'puppetfile/git_module'
 
 # This class manages the logical contents of a Puppetfile. It includes methods
 # for parsing and generating a Puppetfile.

data/lib/bolt/module_installer/resolver.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/module_installer/puppetfile'
-require 'bolt/module_installer/specs'
+require_relative '../../bolt/error'
+require_relative '../../bolt/module_installer/puppetfile'
+require_relative '../../bolt/module_installer/specs'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/module_installer/specs/forge_spec.rb

@@ -3,7 +3,7 @@
 require 'semantic_puppet'
 require 'set'
 
-require 'bolt/error'
+require_relative '../../../bolt/error'
 
 # This class represents a Forge module specification.
 #

data/lib/bolt/module_installer/specs/git_spec.rb

@@ -3,7 +3,7 @@
 require 'json'
 require 'set'
 
-require 'bolt/error'
+require_relative '../../../bolt/error'
 
 # This class represents a Git module specification.
 #

data/lib/bolt/module_installer/specs.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/module_installer/specs/forge_spec'
-require 'bolt/module_installer/specs/git_spec'
+require_relative '../../bolt/error'
+require_relative 'specs/forge_spec'
+require_relative 'specs/git_spec'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/module_installer.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/logger'
-require 'bolt/module_installer/installer'
-require 'bolt/module_installer/puppetfile'
-require 'bolt/module_installer/resolver'
-require 'bolt/module_installer/specs'
+require_relative '../bolt/error'
+require_relative '../bolt/logger'
+require_relative 'module_installer/installer'
+require_relative 'module_installer/puppetfile'
+require_relative 'module_installer/resolver'
+require_relative 'module_installer/specs'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/node/errors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
+require_relative '../../bolt/error'
 
 module Bolt
   class Node

data/lib/bolt/node/output.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'bolt/result'
+require_relative '../../bolt/result'
 
 module Bolt
   class Node

data/lib/bolt/outputter/human.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/container_result'
-require 'bolt/pal'
+require_relative '../../bolt/container_result'
+require_relative '../../bolt/pal'
 
 module Bolt
   class Outputter

data/lib/bolt/outputter/logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/pal'
+require_relative '../../bolt/pal'
 
 module Bolt
   class Outputter

data/lib/bolt/outputter/rainbow.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/pal'
+require_relative '../../bolt/pal'
 
 module Bolt
   class Outputter

data/lib/bolt/outputter.rb

@@ -51,7 +51,7 @@ module Bolt
   end
 end
 
-require 'bolt/outputter/human'
-require 'bolt/outputter/json'
-require 'bolt/outputter/logger'
-require 'bolt/outputter/rainbow'
+require_relative 'outputter/human'
+require_relative 'outputter/json'
+require_relative 'outputter/logger'
+require_relative 'outputter/rainbow'

data/lib/bolt/pal/logging.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/util/puppet_log_level'
+require_relative '../../bolt/util/puppet_log_level'
 
 Puppet::Util::Log.newdesttype :logging do
   match "Logging::Logger"

data/lib/bolt/pal/yaml_plan/evaluator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/pal/yaml_plan'
+require_relative '../../../bolt/pal/yaml_plan'
 
 module Bolt
   class PAL

data/lib/bolt/pal/yaml_plan/loader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/pal/yaml_plan'
-require 'bolt/pal/yaml_plan/evaluator'
+require_relative '../../../bolt/pal/yaml_plan'
+require_relative '../../../bolt/pal/yaml_plan/evaluator'
 require 'psych'
 
 module Bolt

data/lib/bolt/pal/yaml_plan/step.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/util'
+require_relative '../../../bolt/util'
 
 module Bolt
   class PAL
@@ -211,13 +211,13 @@ module Bolt
   end
 end
 
-require 'bolt/pal/yaml_plan/step/command'
-require 'bolt/pal/yaml_plan/step/eval'
-require 'bolt/pal/yaml_plan/step/plan'
-require 'bolt/pal/yaml_plan/step/resources'
-require 'bolt/pal/yaml_plan/step/script'
-require 'bolt/pal/yaml_plan/step/task'
-require 'bolt/pal/yaml_plan/step/upload'
-require 'bolt/pal/yaml_plan/step/download'
-require 'bolt/pal/yaml_plan/step/message'
-require 'bolt/pal/yaml_plan/step/verbose'
+require_relative 'step/command'
+require_relative 'step/eval'
+require_relative 'step/plan'
+require_relative 'step/resources'
+require_relative 'step/script'
+require_relative 'step/task'
+require_relative 'step/upload'
+require_relative 'step/download'
+require_relative 'step/message'
+require_relative 'step/verbose'

data/lib/bolt/pal/yaml_plan/transpiler.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/pal/yaml_plan/loader'
-require 'bolt/util'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/pal/yaml_plan/loader'
+require_relative '../../../bolt/util'
 
 module Bolt
   class PAL

data/lib/bolt/pal/yaml_plan.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/pal/yaml_plan/parameter'
-require 'bolt/pal/yaml_plan/step'
+require_relative 'yaml_plan/parameter'
+require_relative 'yaml_plan/step'
 
 module Bolt
   class PAL

data/lib/bolt/pal.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bolt/applicator'
-require 'bolt/executor'
-require 'bolt/error'
-require 'bolt/plan_result'
-require 'bolt/util'
-require 'bolt/config/modulepath'
+require_relative '../bolt/applicator'
+require_relative '../bolt/executor'
+require_relative '../bolt/error'
+require_relative '../bolt/plan_result'
+require_relative '../bolt/util'
+require_relative '../bolt/config/modulepath'
 require 'etc'
 
 module Bolt
@@ -101,10 +101,10 @@ module Bolt
         raise Bolt::Error.new("Puppet must be installed to execute tasks", "bolt/puppet-missing")
       end
 
-      require 'bolt/pal/logging'
-      require 'bolt/pal/issues'
-      require 'bolt/pal/yaml_plan/loader'
-      require 'bolt/pal/yaml_plan/transpiler'
+      require_relative 'pal/logging'
+      require_relative 'pal/issues'
+      require_relative 'pal/yaml_plan/loader'
+      require_relative 'pal/yaml_plan/transpiler'
 
       # Now that puppet is loaded we can include puppet mixins in data types
       Bolt::ResultSet.include_iterable
@@ -736,7 +736,7 @@ module Bolt
         #
         # Every future except for the main plan needs to have a plan id in
         # order to be tracked for the `wait()` function with no arguments.
-        future = executor.create_future(name: plan_name, plan_id: 1) do |_scope|
+        future = executor.create_future(name: plan_name, plan_id: 0) do |_scope|
           r = compiler.call_function('run_plan', plan_name, params.merge('_bolt_api_call' => true))
           Bolt::PlanResult.from_pcore(r, 'success')
         rescue Bolt::Error => e

data/lib/bolt/plan_creator.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/logger'
-require 'bolt/module'
-require 'bolt/util'
+require_relative '../bolt/error'
+require_relative '../bolt/logger'
+require_relative '../bolt/module'
+require_relative '../bolt/util'
 
 module Bolt
   module PlanCreator

data/lib/bolt/plan_result.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'bolt/error'
-require 'bolt/util'
+require_relative '../bolt/error'
+require_relative '../bolt/util'
 
 module Bolt
   class PlanResult

data/lib/bolt/plugin/cache.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require 'bolt/error'
-require 'bolt/util'
+require_relative '../../bolt/error'
+require_relative '../../bolt/util'
 
 module Bolt
   class Plugin

data/lib/bolt/plugin/module.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/task/run'
+require_relative '../../bolt/task/run'
 
 module Bolt
   class Plugin

data/lib/bolt/plugin.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bolt/inventory'
-require 'bolt/executor'
-require 'bolt/module'
-require 'bolt/pal'
-require 'bolt/plugin/cache'
-require 'bolt/plugin/puppetdb'
+require_relative '../bolt/inventory'
+require_relative '../bolt/executor'
+require_relative '../bolt/module'
+require_relative '../bolt/pal'
+require_relative 'plugin/cache'
+require_relative 'plugin/puppetdb'
 
 module Bolt
   class Plugin
@@ -376,4 +376,4 @@ module Bolt
 end
 
 # references PluginError
-require 'bolt/plugin/module'
+require_relative 'plugin/module'

data/lib/bolt/project.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'bolt/config'
-require 'bolt/validator'
-require 'bolt/pal'
-require 'bolt/module'
+require_relative '../bolt/config'
+require_relative '../bolt/validator'
+require_relative '../bolt/pal'
+require_relative '../bolt/module'
 
 module Bolt
   class Project

data/lib/bolt/project_manager/config_migrator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/project_manager/migrator'
+require_relative '../../bolt/project_manager/migrator'
 
 module Bolt
   class ProjectManager

data/lib/bolt/project_manager/inventory_migrator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/project_manager/migrator'
+require_relative '../../bolt/project_manager/migrator'
 
 module Bolt
   class ProjectManager

data/lib/bolt/project_manager/migrator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require 'bolt/error'
+require_relative '../../bolt/error'
 
 module Bolt
   class ProjectManager

data/lib/bolt/project_manager/module_migrator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/project_manager/migrator'
+require_relative '../../bolt/project_manager/migrator'
 
 module Bolt
   class ProjectManager
@@ -43,10 +43,10 @@ module Bolt
       # to the new moduledir.
       #
       private def migrate_modules_from_puppetfile(config, puppetfile_path, managed_moduledir, modulepath)
-        require 'bolt/module_installer/installer'
-        require 'bolt/module_installer/puppetfile'
-        require 'bolt/module_installer/resolver'
-        require 'bolt/module_installer/specs'
+        require_relative '../../bolt/module_installer/installer'
+        require_relative '../../bolt/module_installer/puppetfile'
+        require_relative '../../bolt/module_installer/resolver'
+        require_relative '../../bolt/module_installer/specs'
 
         begin
           @outputter.print_action_step("Parsing Puppetfile at #{puppetfile_path}")

data/lib/bolt/project_manager.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/project_manager/config_migrator'
-require 'bolt/project_manager/inventory_migrator'
-require 'bolt/project_manager/module_migrator'
+require_relative 'project_manager/config_migrator'
+require_relative 'project_manager/inventory_migrator'
+require_relative 'project_manager/module_migrator'
 
 module Bolt
   class ProjectManager
@@ -36,6 +36,16 @@ module Bolt
       #     ssl: false
     INVENTORY
 
+    GITIGNORE_CONTENT = <<~GITIGNORE
+      .modules/
+      .resource_types/
+      bolt-debug.log
+      .plan_cache.json
+      .plugin_cache.json
+      .task_cache.json
+      .rerun.json
+    GITIGNORE
+
     def initialize(config, outputter, pal)
       @config    = config
       @outputter = outputter
@@ -45,7 +55,7 @@ module Bolt
     # Creates a new project at the specified directory.
     #
     def create(path, name, modules)
-      require 'bolt/module_installer'
+      require_relative '../bolt/module_installer'
 
       project       = Pathname.new(File.expand_path(path))
       old_config    = project + 'bolt.yaml'
@@ -53,6 +63,7 @@ module Bolt
       puppetfile    = project + 'Puppetfile'
       moduledir     = project + '.modules'
       inventoryfile = project + 'inventory.yaml'
+      gitignore     = project + '.gitignore'
       project_name  = name || File.basename(project)
 
       if config.exist?
@@ -125,6 +136,14 @@ module Bolt
         end
       end
 
+      unless gitignore.exist?
+        begin
+          File.write(gitignore.to_path, GITIGNORE_CONTENT)
+        rescue StandardError => e
+          raise Bolt::FileError.new("Could not create .gitignore at #{project}: #{e.message}", nil)
+        end
+      end
+
       @outputter.print_message("Successfully created Bolt project at #{project}")
 
       0

data/lib/bolt/puppetdb/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'bolt/util'
+require_relative '../../bolt/util'
 
 module Bolt
   module PuppetDB

data/lib/bolt/puppetdb.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/puppetdb/client'
-require 'bolt/puppetdb/config'
+require_relative '../bolt/error'
+require_relative 'puppetdb/client'
+require_relative 'puppetdb/config'
 
 module Bolt
   class PuppetDBError < Bolt::Error

data/lib/bolt/result.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'bolt/error'
+require_relative '../bolt/error'
 
 module Bolt
   class Result

data/lib/bolt/shell/bash.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/shell/bash/tmpdir'
+require_relative 'bash/tmpdir'
 require 'shellwords'
 
 module Bolt
@@ -94,7 +94,17 @@ module Bolt
           with_tmpdir do |dir|
             path = write_executable(dir.to_s, script)
             dir.chown(run_as)
-            output = execute([path, *arguments], environment: options[:env_vars], sudoable: true)
+
+            exec_args   = [path, *arguments]
+            interpreter = select_interpreter(script, target.options['interpreters'])
+
+            # Only use interpreter if script_interpreter config is enabled
+            if options[:script_interpreter] && interpreter
+              exec_args.unshift(interpreter)
+              logger.trace("Running '#{script}' using '#{interpreter}' interpreter")
+            end
+
+            output = execute(exec_args, environment: options[:env_vars], sudoable: true)
             Bolt::Result.for_command(target,
                                      output.to_h,
                                      'script',