Merge pull request #5108 from mitchellh/sethvargo/fix_packaging

Symbolize and stringify keys in options hash

lib/vagrant/machine.rb

@@ -160,6 +160,9 @@ module Vagrant
       # Extra env keys are the remaining opts
       extra_env = opts.dup
 
+      # Convert the extra keys back to strings
+      extra_env = extra_env.inject({}) { |h,(k,v)| h[k.to_s] = v; h }
+
       # Create a deterministic ID for this machine
       vf = nil
       vf = @env.vagrantfile_name[0] if @env.vagrantfile_name

plugins/commands/package/command.rb

@@ -80,6 +80,9 @@ module VagrantPlugins
           acc
         end
 
+        # Symbolize all keys
+        opts = opts.inject({}) { |h,(k,v)| h[k.to_sym] = v; h }
+
         vm.action(:package, **opts)
       end
     end

test/unit/plugins/pushes/ftp/push_test.rb

@@ -17,12 +17,19 @@ describe VagrantPlugins::FTPPush::Push do
       destination: "/var/www/site",
     )
   end
+  let(:ui) do
+    double("ui",
+      info: nil,
+    )
+  end
 
   subject { described_class.new(env, config) }
 
   before do
     allow(env).to receive(:root_path)
       .and_return(File.expand_path("..", __FILE__))
+    allow(env).to receive(:ui)
+      .and_return(ui)
   end
 
   describe "#push" do

test/unit/vagrant/machine_test.rb

@@ -252,10 +252,10 @@ describe Vagrant::Machine do
       expect(machine).to eql(instance)
     end
 
-    it "should pass any extra options to the environment" do
+    it "should pass any extra options to the environment as strings" do
       action_name = :up
       foo         = nil
-      callable    = lambda { |env| foo = env[:foo] }
+      callable    = lambda { |env| foo = env["foo"] }
 
       allow(provider).to receive(:action).with(action_name).and_return(callable)
       instance.action(:up, foo: :bar)