Merge pull request #2556 from phinze/fix-shell-array-args-validation

provisioners/shell: fix validation for args [GH-1949]

plugins/provisioners/shell/config.rb

@@ -55,14 +55,20 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.shell.upload_path_not_set")
         end
 
-        # If there are args and its not a string, that is a problem
+        unless args_valid?
-        if args && (!args.is_a?(String) || !args.is_a?(Array))
           errors << I18n.t("vagrant.provisioners.shell.args_bad_type")
         end
 
         { "shell provisioner" => errors }
       end
 
+      # Args are optional, but if they're provided we only support them as a
+      # string or as an array.
+      def args_valid?
+        return true unless args
+        args.is_a?(String) || args.is_a?(Array)
+      end
+
       def remote?
         path =~ URI.regexp(["ftp", "http", "https"])
       end

test/unit/plugins/provisioners/shell/config_test.rb

@@ -0,0 +1,57 @@
+require File.expand_path("../../../../base", __FILE__)
+
+describe "VagrantPlugins::Shell::Config" do
+  let(:described_class) do
+    VagrantPlugins::Shell::Plugin.components.configs[:provisioner][:shell]
+  end
+
+  let(:machine)          { double('machine', env: Vagrant::Environment.new) }
+  let(:file_that_exists) { File.expand_path(__FILE__)                       }
+
+  subject { described_class.new }
+
+  describe "validate" do
+    it "passes with no args" do
+      subject.path = file_that_exists
+      subject.finalize!
+
+      result = subject.validate(machine)
+
+      result["shell provisioner"].should == []
+    end
+
+    it "passes with string args" do
+      subject.path = file_that_exists
+      subject.args = "a string"
+      subject.finalize!
+
+      result = subject.validate(machine)
+
+      result["shell provisioner"].should == []
+    end
+
+    it "passes with array args" do
+      subject.path = file_that_exists
+      subject.args = ["an", "array"]
+      subject.finalize!
+
+      result = subject.validate(machine)
+
+      result["shell provisioner"].should == []
+    end
+
+    it "returns an error if args is neither a string nor an array" do
+      neither_array_nor_string = Object.new
+
+      subject.path = file_that_exists
+      subject.args = neither_array_nor_string
+      subject.finalize!
+
+      result = subject.validate(machine)
+
+      result["shell provisioner"].should == [
+        I18n.t("vagrant.provisioners.shell.args_bad_type")
+      ]
+    end
+  end
+end