bolt 3.15.0 → 3.18.0

data/lib/bolt/bolt_option_parser.rb

@@ -897,7 +897,7 @@ module Bolt
       end
       define('--params PARAMETERS',
              "Parameters to a task or plan as json, a json file '@<file>', or on stdin '-'.") do |params|
-        @options[:task_options] = parse_params(params)
+        @options[:params] = parse_params(params)
       end
       define('-e', '--execute CODE',
              "Puppet manifest code to apply to the targets.") do |code|
@@ -1042,6 +1042,21 @@ module Bolt
       define('--pp', 'Create a new Puppet language plan.') do |_|
         @options[:puppet] = true
       end
+      define('--script SCRIPT', 'Create a new plan that wraps a script.') do |path|
+        # If the path is a relative, absolute, or not a scripts path, raise an
+        # error. This flag is intended to be used to create shareable plans.
+        #
+        # This also limits valid mounts to files and scripts, which we may want
+        # to expand in the future.
+        if File.exist?(path) || Pathname.new(path).absolute? ||
+           !%w[scripts files].include?(path.split(File::SEPARATOR)[1])
+          raise Bolt::CLIError, "The script must be a detailed Puppet file reference, " \
+            "for example 'mymodule/scripts/myscript.sh'. See http://pup.pt/bolt-scripts for " \
+            "more information on detailed Puppet file references."
+        end
+
+        @options[:plan_script] = path
+      end
 
       separator "\n#{self.class.colorize(:cyan, 'Display options')}"
       define('--filter FILTER', 'Filter tasks and plans by a matching substring.') do |filter|
@@ -1086,8 +1101,7 @@ module Bolt
         @options[:help] = true
       end
       define('--version', 'Display the version.') do |_|
-        puts Bolt::VERSION
-        raise Bolt::CLIExit
+        @options[:version] = true
       end
       define('--log-level LEVEL',
              "Set the log level for the console. Available options are",
@@ -1130,5 +1144,15 @@ module Bolt
     rescue JSON::ParserError => e
       raise Bolt::CLIError, "Unable to parse --params value as JSON: #{e}"
     end
+
+    def permute(args)
+      super(args)
+    rescue OptionParser::MissingArgument => e
+      raise Bolt::CLIError, "Option '#{e.args.first}' needs a parameter"
+    rescue OptionParser::InvalidArgument => e
+      raise Bolt::CLIError, "Invalid parameter specified for option '#{e.args.first}': #{e.args[1]}"
+    rescue OptionParser::InvalidOption, OptionParser::AmbiguousOption => e
+      raise Bolt::CLIError, "Unknown argument '#{e.args.first}'"
+    end
   end
 end

data/lib/bolt/catalog.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'bolt/apply_inventory'
-require 'bolt/apply_target'
-require 'bolt/config'
-require 'bolt/error'
-require 'bolt/inventory'
-require 'bolt/pal'
-require 'bolt/puppetdb'
-require 'bolt/util'
+require_relative '../bolt/apply_inventory'
+require_relative '../bolt/apply_target'
+require_relative '../bolt/config'
+require_relative '../bolt/error'
+require_relative '../bolt/inventory'
+require_relative '../bolt/pal'
+require_relative '../bolt/puppetdb'
+require_relative '../bolt/util'
 
 Bolt::PAL.load_puppet
 
-require 'bolt/catalog/logging'
+require_relative 'catalog/logging'
 
 module Bolt
   class Catalog
@@ -65,8 +65,7 @@ module Bolt
       puppet_overrides = {
         bolt_pdb_client: pdb_client,
         bolt_inventory: inv,
-        bolt_project: bolt_project,
-        future: request['future']
+        bolt_project: bolt_project
       }
 
       # Facts will be set by the catalog compiler, so we need to ensure