bolt 2.35.0 → 2.40.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05af3f780d500b91be547a73123d24c2da041a8ef60ba14114921358b120800
-  data.tar.gz: e8534835e69d1e5e57a353ff89a7d2667cf6d0894e8a07c1e5812282ed85b2cd
+  metadata.gz: d1b59f916303bbd38bb82a011ecff7a2e5086094586cea84d4cd78fb052d2171
+  data.tar.gz: 425288bb47b49aa017d71ee0b2bb1e48de475980f70e14be11f369acadfd0582
 SHA512:
-  metadata.gz: 97b3faac5a1e423dcebf8e4fa92f55bbc36bd1c9735fc38332db40a2bb0db0e1ddc8e1e815aa29f31f9eb3601972a8d6e07b39d0c5dc6cd2762ea87a91ddec92
-  data.tar.gz: 15963b1bb77ee04a1db4f54996964b32e599e4a0cc422dc77892151b221c1a17df9e6a1c74f160a30e9146402d48819b07b3b9d2ee9c96d7e763bba97389ccc8
+  metadata.gz: dc56fc52b8e52553902316fb26204a89a90901a9cf56e13d9ff8a1f2d4aea96d1054d578bda7598ba38384baf424a751230038bd8c6c593b113854a176cafeb7
+  data.tar.gz: 07a33c2ea3d3fdf5f69e9844d7c45dbb88cfedfabd8ce9264408876ee7496568033d372128eba510431bbb749c4223a8ba5420941936f2efd304ded398c90ad0

data/Puppetfile

@@ -34,7 +34,7 @@ mod 'puppetlabs-stdlib', '6.5.0'
 mod 'puppetlabs-aws_inventory', '0.5.2'
 mod 'puppetlabs-azure_inventory', '0.4.1'
 mod 'puppetlabs-gcloud_inventory', '0.1.3'
-mod 'puppetlabs-http_request', '0.2.0'
+mod 'puppetlabs-http_request', '0.2.1'
 mod 'puppetlabs-pkcs7', '0.1.1'
 mod 'puppetlabs-secure_env_vars', '0.1.0'
 mod 'puppetlabs-terraform', '0.5.0'

data/bolt-modules/boltlib/lib/puppet/datatypes/applyresult.rb

@@ -12,6 +12,7 @@ Puppet::DataTypes.create_type('ApplyResult') do
       message => Callable[[], Optional[String]],
       action => Callable[[], String],
       to_data => Callable[[], Hash],
+      value => Callable[[], Hash]
     }
   PUPPET
 

data/lib/bolt/analytics.rb

@@ -2,6 +2,7 @@
 
 require 'bolt/util'
 require 'bolt/version'
+require 'find'
 require 'json'
 require 'logging'
 require 'securerandom'
@@ -23,14 +24,16 @@ module Bolt
       plan_steps: :cd8,
       return_type: :cd9,
       inventory_version: :cd10,
-      boltdir_type: :cd11
+      boltdir_type: :cd11,
+      puppet_plan_count: :cd12,
+      yaml_plan_count: :cd13
     }.freeze
 
     def self.build_client
       logger = Bolt::Logger.logger(self)
       begin
-        config_file = config_path(logger)
-        config = load_config(config_file, logger)
+        config_file = config_path
+        config = load_config(config_file)
       rescue ArgumentError
         config = { 'disabled' => true }
       end
@@ -51,7 +54,7 @@ module Bolt
       NoopClient.new
     end
 
-    def self.config_path(logger)
+    def self.config_path
       path     = File.expand_path(File.join('~', '.puppetlabs', 'etc', 'bolt', 'analytics.yaml'))
       old_path = File.expand_path(File.join('~', '.puppetlabs', 'bolt', 'analytics.yaml'))
 
@@ -59,7 +62,7 @@ module Bolt
         if File.exist?(old_path)
           message = "Detected analytics configuration files at '#{old_path}' and '#{path}'. Loading "\
                     "analytics configuration from '#{path}'."
-          logger.warn(message)
+          Bolt::Logger.warn_once('duplicate_analytics', message)
         end
 
         path
@@ -70,12 +73,12 @@ module Bolt
       end
     end
 
-    def self.load_config(filename, logger)
+    def self.load_config(filename)
       if File.exist?(filename)
         Bolt::Util.read_optional_yaml_hash(filename, 'analytics')
       else
         unless ENV['BOLT_DISABLE_ANALYTICS']
-          logger.warn <<~ANALYTICS
+          Bolt::Logger.warn_once('analytics_opt_out', <<~ANALYTICS)
             Bolt collects data about how you use it. You can opt out of providing this data.
 
             To disable analytics data collection, add this line to ~/.puppetlabs/etc/bolt/analytics.yaml :
@@ -134,11 +137,23 @@ module Bolt
       end
 
       def report_bundled_content(mode, name)
-        if bundled_content[mode.split(' ').first]&.include?(name)
+        if bundled_content[mode.split.first]&.include?(name)
           event('Bundled Content', mode, label: name)
         end
       end
 
+      def plan_counts(plans_path)
+        pp_count, yaml_count = if File.exist?(plans_path)
+                                 %w[pp yaml].map do |extension|
+                                   Find.find(plans_path.to_s).grep(/.*\.#{extension}/).length
+                                 end
+                               else
+                                 [0, 0]
+                               end
+
+        { puppet_plan_count: pp_count, yaml_plan_count: yaml_count }
+      end
+
       def event(category, action, label: nil, value: nil, **kwargs)
         custom_dimensions = Bolt::Util.walk_keys(kwargs) do |k|
           CUSTOM_DIMENSIONS[k] || raise("Unknown analytics key '#{k}'")
@@ -224,6 +239,10 @@ module Bolt
 
       def report_bundled_content(mode, name); end
 
+      def plan_counts(_)
+        {}
+      end
+
       def event(category, action, **_kwargs)
         @logger.trace "Skipping submission of '#{category} #{action}' event because analytics is disabled"
       end

data/lib/bolt/apply_result.rb

@@ -96,9 +96,9 @@ module Bolt
       @target = target
       @value = {}
       @action = 'apply'
-      value['report'] = report if report
-      value['_error'] = error if error
-      value['_output'] = metrics_message if metrics_message
+      @value['report'] = report if report
+      @value['_error'] = error if error
+      @value['_output'] = metrics_message if metrics_message
     end
 
     def event_metrics

data/lib/bolt/bolt_option_parser.rb

@@ -6,14 +6,15 @@ require 'optparse'
 
 module Bolt
   class BoltOptionParser < OptionParser
+    PROJECT_PATHS = %w[project configfile boltdir].freeze
     OPTIONS = { inventory: %w[targets query rerun description],
                 authentication: %w[user password password-prompt private-key host-key-check ssl ssl-verify],
                 escalation: %w[run-as sudo-password sudo-password-prompt sudo-executable],
                 run_context: %w[concurrency inventoryfile save-rerun cleanup],
-                global_config_setters: %w[modulepath project configfile],
+                global_config_setters: PROJECT_PATHS + %w[modulepath],
                 transports: %w[transport connect-timeout tty native-ssh ssh-command copy-command],
                 display: %w[format color verbose trace],
-                global: %w[help version debug log-level] }.freeze
+                global: %w[help version debug log-level clear-cache] }.freeze
 
     ACTION_OPTS = OPTIONS.values.flatten.freeze
 
@@ -46,7 +47,8 @@ module Bolt
       when 'inventory'
         case action
         when 'show'
-          { flags: OPTIONS[:inventory] + OPTIONS[:global] + %w[format inventoryfile boltdir configfile detail],
+          { flags: OPTIONS[:inventory] + OPTIONS[:global] +
+            PROJECT_PATHS + %w[format inventoryfile detail],
             banner: INVENTORY_SHOW_HELP }
         else
           { flags: OPTIONS[:global],
@@ -55,7 +57,7 @@ module Bolt
       when 'group'
         case action
         when 'show'
-          { flags: OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[format inventoryfile],
             banner: GROUP_SHOW_HELP }
         else
           { flags: OPTIONS[:global],
@@ -67,13 +69,13 @@ module Bolt
       when 'module'
         case action
         when 'add'
-          { flags: OPTIONS[:global] + %w[configfile project],
+          { flags: OPTIONS[:global] + PROJECT_PATHS,
             banner: MODULE_ADD_HELP }
         when 'generate-types'
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
             banner: MODULE_GENERATETYPES_HELP }
         when 'install'
-          { flags: OPTIONS[:global] + %w[configfile force project resolve],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[force resolve],
             banner: MODULE_INSTALL_HELP }
         when 'show'
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
@@ -88,7 +90,7 @@ module Bolt
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
             banner: PLAN_CONVERT_HELP }
         when 'new'
-          { flags: OPTIONS[:global] + %w[configfile project pp],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[pp],
             banner: PLAN_NEW_HELP }
         when 'run'
           { flags: ACTION_OPTS + %w[params compile-concurrency tmpdir hiera-config],
@@ -106,7 +108,7 @@ module Bolt
           { flags: OPTIONS[:global] + %w[modules],
             banner: PROJECT_INIT_HELP }
         when 'migrate'
-          { flags: OPTIONS[:global] + %w[inventoryfile project configfile],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[inventoryfile],
             banner: PROJECT_MIGRATE_HELP }
         else
           { flags: OPTIONS[:global],
@@ -793,7 +795,10 @@ module Bolt
         @options[:noop] = true
       end
       define('--description DESCRIPTION',
-             'Description to use for the job') do |description|
+             'Deprecated. Description to use for the job') do |description|
+        msg = "Command line option '--description' is deprecated, and will be "\
+          "removed in Bolt 3.0."
+        @deprecations << { type: 'Using --description', msg: msg }
         @options[:description] = description
       end
       define('--params PARAMETERS',
@@ -873,13 +878,25 @@ module Bolt
           File.expand_path(moduledir)
         end
       end
-      define('--project PATH', '--boltdir PATH',
-             'Specify what project to load config from (default: autodiscovered from current working dir)') do |path|
+      define('--boltdir PATH',
+             'Deprecated. Specify what project to load config from (default:',
+             'autodiscovered from current working dir)') do |path|
+        msg = "Command line option '--boltdir' is deprecated, use '--project' instead."
+        @deprecations << { type: 'Using --boltdir', msg: msg }
         @options[:boltdir] = path
       end
+      define('--project PATH',
+             'Path to load the Bolt project from (default: autodiscovered from current dir)') do |path|
+        @options[:project] = path
+      end
       define('--configfile PATH',
-             'Specify where to load config from (default: ~/.puppetlabs/bolt/bolt.yaml).',
-             'Directory containing bolt.yaml will be used as the project directory.') do |path|
+             'Deprecated. Specify where to load config from (default:',
+             '~/.puppetlabs/bolt/bolt.yaml). Directory containing bolt.yaml will be',
+             'used as the project directory.') do |path|
+        msg = "Command line option '--configfile' is deprecated, and " \
+          "will be removed in Bolt 3.0. Use '--project' and provide the "\
+          "directory path instead."
+        @deprecations << { type: 'Using --configfile', msg: msg }
         @options[:configfile] = path
       end
       define('--hiera-config PATH',
@@ -891,12 +908,18 @@ module Bolt
         if ENV.include?(Bolt::Inventory::ENVIRONMENT_VAR)
           raise Bolt::CLIError, "Cannot pass inventory file when #{Bolt::Inventory::ENVIRONMENT_VAR} is set"
         end
-        @options[:inventoryfile] = Pathname.new(File.expand_path(path))
+        @options[:inventoryfile] = File.expand_path(path)
       end
       define('--puppetfile PATH',
-             'Specify a Puppetfile to use when installing modules. (default: ~/.puppetlabs/bolt/Puppetfile)',
+             'Deprecated. Specify a Puppetfile to use when installing modules.',
+             ' (default: ~/.puppetlabs/bolt/Puppetfile)',
              'Modules are installed in the current project.') do |path|
-        @options[:puppetfile_path] = Pathname.new(File.expand_path(path))
+        command = Bolt::Util.powershell? ? 'Update-BoltProject' : 'bolt project migrate'
+        msg = "Command line option '--puppetfile' is deprecated, and will be removed "\
+          "in Bolt 3.0. You can migrate to using the new module management "\
+          "workflow using '#{command}'."
+        @deprecations << { type: 'Using --puppetfile', msg: msg }
+        @options[:puppetfile_path] = File.expand_path(path)
       end
       define('--[no-]save-rerun', 'Whether to update the rerun file after this command.') do |save|
         @options[:'save-rerun'] = save
@@ -946,8 +969,8 @@ module Bolt
       end
 
       separator "\nPLAN OPTIONS"
-      define('--pp', 'Create a new Puppet language plan.') do |pp|
-        @options[:puppet] = pp
+      define('--pp', 'Create a new Puppet language plan.') do |_|
+        @options[:puppet] = true
       end
 
       separator "\nDISPLAY OPTIONS"
@@ -1002,6 +1025,10 @@ module Bolt
              "trace, debug, info, warn, error, fatal, any.") do |level|
         @options[:log] = { 'console' => { 'level' => level } }
       end
+      define('--clear-cache',
+             "Clear plugin cache before executing") do |_|
+        @options[:clear_cache] = true
+      end
       define('--plugin PLUGIN', 'Select the plugin to use') do |plug|
         @options[:plugin] = plug
       end

data/lib/bolt/cli.rb

@@ -21,7 +21,7 @@ require 'bolt/outputter'
 require 'bolt/pal'
 require 'bolt/plan_creator'
 require 'bolt/plugin'
-require 'bolt/project_migrator'
+require 'bolt/project_manager'
 require 'bolt/puppetdb'
 require 'bolt/rerun'
 require 'bolt/secret'
@@ -30,6 +30,7 @@ require 'bolt/version'
 
 module Bolt
   class CLIExit < StandardError; end
+
   class CLI
     COMMANDS = {
       'command'    => %w[run],
@@ -164,8 +165,9 @@ module Bolt
                 elsif options[:configfile]
                   Bolt::Config.from_file(options[:configfile], options)
                 else
-                  project = if options[:boltdir]
-                              dir = Pathname.new(options[:boltdir])
+                  cli_flag = options[:project] || options[:boltdir]
+                  project = if cli_flag
+                              dir = Pathname.new(cli_flag)
                               if (dir + Bolt::Project::BOLTDIR_NAME).directory?
                                 Bolt::Project.create_project(dir + Bolt::Project::BOLTDIR_NAME)
                               else
@@ -195,7 +197,12 @@ module Bolt
       @parser_deprecations.each { |dep| Bolt::Logger.deprecation_warning(dep[:type], dep[:msg]) }
       config.deprecations.each { |dep| Bolt::Logger.deprecation_warning(dep[:type], dep[:msg]) }
 
+      if options[:clear_cache] && File.exist?(config.project.cache_file)
+        FileUtils.rm(config.project.cache_file)
+      end
+
       warn_inventory_overrides_cli(options)
+      validate_ps_version
 
       options
     rescue Bolt::Error => e
@@ -203,6 +210,20 @@ module Bolt
       raise e
     end
 
+    private def validate_ps_version
+      if Bolt::Util.powershell?
+        command = "powershell.exe -NoProfile -NonInteractive -NoLogo -ExecutionPolicy "\
+                  "Bypass -Command $PSVersionTable.PSVersion.Major"
+        stdout, _stderr, _status = Open3.capture3(command)
+
+        return unless !stdout.empty? && stdout.to_i < 3
+
+        msg = "Detected PowerShell 2 on controller. PowerShell 2 is deprecated and "\
+              "support will be removed in Bolt 3.0."
+        Bolt::Logger.deprecation_warning("PowerShell 2 controller", msg)
+      end
+    end
+
     def update_targets(options)
       target_opts = options.keys.select { |opt| %i[query rerun targets].include?(opt) }
       target_string = "'--targets', '--rerun', or '--query'"
@@ -293,7 +314,7 @@ module Bolt
               "Unknown argument(s) #{options[:leftovers].join(', ')}"
       end
 
-      if options[:boltdir] && options[:configfile]
+      if options.slice(:boltdir, :configfile, :project).length > 1
         raise Bolt::CLIError, "Only one of '--boltdir', '--project', or '--configfile' may be specified"
       end
 
@@ -340,15 +361,10 @@ module Bolt
     def warn_inventory_overrides_cli(opts)
       inventory_source = if ENV[Bolt::Inventory::ENVIRONMENT_VAR]
                            Bolt::Inventory::ENVIRONMENT_VAR
-                         elsif config.inventoryfile && Bolt::Util.file_stat(config.inventoryfile)
+                         elsif config.inventoryfile
                            config.inventoryfile
-                         else
-                           begin
-                             Bolt::Util.file_stat(config.default_inventoryfile)
-                             config.default_inventoryfile
-                           rescue Errno::ENOENT
-                             nil
-                           end
+                         elsif File.exist?(config.default_inventoryfile)
+                           config.default_inventoryfile
                          end
 
       inventory_cli_opts = %i[authentication escalation transports].each_with_object([]) do |key, acc|
@@ -392,7 +408,7 @@ module Bolt
         output_format: config.format,
         # For continuity
         boltdir_type: config.project.type
-      }
+      }.merge!(analytics.plan_counts(config.project.plans_path))
 
       # Only include target and inventory info for commands that take a targets
       # list. This avoids loading inventory for commands that don't need it.
@@ -456,15 +472,14 @@ module Bolt
       when 'project'
         case options[:action]
         when 'init'
-          code = initialize_project
+          code = Bolt::ProjectManager.new(config, outputter, pal)
+                                     .create(Dir.pwd, options[:object], options[:modules])
         when 'migrate'
-          code = Bolt::ProjectMigrator.new(config, outputter).migrate
+          code = Bolt::ProjectManager.new(config, outputter, pal).migrate
         end
       when 'plan'
         case options[:action]
         when 'new'
-          command = Bolt::Util.powershell? ? 'New-BoltPlan' : 'bolt plan new'
-          @logger.warn("Command '#{command}' is experimental and subject to changes.")
           plan_name = options[:object]
 
           # If this passes validation, it will return the path to the plan to create
@@ -479,9 +494,9 @@ module Bolt
       when 'module'
         case options[:action]
         when 'add'
-          code = add_project_module(options[:object], config.project)
+          code = add_project_module(options[:object], config.project, config.module_install)
         when 'install'
-          code = install_project_modules(config.project, options[:force], options[:resolve])
+          code = install_project_modules(config.project, config.module_install, options[:force], options[:resolve])
         when 'generate-types'
           code = generate_types
         end
@@ -526,12 +541,15 @@ module Bolt
               validate_file('script', script)
               executor.run_script(targets, script, options[:leftovers], executor_opts)
             when 'task'
-              pal.run_task(options[:object],
-                           targets,
-                           options[:task_options],
-                           executor,
-                           inventory,
-                           options[:description])
+              r = outputter.spin do
+                pal.run_task(options[:object],
+                             targets,
+                             options[:task_options],
+                             executor,
+                             inventory,
+                             options[:description])
+              end
+              r
             when 'file'
               src = options[:object]
               dest = options[:leftovers].first
@@ -666,7 +684,9 @@ module Bolt
 
       executor.subscribe(log_outputter)
       executor.start_plan(plan_context)
-      result = pal.run_plan(plan_name, plan_arguments, executor, inventory, puppetdb_client)
+      result = outputter.spin do
+        pal.run_plan(plan_name, plan_arguments, executor, inventory, puppetdb_client)
+      end
 
       # If a non-bolt exception bubbles up the plan won't get finished
       executor.finish_plan(result)
@@ -729,79 +749,9 @@ module Bolt
       0
     end
 
-    # Initializes a specified directory as a Bolt project and installs any modules
-    # specified by the user, along with their dependencies
-    def initialize_project
-      # Dir.pwd will return backslashes on Windows, but Pathname always uses
-      # forward slashes to concatenate paths. This results in paths like
-      # C:\User\Administrator/modules, which fail module install. This ensure
-      # forward slashes in the cwd path.
-      dir = File.expand_path(Dir.pwd)
-      name = options[:object] || File.basename(dir)
-      if name !~ Bolt::Module::MODULE_NAME_REGEX
-        if options[:object]
-          raise Bolt::ValidationError, "The provided project name '#{name}' is invalid; "\
-            "project name must begin with a lowercase letter and can include lowercase "\
-            "letters, numbers, and underscores."
-        else
-          command = Bolt::Util.powershell? ? 'New-BoltProject -Name <NAME>' : 'bolt project init <NAME>'
-          raise Bolt::ValidationError, "The current directory name '#{name}' is an invalid "\
-            "project name. Please specify a name using '#{command}'."
-        end
-      end
-
-      project    = Pathname.new(dir)
-      old_config = project + 'bolt.yaml'
-      config     = project + 'bolt-project.yaml'
-      puppetfile = project + 'Puppetfile'
-      moduledir  = project + 'modules'
-
-      # Warn the user if the project directory already exists. We don't error
-      # here since users might not have installed any modules yet. If both
-      # bolt.yaml and bolt-project.yaml exist, this will just warn about
-      # bolt-project.yaml and subsequent Bolt actions will warn about both files
-      # existing.
-      if config.exist?
-        @logger.warn "Found existing project directory at #{project}. Skipping file creation."
-      elsif old_config.exist?
-        @logger.warn "Found existing #{old_config.basename} at #{project}. "\
-                    "#{old_config.basename} is deprecated, please rename to #{config.basename}."
-      end
-
-      # If modules were specified, first check if there is already a Puppetfile
-      # at the project directory, erroring if there is. If there is no
-      # Puppetfile, install the specified modules. The module installer will
-      # resolve dependencies, generate a Puppetfile, and install the modules.
-      if options[:modules]
-        if puppetfile.exist?
-          raise Bolt::CLIError,
-                "Found existing Puppetfile at #{puppetfile}, unable to initialize "\
-                "project with modules."
-        end
-
-        installer = Bolt::ModuleInstaller.new(outputter, pal)
-        installer.install(options[:modules], puppetfile, moduledir)
-      end
-
-      # If either bolt.yaml or bolt-project.yaml exist, the user has already
-      # been warned and we can just finish project creation. Otherwise, create a
-      # bolt-project.yaml with the project name in it.
-      unless config.exist? || old_config.exist?
-        begin
-          content = { 'name' => name }
-          File.write(config.to_path, content.to_yaml)
-          outputter.print_message "Successfully created Bolt project at #{project}"
-        rescue StandardError => e
-          raise Bolt::FileError.new("Could not create bolt-project.yaml at #{project}: #{e.message}", nil)
-        end
-      end
-
-      0
-    end
-
     # Installs modules declared in the project configuration file.
     #
-    def install_project_modules(project, force, resolve)
+    def install_project_modules(project, config, force, resolve)
       assert_project_file(project)
       assert_puppetfile_or_module_command(project.modules)
 
@@ -811,30 +761,55 @@ module Bolt
         return 0
       end
 
+      if resolve != false && config.any?
+        @logger.warn(
+          "Detected configuration for 'module-install'. This configuration is currently "\
+          "only supported when installing modules, not when resolving module dependencies. "\
+          "For more information, see https://pup.pt/bolt-module-install"
+        )
+      end
+
+      modules   = project.modules || []
       installer = Bolt::ModuleInstaller.new(outputter, pal)
 
-      ok = installer.install(project.modules,
-                             project.puppetfile,
-                             project.managed_moduledir,
-                             force: force,
-                             resolve: resolve)
+      ok = outputter.spin do
+        installer.install(modules,
+                          project.puppetfile,
+                          project.managed_moduledir,
+                          config,
+                          force: force,
+                          resolve: resolve)
+      end
+
       ok ? 0 : 1
     end
 
     # Adds a single module to the project.
     #
-    def add_project_module(name, project)
+    def add_project_module(name, project, config)
       assert_project_file(project)
       assert_puppetfile_or_module_command(project.modules)
 
+      if config.any?
+        @logger.warn(
+          "Detected configuration for 'module-install'. This configuration is currently "\
+          "only supported when installing modules, not when resolving module dependencies. "\
+          "For more information, see https://pup.pt/bolt-module-install"
+        )
+      end
+
       modules   = project.modules || []
       installer = Bolt::ModuleInstaller.new(outputter, pal)
 
-      ok = installer.add(name,
-                         modules,
-                         project.puppetfile,
-                         project.managed_moduledir,
-                         project.project_file)
+      ok = outputter.spin do
+        installer.add(name,
+                      modules,
+                      project.puppetfile,
+                      project.managed_moduledir,
+                      project.project_file,
+                      config)
+      end
+
       ok ? 0 : 1
     end
 
@@ -863,7 +838,10 @@ module Bolt
 
       outputter.print_message("Installing modules from Puppetfile")
       installer = Bolt::ModuleInstaller.new(outputter, pal)
-      ok = installer.install_puppetfile(puppetfile, moduledir, puppetfile_config)
+      ok = outputter.spin do
+        installer.install_puppetfile(puppetfile, moduledir, puppetfile_config)
+      end
+
       ok ? 0 : 1
     end
 
@@ -969,7 +947,11 @@ module Bolt
     end
 
     def outputter
-      @outputter ||= Bolt::Outputter.for_format(config.format, config.color, options[:verbose], config.trace)
+      @outputter ||= Bolt::Outputter.for_format(config.format,
+                                                config.color,
+                                                options[:verbose],
+                                                config.trace,
+                                                config.spinner)
     end
 
     def log_outputter