Merge branch 'pr/2477'

* pr/2477:
  (PUP-2073) fix for multiple diff_args

Closes GH-2477

Author: joshcooper

lib/puppet/util/diff.rb

@@ -10,7 +10,9 @@ def diff(old, new)
 
     command = [diff_cmd]
     if args = Puppet[:diff_args] and args != ""
-      command << args
+      args.split(' ').each do|arg|
+        command << arg
+      end
     end
     command << old << new
     Puppet::Util::Execution.execute(command, :failonfail => false, :combine => false)

spec/unit/util/diff_spec.rb

@@ -13,6 +13,14 @@
       subject.diff('a', 'b').should == 'baz'
     end
 
+    it "should execute the diff command with multiple arguments" do
+      Puppet[:diff] = 'foo'
+      Puppet[:diff_args] = 'bar qux'
+
+      Puppet::Util::Execution.expects(:execute).with(['foo', 'bar', 'qux', 'a', 'b'], anything).returns('baz')
+      subject.diff('a', 'b').should == 'baz'
+    end
+
     it "should omit diff arguments if none are specified" do
       Puppet[:diff] = 'foo'
       Puppet[:diff_args] = ''