bolt 0.20.7 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a5c8ec4cf105ece549f43ed95bcaed30df97d8
-  data.tar.gz: 0b28cbab7855f68ef4ab9c797bf596e3313becf7
+  metadata.gz: 563c0acfed40d50d62d19a1c3d8acc4ea7ff04ed
+  data.tar.gz: 2233c30b95d4cf03e68a131cfe4e83ea527f720f
 SHA512:
-  metadata.gz: 467977c61d4c83051978526cba46de367c0626dd4b3a11cb7030faeebd914b8094a66552537a4637c4fdbce2346c571f319a38be69fa29b8d3dadaed14fe14bb
-  data.tar.gz: 00834ae333d3d0cb4cd3e5b67c22f53811fe6c4c2d89de1a20e72bd749db697140511045a405f3f0e2320aa8338c238dff7c4bf3fb3adf9c3401048a8ae7f539
+  metadata.gz: 94354f851af225ecd5ecc5123fee0aca0844d947685596d605e33f81543a8c5b071e30b2bcf4e872ab188e194dbec13b69dc8850de3761b02604ef2c1f49b997
+  data.tar.gz: 3d9e1463227a2c4ac4d0e80d6c1475e65b299f16d6371bef210f2dcbd090054a78d1590f54358fea416fdf812a7889890fb37b02ad835da81cc6d67b76046de4

data/lib/bolt/analytics.rb

@@ -18,7 +18,8 @@ module Bolt
       operating_system: :cd1,
       inventory_nodes: :cd2,
       inventory_groups: :cd3,
-      target_nodes: :cd4
+      target_nodes: :cd4,
+      output_format: :cd5
     }.freeze
 
     def self.build_client

data/lib/bolt/bolt_option_parser.rb

@@ -0,0 +1,292 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+module Bolt
+  class BoltOptionParser < OptionParser
+    def self.examples(cmd, desc)
+      <<-EXAMP
+#{desc} a Windows host via WinRM, providing for the password
+  bolt #{cmd} -n winrm://winhost -u Administrator -p
+#{desc} the local machine, a Linux host via SSH, and hosts from a group specified in an inventory file
+  bolt #{cmd} -n localhost,nixhost,node_group
+#{desc} Windows hosts queried from PuppetDB via WinRM as a domain user, prompting for the password
+  bolt #{cmd} -q 'inventory[certname] { facts.os.family = "windows" }' --transport winrm -u 'domain\\Administrator' -p
+EXAMP
+    end
+
+    BANNER = <<-HELP
+Usage: bolt <subcommand> <action> [options]
+
+Available subcommands:
+  bolt command run <command>       Run a command remotely
+  bolt file upload <src> <dest>    Upload a local file
+  bolt script run <script>         Upload a local script and run it remotely
+  bolt task show                   Show list of available tasks
+  bolt task show <task>            Show documentation for task
+  bolt task run <task> [params]    Run a Puppet task
+  bolt plan show                   Show list of available plans
+  bolt plan show <plan>            Show details for plan
+  bolt plan run <plan> [params]    Run a Puppet task plan
+
+Run `bolt <subcommand> --help` to view specific examples.
+
+where [options] are:
+    HELP
+
+    TASK_HELP = <<-HELP
+Usage: bolt task <action> <task> [options] [parameters]
+
+Available actions are:
+  show                             Show list of available tasks
+  show <task>                      Show documentation for task
+  run                              Run a Puppet task
+
+Parameters are of the form <parameter>=<value>.
+
+#{examples('task run facts', 'run facter on')}
+Available options are:
+    HELP
+
+    COMMAND_HELP = <<-HELP
+Usage: bolt command <action> <command> [options]
+
+Available actions are:
+  run                              Run a command remotely
+
+#{examples('command run hostname', 'run hostname on')}
+Available options are:
+    HELP
+
+    SCRIPT_HELP = <<-HELP
+Usage: bolt script <action> <script> [[arg1] ... [argN]] [options]
+
+Available actions are:
+  run                              Upload a local script and run it remotely
+
+#{examples('script run my_script.ps1 some args', 'run a script on')}
+Available options are:
+    HELP
+
+    PLAN_HELP = <<-HELP
+Usage: bolt plan <action> <plan> [options] [parameters]
+
+Available actions are:
+  show                             Show list of available plans
+  show <plan>                      Show details for plan
+  run                              Run a Puppet task plan
+
+Parameters are of the form <parameter>=<value>.
+
+#{examples('plan run canary command=hostname', 'run the canary plan on')}
+Available options are:
+    HELP
+
+    FILE_HELP = <<-HELP
+Usage: bolt file <action> [options]
+
+Available actions are:
+  upload <src> <dest>              Upload local file <src> to <dest> on each node
+
+#{examples('file upload /tmp/source /etc/profile.d/login.sh', 'upload a file to')}
+Available options are:
+    HELP
+
+    # A helper mixin for OptionParser::Switch instances which will allow
+    # us to show/hide particular switch in the help message produced by
+    # the OptionParser#help method on demand.
+    module SwitchHider
+      attr_accessor :hide
+
+      def summarize(*args)
+        return self if hide
+        super
+      end
+    end
+
+    def initialize(options)
+      super()
+
+      @options = options
+
+      @nodes = define('-n', '--nodes NODES',
+                      'Identifies the nodes to target.',
+                      'Enter a comma-separated list of node URIs or group names.',
+                      "Or read a node list from an input file '@<file>' or stdin '-'.",
+                      'Example: --nodes localhost,node_group,ssh://nix.com:23,winrm://windows.puppet.com',
+                      'URI format is [protocol://]host[:port]',
+                      "SSH is the default protocol; may be #{TRANSPORTS.keys.join(', ')}",
+                      'For Windows nodes, specify the winrm:// protocol if it has not be configured',
+                      'For SSH, port defaults to `22`',
+                      'For WinRM, port defaults to `5985` or `5986` based on the --[no-]ssl setting') do |nodes|
+        @options[:nodes] << get_arg_input(nodes)
+      end.extend(SwitchHider)
+      @query = define('-q', '--query QUERY', 'Query PuppetDB to determine the targets') do |query|
+        @options[:query] = query
+      end.extend(SwitchHider)
+      define('--noop', 'Execute a task that supports it in noop mode') do |_|
+        @options[:noop] = true
+      end
+      define('--description DESCRIPTION',
+             'Description to use for the job') do |description|
+        @options[:description] = description
+      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)
+      end
+
+      separator 'Authentication:'
+      define('-u', '--user USER', 'User to authenticate as') do |user|
+        @options[:user] = user
+      end
+      define('-p', '--password [PASSWORD]',
+             'Password to authenticate with. Omit the value to prompt for the password.') do |password|
+        if password.nil?
+          STDOUT.print "Please enter your password: "
+          @options[:password] = STDIN.noecho(&:gets).chomp
+          STDOUT.puts
+        else
+          @options[:password] = password
+        end
+      end
+      define('--private-key KEY', 'Private ssh key to authenticate with') do |key|
+        @options[:'private-key'] = key
+      end
+      define('--[no-]host-key-check', 'Check host keys with SSH') do |host_key_check|
+        @options[:'host-key-check'] = host_key_check
+      end
+      define('--[no-]ssl', 'Use SSL with WinRM') do |ssl|
+        @options[:ssl] = ssl
+      end
+      define('--[no-]ssl-verify', 'Verify remote host SSL certificate with WinRM') do |ssl_verify|
+        @options[:'ssl-verify'] = ssl_verify
+      end
+
+      separator 'Escalation:'
+      define('--run-as USER', 'User to run as using privilege escalation') do |user|
+        @options[:'run-as'] = user
+      end
+      define('--sudo-password [PASSWORD]',
+             'Password for privilege escalation. Omit the value to prompt for the password.') do |password|
+        if password.nil?
+          STDOUT.print "Please enter your privilege escalation password: "
+          @options[:'sudo-password'] = STDIN.noecho(&:gets).chomp
+          STDOUT.puts
+        else
+          @options[:'sudo-password'] = password
+        end
+      end
+
+      separator 'Run context:'
+      define('-c', '--concurrency CONCURRENCY', Integer,
+             'Maximum number of simultaneous connections (default: 100)') do |concurrency|
+        @options[:concurrency] = concurrency
+      end
+      define('--modulepath MODULES',
+             "List of directories containing modules, separated by '#{File::PATH_SEPARATOR}'") do |modulepath|
+        @options[:modulepath] = modulepath.split(File::PATH_SEPARATOR)
+      end
+      define('--boltdir FILEPATH',
+             'Specify what Boltdir to load config from (default: autodiscovered from current working dir)') do |path|
+        @options[:configfile] = path
+      end
+      define('--configfile FILEPATH',
+             'Specify where to load config from (default: ~/.puppetlabs/bolt/bolt.yaml)') do |path|
+        @options[:configfile] = path
+      end
+      define('--inventoryfile FILEPATH',
+             'Specify where to load inventory from (default: ~/.puppetlabs/bolt/inventory.yaml)') do |path|
+        if ENV.include?(Bolt::Inventory::ENVIRONMENT_VAR)
+          raise Bolt::CLIError, "Cannot pass inventory file when #{Bolt::Inventory::ENVIRONMENT_VAR} is set"
+        end
+        @options[:inventoryfile] = path
+      end
+
+      separator 'Transports:'
+      define('--transport TRANSPORT', TRANSPORTS.keys.map(&:to_s),
+             "Specify a default transport: #{TRANSPORTS.keys.join(', ')}") do |t|
+        @options[:transport] = t
+      end
+      define('--connect-timeout TIMEOUT', Integer, 'Connection timeout (defaults vary)') do |timeout|
+        @options[:'connect-timeout'] = timeout
+      end
+      define('--[no-]tty', 'Request a pseudo TTY on nodes that support it') do |tty|
+        @options[:tty] = tty
+      end
+      define('--tmpdir DIR', 'The directory to upload and execute temporary files on the target') do |tmpdir|
+        @options[:tmpdir] = tmpdir
+      end
+
+      separator 'Display:'
+      define('--format FORMAT', 'Output format to use: human or json') do |format|
+        @options[:format] = format
+      end
+      define('--[no-]color', 'Whether to show output in color') do |color|
+        @options[:color] = color
+      end
+      define('-h', '--help', 'Display help') do |_|
+        @options[:help] = true
+      end
+      define('--verbose', 'Display verbose logging') do |_|
+        @options[:verbose] = true
+      end
+      define('--debug', 'Display debug logging') do |_|
+        @options[:debug] = true
+      end
+      define('--version', 'Display the version') do |_|
+        puts Bolt::VERSION
+        raise Bolt::CLIExit
+      end
+
+      update
+    end
+
+    def update
+      # show the --nodes and --query switches by default
+      @nodes.hide = @query.hide = false
+
+      # Update the banner according to the mode
+      self.banner = case @options[:mode]
+                    when 'plan'
+                      # don't show the --nodes and --query switches in the plan help
+                      @nodes.hide = @query.hide = true
+                      PLAN_HELP
+                    when 'command'
+                      COMMAND_HELP
+                    when 'script'
+                      SCRIPT_HELP
+                    when 'task'
+                      TASK_HELP
+                    when 'file'
+                      FILE_HELP
+                    else
+                      BANNER
+                    end
+    end
+
+    def parse_params(params)
+      json = get_arg_input(params)
+      JSON.parse(json)
+    rescue JSON::ParserError => err
+      raise Bolt::CLIError, "Unable to parse --params value as JSON: #{err}"
+    end
+
+    def get_arg_input(value)
+      if value.start_with?('@')
+        file = value.sub(/^@/, '')
+        read_arg_file(file)
+      elsif value == '-'
+        STDIN.read
+      else
+        value
+      end
+    end
+
+    def read_arg_file(file)
+      File.read(file)
+    rescue StandardError => err
+      raise Bolt::FileError.new("Error attempting to read #{file}: #{err}", file)
+    end
+  end
+end

data/lib/bolt/cli.rb

@@ -7,6 +7,7 @@ require 'io/console'
 require 'logging'
 require 'optparse'
 require 'bolt/analytics'
+require 'bolt/bolt_option_parser'
 require 'bolt/config'
 require 'bolt/error'
 require 'bolt/executor'
@@ -20,298 +21,8 @@ require 'bolt/version'
 require 'bolt/util/on_access'
 
 module Bolt
-  class CLIError < Bolt::Error
-    def initialize(msg)
-      super(msg, "bolt/cli-error")
-    end
-  end
-
   class CLIExit < StandardError; end
-
   class CLI
-    class BoltOptionParser < OptionParser
-      def self.examples(cmd, desc)
-        <<-EXAMP
-#{desc} a Windows host via WinRM, providing for the password
-    bolt #{cmd} -n winrm://winhost -u Administrator -p
-#{desc} the local machine, a Linux host via SSH, and hosts from a group specified in an inventory file
-    bolt #{cmd} -n localhost,nixhost,node_group
-#{desc} Windows hosts queried from PuppetDB via WinRM as a domain user, prompting for the password
-    bolt #{cmd} -q 'inventory[certname] { facts.os.family = "windows" }' --transport winrm -u 'domain\\Administrator' -p
-EXAMP
-      end
-
-      BANNER = <<-HELP
-Usage: bolt <subcommand> <action> [options]
-
-Available subcommands:
-    bolt command run <command>       Run a command remotely
-    bolt file upload <src> <dest>    Upload a local file
-    bolt script run <script>         Upload a local script and run it remotely
-    bolt task show                   Show list of available tasks
-    bolt task show <task>            Show documentation for task
-    bolt task run <task> [params]    Run a Puppet task
-    bolt plan show                   Show list of available plans
-    bolt plan show <plan>            Show details for plan
-    bolt plan run <plan> [params]    Run a Puppet task plan
-
-Run `bolt <subcommand> --help` to view specific examples.
-
-where [options] are:
-      HELP
-
-      TASK_HELP = <<-HELP
-Usage: bolt task <action> <task> [options] [parameters]
-
-Available actions are:
-    show                             Show list of available tasks
-    show <task>                      Show documentation for task
-    run                              Run a Puppet task
-
-Parameters are of the form <parameter>=<value>.
-
-#{examples('task run facts', 'run facter on')}
-Available options are:
-      HELP
-
-      COMMAND_HELP = <<-HELP
-Usage: bolt command <action> <command> [options]
-
-Available actions are:
-    run                              Run a command remotely
-
-#{examples('command run hostname', 'run hostname on')}
-Available options are:
-      HELP
-
-      SCRIPT_HELP = <<-HELP
-Usage: bolt script <action> <script> [[arg1] ... [argN]] [options]
-
-Available actions are:
-    run                              Upload a local script and run it remotely
-
-#{examples('script run my_script.ps1 some args', 'run a script on')}
-Available options are:
-      HELP
-
-      PLAN_HELP = <<-HELP
-Usage: bolt plan <action> <plan> [options] [parameters]
-
-Available actions are:
-    show                             Show list of available plans
-    show <plan>                      Show details for plan
-    run                              Run a Puppet task plan
-
-Parameters are of the form <parameter>=<value>.
-
-#{examples('plan run canary command=hostname', 'run the canary plan on')}
-Available options are:
-      HELP
-
-      FILE_HELP = <<-HELP
-Usage: bolt file <action> [options]
-
-Available actions are:
-    upload <src> <dest>              Upload local file <src> to <dest> on each node
-
-#{examples('file upload /tmp/source /etc/profile.d/login.sh', 'upload a file to')}
-Available options are:
-      HELP
-
-      # A helper mixin for OptionParser::Switch instances which will allow
-      # us to show/hide particular switch in the help message produced by
-      # the OptionParser#help method on demand.
-      module SwitchHider
-        attr_accessor :hide
-
-        def summarize(*args)
-          return self if hide
-          super
-        end
-      end
-
-      def initialize(options)
-        super()
-
-        @options = options
-
-        @nodes = define('-n', '--nodes NODES',
-                        'Identifies the nodes to target.',
-                        'Enter a comma-separated list of node URIs or group names.',
-                        "Or read a node list from an input file '@<file>' or stdin '-'.",
-                        'Example: --nodes localhost,node_group,ssh://nix.com:23,winrm://windows.puppet.com',
-                        'URI format is [protocol://]host[:port]',
-                        "SSH is the default protocol; may be #{TRANSPORTS.keys.join(', ')}",
-                        'For Windows nodes, specify the winrm:// protocol if it has not be configured',
-                        'For SSH, port defaults to `22`',
-                        'For WinRM, port defaults to `5985` or `5986` based on the --[no-]ssl setting') do |nodes|
-          @options[:nodes] << get_arg_input(nodes)
-        end.extend(SwitchHider)
-        @query = define('-q', '--query QUERY', 'Query PuppetDB to determine the targets') do |query|
-          @options[:query] = query
-        end.extend(SwitchHider)
-        define('--noop', 'Execute a task that supports it in noop mode') do |_|
-          @options[:noop] = true
-        end
-        define('--description DESCRIPTION',
-               'Description to use for the job') do |description|
-          @options[:description] = description
-        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)
-        end
-
-        separator 'Authentication:'
-        define('-u', '--user USER', 'User to authenticate as') do |user|
-          @options[:user] = user
-        end
-        define('-p', '--password [PASSWORD]',
-               'Password to authenticate with. Omit the value to prompt for the password.') do |password|
-          if password.nil?
-            STDOUT.print "Please enter your password: "
-            @options[:password] = STDIN.noecho(&:gets).chomp
-            STDOUT.puts
-          else
-            @options[:password] = password
-          end
-        end
-        define('--private-key KEY', 'Private ssh key to authenticate with') do |key|
-          @options[:'private-key'] = key
-        end
-        define('--[no-]host-key-check', 'Check host keys with SSH') do |host_key_check|
-          @options[:'host-key-check'] = host_key_check
-        end
-        define('--[no-]ssl', 'Use SSL with WinRM') do |ssl|
-          @options[:ssl] = ssl
-        end
-        define('--[no-]ssl-verify', 'Verify remote host SSL certificate with WinRM') do |ssl_verify|
-          @options[:'ssl-verify'] = ssl_verify
-        end
-
-        separator 'Escalation:'
-        define('--run-as USER', 'User to run as using privilege escalation') do |user|
-          @options[:'run-as'] = user
-        end
-        define('--sudo-password [PASSWORD]',
-               'Password for privilege escalation. Omit the value to prompt for the password.') do |password|
-          if password.nil?
-            STDOUT.print "Please enter your privilege escalation password: "
-            @options[:'sudo-password'] = STDIN.noecho(&:gets).chomp
-            STDOUT.puts
-          else
-            @options[:'sudo-password'] = password
-          end
-        end
-
-        separator 'Run context:'
-        define('-c', '--concurrency CONCURRENCY', Integer,
-               'Maximum number of simultaneous connections (default: 100)') do |concurrency|
-          @options[:concurrency] = concurrency
-        end
-        define('--modulepath MODULES',
-               "List of directories containing modules, separated by '#{File::PATH_SEPARATOR}'") do |modulepath|
-          @options[:modulepath] = modulepath.split(File::PATH_SEPARATOR)
-        end
-        define('--configfile FILEPATH',
-               'Specify where to load config from (default: ~/.puppetlabs/bolt.yaml)') do |path|
-          @options[:configfile] = path
-        end
-        define('--inventoryfile FILEPATH',
-               'Specify where to load inventory from (default: ~/.puppetlabs/bolt/inventory.yaml)') do |path|
-          if ENV.include?(Bolt::Inventory::ENVIRONMENT_VAR)
-            raise Bolt::CLIError, "Cannot pass inventory file when #{Bolt::Inventory::ENVIRONMENT_VAR} is set"
-          end
-          @options[:inventoryfile] = path
-        end
-
-        separator 'Transports:'
-        define('--transport TRANSPORT', TRANSPORTS.keys.map(&:to_s),
-               "Specify a default transport: #{TRANSPORTS.keys.join(', ')}") do |t|
-          @options[:transport] = t
-        end
-        define('--connect-timeout TIMEOUT', Integer, 'Connection timeout (defaults vary)') do |timeout|
-          @options[:'connect-timeout'] = timeout
-        end
-        define('--[no-]tty', 'Request a pseudo TTY on nodes that support it') do |tty|
-          @options[:tty] = tty
-        end
-        define('--tmpdir DIR', 'The directory to upload and execute temporary files on the target') do |tmpdir|
-          @options[:tmpdir] = tmpdir
-        end
-
-        separator 'Display:'
-        define('--format FORMAT', 'Output format to use: human or json') do |format|
-          @options[:format] = format
-        end
-        define('--[no-]color', 'Whether to show output in color') do |color|
-          @options[:color] = color
-        end
-        define('-h', '--help', 'Display help') do |_|
-          @options[:help] = true
-        end
-        define('--verbose', 'Display verbose logging') do |_|
-          @options[:verbose] = true
-        end
-        define('--debug', 'Display debug logging') do |_|
-          @options[:debug] = true
-        end
-        define('--version', 'Display the version') do |_|
-          puts Bolt::VERSION
-          raise Bolt::CLIExit
-        end
-
-        update
-      end
-
-      def update
-        # show the --nodes and --query switches by default
-        @nodes.hide = @query.hide = false
-
-        # Update the banner according to the mode
-        self.banner = case @options[:mode]
-                      when 'plan'
-                        # don't show the --nodes and --query switches in the plan help
-                        @nodes.hide = @query.hide = true
-                        PLAN_HELP
-                      when 'command'
-                        COMMAND_HELP
-                      when 'script'
-                        SCRIPT_HELP
-                      when 'task'
-                        TASK_HELP
-                      when 'file'
-                        FILE_HELP
-                      else
-                        BANNER
-                      end
-      end
-
-      def parse_params(params)
-        json = get_arg_input(params)
-        JSON.parse(json)
-      rescue JSON::ParserError => err
-        raise Bolt::CLIError, "Unable to parse --params value as JSON: #{err}"
-      end
-
-      def get_arg_input(value)
-        if value.start_with?('@')
-          file = value.sub(/^@/, '')
-          read_arg_file(file)
-        elsif value == '-'
-          STDIN.read
-        else
-          value
-        end
-      end
-
-      def read_arg_file(file)
-        File.read(file)
-      rescue StandardError => err
-        raise Bolt::FileError.new("Error attempting to read #{file}: #{err}", file)
-      end
-    end
-
     COMMANDS = { 'command' => %w[run],
                  'script'  => %w[run],
                  'task'    => %w[show run],
@@ -323,11 +34,8 @@ Available options are:
     def initialize(argv)
       Bolt::Logger.initialize_logging
       @logger = Logging.logger[self]
-
       @config = Bolt::Config.new
-
       @argv = argv
-
       @options = {
         nodes: []
       }
@@ -365,8 +73,7 @@ Available options are:
         raise Bolt::CLIExit
       end
 
-      config.load_file(options[:configfile])
-      config.update_from_cli(options)
+      config.update(options)
       config.validate
       Bolt::Logger.configure(config)
 
@@ -503,6 +210,7 @@ Available options are:
       end
 
       @analytics.screen_view(screen,
+                             output_format: config[:format],
                              target_nodes: options.fetch(:targets, []).count,
                              inventory_nodes: inventory.node_names.count,
                              inventory_groups: inventory.group_names.count)

data/lib/bolt/config.rb

@@ -68,9 +68,13 @@ module Bolt
       local: {}
     }.freeze
 
+    BOLTDIR_NAME = 'Boltdir'
+
     def initialize(**kwargs)
       super()
       @logger = Logging.logger[self]
+      @pwd = kwargs.delete(:pwd)
+
       DEFAULTS.merge(kwargs).each { |k, v| self[k] = v }
 
       # add an entry for the default console logger
@@ -99,11 +103,6 @@ module Bolt
       Bolt::Util.deep_clone(self)
     end
 
-    def default_paths
-      root_path = File.expand_path(File.join('~', '.puppetlabs'))
-      [File.join(root_path, 'bolt.yaml'), File.join(root_path, 'bolt.yml')]
-    end
-
     def normalize_log(target)
       return target if target == 'console'
       target = target[5..-1] if target.start_with?('file:')
@@ -146,9 +145,55 @@ module Bolt
     end
     private :update_from_file
 
-    def load_file(path)
-      data = Bolt::Util.read_config_file(path, default_paths, 'config')
-      update_from_file(data) if data
+    def find_boltdir(dir)
+      path = dir
+      boltdir = nil
+      while boltdir.nil? && path && path != File.dirname(path)
+        maybe_boltdir = File.join(path, BOLTDIR_NAME)
+        boltdir = maybe_boltdir if File.directory?(maybe_boltdir)
+        path = File.dirname(path)
+      end
+      boltdir
+    end
+
+    def pwd
+      @pwd ||= Dir.pwd
+    end
+
+    def boltdir
+      @boltdir ||= find_boltdir(pwd) || default_boltdir
+    end
+
+    def default_boltdir
+      File.expand_path(File.join('~', '.puppetlabs', 'bolt'))
+    end
+
+    def default_modulepath
+      [File.join(boltdir, "modules")]
+    end
+
+    # TODO: This is deprecated in 0.21.0 and can be removed in release 0.22.0.
+    def legacy_conf
+      return @legacy_conf if defined?(@legacy_conf)
+      root_path = File.expand_path(File.join('~', '.puppetlabs'))
+      legacy_paths = [File.join(root_path, 'bolt.yaml'), File.join(root_path, 'bolt.yml')]
+      @legacy_conf = legacy_paths.find { |path| File.exist?(path) }
+      @legacy_conf ||= legacy_paths[0]
+      if @legacy_conf
+        correct_path = File.join(default_boltdir, 'bolt.yaml')
+        msg = "Found configfile at deprecated location #{@legacy_conf}. Global config should be in #{correct_path}"
+        @logger.warn(msg)
+      end
+      @legacy_conf
+    end
+
+    def default_config
+      path = File.join(boltdir, 'bolt.yaml')
+      File.exist?(path) ? path : legacy_conf
+    end
+
+    def default_inventory
+      File.join(boltdir, 'inventory.yaml')
     end
 
     def update_from_cli(options)
@@ -184,6 +229,26 @@ module Bolt
       end
     end
 
+    # Defaults that do not vary based on boltdir should not be included here.
+    #
+    # Defaults which are treated differently from specified values like
+    # 'inventoryfile' cannot be included here or they will not be handled correctly.
+    def update_from_defaults
+      self[:modulepath] = default_modulepath
+    end
+
+    # The order in which config is processed is important
+    def update(options)
+      update_from_defaults
+      load_file(options[:configfile])
+      update_from_cli(options)
+    end
+
+    def load_file(path)
+      data = Bolt::Util.read_config_file(path, [default_config], 'config')
+      update_from_file(data) if data
+    end
+
     def update_from_inventory(data)
       update_from_file(data)
 

data/lib/bolt/error.rb

@@ -41,6 +41,12 @@ module Bolt
     end
   end
 
+  class CLIError < Bolt::Error
+    def initialize(msg)
+      super(msg, "bolt/cli-error")
+    end
+  end
+
   class RunFailure < Error
     attr_reader :result_set
 

data/lib/bolt/inventory.rb

@@ -36,10 +36,6 @@ module Bolt
       end
     end
 
-    def self.default_paths
-      [File.expand_path(File.join('~', '.puppetlabs', 'bolt', 'inventory.yaml'))]
-    end
-
     def self.from_config(config)
       if ENV.include?(ENVIRONMENT_VAR)
         begin
@@ -48,7 +44,7 @@ module Bolt
           raise Bolt::Error.new("Could not parse inventory from $#{ENVIRONMENT_VAR}", 'bolt/parse-error')
         end
       else
-        data = Bolt::Util.read_config_file(config[:inventoryfile], default_paths, 'inventory')
+        data = Bolt::Util.read_config_file(config[:inventoryfile], [config.default_inventory], 'inventory')
       end
 
       inventory = new(data, config)

data/lib/bolt/outputter/human.rb

@@ -117,7 +117,7 @@ module Bolt
         # Building lots of strings...
         pretty_params = +""
         task_info = +""
-        usage = +"bolt task run --nodes, -n <node-name> #{task['name']}"
+        usage = +"bolt task run --nodes <node-name> #{task['name']}"
 
         if task['parameters']
           replace_data_type(task['parameters'])

data/lib/bolt/transport/orch.rb

@@ -87,7 +87,7 @@ module Bolt
 
       def batch_command(targets, command, options = {}, &callback)
         params = {
-          command: command
+          'command' => command
         }
         results = run_task_job(targets,
                                BOLT_COMMAND_TASK,
@@ -105,8 +105,8 @@ module Bolt
         content = File.open(script, &:read)
         content = Base64.encode64(content)
         params = {
-          content: content,
-          arguments: arguments
+          'content' => content,
+          'arguments' => arguments
         }
         callback ||= proc {}
         results = run_task_job(targets, BOLT_SCRIPT_TASK, params, options, &callback)
@@ -121,9 +121,9 @@ module Bolt
         content = Base64.encode64(content)
         mode = File.stat(source).mode
         params = {
-          path: destination,
-          content: content,
-          mode: mode
+          'path' => destination,
+          'content' => content,
+          'mode' => mode
         }
         callback ||= proc {}
         results = run_task_job(targets, BOLT_UPLOAD_TASK, params, options, &callback)

data/lib/bolt/transport/orch/connection.rb

@@ -62,7 +62,7 @@ module Bolt
           body = { task: task.name,
                    environment: @environment,
                    noop: arguments['_noop'],
-                   params: arguments.reject { |k, _| k == '_noop' },
+                   params: arguments.reject { |k, _| k.start_with?('_') },
                    scope: {
                      nodes: targets.map(&:host)
                    } }

data/lib/bolt/util.rb

@@ -2,7 +2,6 @@
 
 module Bolt
   module Util
-    # CODEREVIEW I hate mixing in random modules
     class << self
       def read_config_file(path, default_paths = nil, file_name = 'file')
         logger = Logging.logger[self]
@@ -17,10 +16,16 @@ module Bolt
         end
 
         path = File.expand_path(path)
-        File.open(path, "r:UTF-8") { |f| YAML.safe_load(f.read) }
+        content = File.open(path, "r:UTF-8") { |f| YAML.safe_load(f.read) }
+        logger.debug("Loaded #{file_name} from #{path}")
+        content
       rescue Errno::ENOENT
+        msg = "Could not read #{file_name} file: #{path}"
         if path_passed
-          raise Bolt::FileError.new("Could not read #{file_name} file: #{path}", path)
+          raise Bolt::FileError.new(msg, path)
+        else
+          logger.debug(msg)
+          nil
         end
       rescue Psych::Exception
         raise Bolt::FileError.new("Could not parse #{file_name} file: #{path}", path)

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.20.7
+  version: 0.21.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -351,6 +351,7 @@ files:
 - exe/bolt-inventory-pdb
 - lib/bolt.rb
 - lib/bolt/analytics.rb
+- lib/bolt/bolt_option_parser.rb
 - lib/bolt/cli.rb
 - lib/bolt/config.rb
 - lib/bolt/error.rb
@@ -1634,7 +1635,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Execute commands remotely over SSH and WinRM