kernel/v2: push config keys on strategy

/cc @sethvargo - This adds more tests that fail if this change isn't in
place.

plugins/kernel_v2/config/push.rb

@@ -21,18 +21,18 @@ module VagrantPlugins
 
         # Compile all the provider configurations
         @__defined_pushes.each do |name, tuples|
-          # Find the configuration class for this push
-          config_class = Vagrant.plugin("2").manager.push_configs[name]
-          config_class ||= Vagrant::Config::V2::DummyConfig
-
-          # Load it up
-          config = config_class.new
-
           # Capture the strategy so we can use it later. This will be used in
           # the block iteration for merging/overwriting
           strategy = name
           strategy = tuples[0][0] if tuples[0]
 
+          # Find the configuration class for this push
+          config_class = Vagrant.plugin("2").manager.push_configs[strategy]
+          config_class ||= Vagrant::Config::V2::DummyConfig
+
+          # Load it up
+          config = config_class.new
+
           begin
             tuples.each do |s, b|
               # Update the strategy if it has changed, reseting the current

test/unit/plugins/kernel_v2/config/push_test.rb

@@ -89,6 +89,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
     let(:key)    { pushes[:foo][0] }
     let(:config) { pushes[:foo][1] }
     let(:unset)  { Vagrant.plugin("2", :config).const_get(:UNSET_VALUE) }
+    let(:dummy_klass) { Vagrant::Config::V2::DummyConfig }
 
     before do
       register_plugin("2") do |plugin|
@@ -112,6 +113,62 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
       end
     end
 
+    it "compiles the proper configuration with a single strategy" do
+      instance = described_class.new.tap do |i|
+        i.define "foo"
+      end
+
+      instance.finalize!
+
+      pushes = instance.__compiled_pushes
+      strategy, config = pushes[:foo]
+      expect(strategy).to eq(:foo)
+      expect(config.bar).to be(unset)
+    end
+
+    it "compiles the proper configuration with a single strategy and block" do
+      instance = described_class.new.tap do |i|
+        i.define "foo" do |b|
+          b.bar = 42
+        end
+      end
+
+      instance.finalize!
+
+      pushes = instance.__compiled_pushes
+      strategy, config = pushes[:foo]
+      expect(strategy).to eq(:foo)
+      expect(config.bar).to eq(42)
+    end
+
+    it "compiles the proper config with a name and explicit strategy" do
+      instance = described_class.new.tap do |i|
+        i.define "bar", strategy: "foo"
+      end
+
+      instance.finalize!
+
+      pushes = instance.__compiled_pushes
+      strategy, config = pushes[:bar]
+      expect(strategy).to eq(:foo)
+      expect(config.bar).to be(unset)
+    end
+
+    it "compiles the proper config with a name and explicit strategy with block" do
+      instance = described_class.new.tap do |i|
+        i.define "bar", strategy: "foo" do |b|
+          b.bar = 42
+        end
+      end
+
+      instance.finalize!
+
+      pushes = instance.__compiled_pushes
+      strategy, config = pushes[:bar]
+      expect(strategy).to eq(:foo)
+      expect(config.bar).to eq(42)
+    end
+
     context "with the same name but different strategy" do
       context "with no block" do
         let(:a) do
@@ -128,8 +185,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
 
         it "chooses the last config" do
           expect(key).to eq(:zip)
-          expect(config.bar).to be(unset)
+          expect(config).to be_kind_of(dummy_klass)
-          expect(config.zip).to be(unset)
         end
       end
 
@@ -152,8 +208,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
 
         it "chooses the last config" do
           expect(key).to eq(:zip)
-          expect(config.bar).to eq(unset)
+          expect(config).to be_kind_of(dummy_klass)
-          expect(config.zip).to eq("b")
         end
       end
 
@@ -174,8 +229,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
 
         it "chooses the last config" do
           expect(key).to eq(:zip)
-          expect(config.bar).to be(unset)
+          expect(config).to be_kind_of(dummy_klass)
-          expect(config.zip).to be(unset)
         end
       end
 
@@ -196,8 +250,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
 
         it "chooses the last config" do
           expect(key).to eq(:zip)
-          expect(config.bar).to eq("b")
+          expect(config).to be_kind_of(dummy_klass)
-          expect(config.zip).to eq("b")
         end
       end
     end
@@ -286,8 +339,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
 
         it "merges the configs" do
           expect(key).to eq(:zip)
-          expect(config.bar).to eq(unset)
+          expect(config).to be_kind_of(dummy_klass)
-          expect(config.zip).to eq("b")
         end
       end
     end