(maint) Expand filepaths passed on the CLI relative to cwd

.gitignore

@@ -73,3 +73,5 @@ locales/
 documentation/plan_functions.md
 documentation/bolt_command_reference.md
 documentation/bolt_configuration_reference.md
+tasks/
+plans/

lib/bolt/bolt_option_parser.rb

@@ -655,8 +655,8 @@ def initialize(options)
         @options[:password] = STDIN.noecho(&:gets).chomp
         STDERR.puts
       end
-      define('--private-key KEY', 'Private ssh key to authenticate with') do |key|
-        @options[:'private-key'] = key
+      define('--private-key KEY', 'Path to private ssh key to authenticate with') do |key|
+        @options[:'private-key'] = File.expand_path(key)
       end
       define('--[no-]host-key-check', 'Check host keys with SSH') do |host_key_check|
         @options[:'host-key-check'] = host_key_check
@@ -718,7 +718,7 @@ def initialize(options)
       end
       define('--hiera-config FILEPATH',
              'Specify where to load Hiera config from (default: ~/.puppetlabs/bolt/hiera.yaml)') do |path|
-        @options[:'hiera-config'] = path
+        @options[:'hiera-config'] = File.expand_path(path)
       end
       define('-i', '--inventoryfile FILEPATH',
              'Specify where to load inventory from (default: ~/.puppetlabs/bolt/inventory.yaml)') do |path|

spec/bolt/cli_spec.rb

@@ -422,14 +422,24 @@ def stub_config(file_content = {})
     describe "key" do
       it "accepts a private key" do
         allow(Bolt::Util).to receive(:validate_file).and_return(true)
-        path = '~/.ssh/google_compute_engine'
+        path = File.expand_path('~/.ssh/google_compute_engine')
         cli = Bolt::CLI.new(%W[  command run uptime
                                  --private-key #{path}
                                  --targets foo])
         expect(cli.parse).to include('private-key': path)
         expect(cli.config.transports['ssh']['private-key']).to eq(File.expand_path(path))
       end
 
+      it "expands private key relative to cwd" do
+        allow(Bolt::Util).to receive(:validate_file).and_return(true)
+        path = './ssh/google_compute_engine'
+        cli = Bolt::CLI.new(%W[  command run uptime
+                                 --private-key #{path}
+                                 --targets foo])
+        expect(cli.parse).to include('private-key': File.expand_path(path))
+        expect(cli.config.transports['ssh']['private-key']).to eq(File.expand_path(path))
+      end
+
       it "generates an error message if no key value is given" do
         cli = Bolt::CLI.new(%w[command run --targets foo --private-key])
         expect {

spec/integration/lookup_spec.rb

@@ -11,7 +11,7 @@
   after(:each) { Puppet.settings.send(:clear_everything_for_tests) }
 
   let(:boltdir)      { fixture_path('hiera') }
-  let(:hiera_config) { 'hiera.yaml' }
+  let(:hiera_config) { File.join(boltdir, 'hiera.yaml') }
   let(:plan)         { 'test::lookup' }
 
   let(:cli_command) {
@@ -87,7 +87,7 @@
   end
 
   context 'with interpolations' do
-    let(:hiera_config) { 'hiera_interpolations.yaml' }
+    let(:hiera_config) { File.join(boltdir, 'hiera_interpolations.yaml') }
 
     it 'returns an error' do
       result = run_cli_json(cli_command + %w[key=test::interpolations])
@@ -124,7 +124,7 @@
   end
 
   context 'with a missing backend' do
-    let(:hiera_config) { 'hiera_missing_backend.yaml' }
+    let(:hiera_config) { File.join(boltdir, 'hiera_missing_backend.yaml') }
 
     it 'returns an error' do
       result = run_cli_json(cli_command + %w[key=test::backends])