Merge pull request #3313 from donoghuc/apply-local-defaults

(GH-3309) Ensure bundled-ruby defaults are applied at target init

lib/bolt/inventory/target.rb

@@ -34,7 +34,7 @@ def initialize(target_data, inventory)
           @name = @uri
           @safe_name = @uri_obj.omit(:password).to_str.sub(%r{^//}, '')
         end
-
+        # handle special localhost target
         if @name == 'localhost'
           default = { 'config' => { 'transport' => 'local' } }
           target_data = Bolt::Util.deep_merge(default, target_data)
@@ -53,6 +53,8 @@ def initialize(target_data, inventory)
         @inventory = inventory
 
         validate
+        # after setting config, apply local defaults when using bundled ruby
+        set_local_defaults if transport_config['bundled-ruby']
       end
 
       def set_local_defaults

lib/bolt/target.rb

@@ -80,10 +80,6 @@ def resources
       inventory_target.resources
     end
 
-    def set_local_defaults
-      inventory_target.set_local_defaults
-    end
-
     # rubocop:disable Naming/AccessorMethodName
     def set_resource(resource)
       inventory_target.set_resource(resource)

lib/bolt/transport/local.rb

@@ -11,10 +11,6 @@ def connected?(_target)
       end
 
       def with_connection(target)
-        if target.transport_config['bundled-ruby']
-          target.set_local_defaults
-        end
-
         yield Connection.new(target)
       end
     end

spec/unit/transport/local_spec.rb

@@ -94,6 +94,16 @@ def get_target(inventory, name, alia = nil)
       end
     end
 
+    context 'without with_connection' do
+      let(:data) { { 'targets' => [] } }
+      it 'applies bundled-ruby config' do
+        target = get_target(inventory, 'local://foo')
+        expect(target.transport).to eq('local')
+        expect(target.options['interpreters']).to include('.rb' => RbConfig.ruby)
+        expect(target.features).to include('puppet-agent')
+      end
+    end
+
     context 'with group-level config' do
       let(:data) {
         { 'targets' => [uri],