[CHEF-2994][WINDOWS] Added unit tests for private method #command_to_run

Fixed bug with quoted .cmd files

Fixed bug with finding .bat in the middle of the filename

2 files changed, 115 insertions, 2 deletions

diff --git a/lib/mixlib/shellout/windows.rb b/lib/mixlib/shellout/windows.rb
index b320c6a..fa4990b 100644
--- a/lib/mixlib/shellout/windows.rb
+++ b/lib/mixlib/shellout/windows.rb
@@ -50,7 +50,7 @@ module Mixlib
           #
           # Set cwd, environment, appname, etc.
           #
-          app_name, command_line = command_to_run
+          app_name, command_line = command_to_run(self.command)
           create_process_args = {
             :app_name => app_name,
             :command_line => command_line,
@@ -154,7 +154,7 @@ module Mixlib
         return true
       end
 
-      IS_BATCH_FILE = /\.bat|\.cmd$/i
+      IS_BATCH_FILE = /\.bat"?$|\.cmd"?$/i
 
       def command_to_run
         if command =~ /^\s*"(.*)"/
diff --git a/spec/mixlib/shellout/windows_spec.rb b/spec/mixlib/shellout/windows_spec.rb
new file mode 100644
index 0000000..a5586f7
--- /dev/null
+++ b/spec/mixlib/shellout/windows_spec.rb
@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe Mixlib::ShellOut::Windows, :windows_only => true do
+
+  # Caveat: Private API methods are subject to change without notice.
+  # Monkeypatch at your own risk.
+  context 'for private API methods' do
+    describe '#command_to_run' do
+      subject { stubbed_shell_out.send(:command_to_run, cmd) }
+
+      let(:stubbed_shell_out) { fail NotImplemented, 'Must declare let(:stubbed_shell_out)' }
+      let(:shell_out) { Mixlib::ShellOut.new(cmd) }
+
+      let(:with_valid_exe_at_location) { lambda { |s| s.stub!(:find_exe_at_location).and_return(executable_path) } }
+      let(:with_invalid_exe_at_location) { lambda { |s| s.stub!(:find_exe_at_location).and_return(nil) } }
+
+      context 'with batch files' do
+        let(:stubbed_shell_out) { shell_out.tap(&with_valid_exe_at_location) }
+        let(:cmd_invocation) { "cmd /c \"#{cmd}\"" }
+        let(:cmd_exe) { "C:\\Windows\\system32\\cmd.exe" }
+        let(:cmd) { "#{executable_path}" }
+
+        context 'with .bat file' do
+          let(:executable_path) { '"C:\Program Files\Application\Start.bat"' }
+
+          # Examples taken from: https://github.com/opscode/mixlib-shellout/pull/2#issuecomment-4825574
+          context 'with executable path enclosed in double quotes' do
+
+            it 'should use specified batch file' do
+              should eql([cmd_exe, cmd_invocation])
+            end
+
+            context 'with arguments' do
+              let(:cmd) { "#{executable_path} arguments" }
+
+              it 'should use specified executable' do
+                should eql([cmd_exe, cmd_invocation])
+              end
+            end
+
+            context 'with quoted arguments' do
+              let(:cmd) { "#{executable_path} /i \"C:\Program Files (x86)\NUnit 2.6\bin\framework\nunit.framework.dll\"" }
+
+              it 'should use specified executable' do
+                should eql([cmd_exe, cmd_invocation])
+              end
+            end
+          end
+        end
+
+        context 'with .cmd file' do
+          let(:executable_path) { '"C:\Program Files\Application\Start.cmd"' }
+
+          # Examples taken from: https://github.com/opscode/mixlib-shellout/pull/2#issuecomment-4825574
+          context 'with executable path enclosed in double quotes' do
+
+            it 'should use specified batch file' do
+              should eql([cmd_exe, cmd_invocation])
+            end
+
+            context 'with arguments' do
+              let(:cmd) { "#{executable_path} arguments" }
+
+              it 'should use specified executable' do
+                should eql([cmd_exe, cmd_invocation])
+              end
+            end
+
+            context 'with quoted arguments' do
+              let(:cmd) { "#{executable_path} /i \"C:\Program Files (x86)\NUnit 2.6\bin\framework\nunit.framework.dll\"" }
+
+              it 'should use specified executable' do
+                should eql([cmd_exe, cmd_invocation])
+              end
+            end
+          end
+
+        end
+      end
+
+      context 'with valid executable at location' do
+        let(:stubbed_shell_out) { shell_out.tap(&with_valid_exe_at_location) }
+
+        # Examples taken from: https://github.com/opscode/mixlib-shellout/pull/2#issuecomment-4825574
+        context 'with executable path enclosed in double quotes' do
+          let(:cmd) { "#{executable_path}" }
+          let(:executable_path) { '"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\NETFX 4.0 Tools\gacutil.exe"' }
+
+          it 'should use specified executable' do
+            should eql([executable_path, cmd])
+          end
+
+          context 'with arguments' do
+            let(:cmd) { "#{executable_path} arguments" }
+
+            it 'should use specified executable' do
+              should eql([executable_path, cmd])
+            end
+          end
+
+          context 'with quoted arguments' do
+            let(:cmd) { "#{executable_path} /i \"C:\Program Files (x86)\NUnit 2.6\bin\framework\nunit.framework.dll\"" }
+
+            it 'should use specified executable' do
+              should eql([executable_path, cmd])
+            end
+          end
+        end
+
+      end
+    end
+  end
+end