Fix issue 69 cmd with apostrophe

lib/winrm/winrm_service.rb

@@ -133,7 +133,12 @@ def run_command(shell_id, command, arguments = [], cmd_opts = {})
       s.input = "#{NS_WIN_SHELL}:CommandLine"
       s.body = { "#{NS_WIN_SHELL}:Command" => "\"#{command}\"", "#{NS_WIN_SHELL}:Arguments" => arguments}
 
-      resp = send_message(s.to_xml)
+      # Grab the command element and unescape any single quotes - issue 69
+      xml = s.to_xml
+      escaped_cmd = /<#{NS_WIN_SHELL}:Command>(.+)<\/#{NS_WIN_SHELL}:Command>/.match(xml)[1]
+      xml.sub!(escaped_cmd, escaped_cmd.gsub(/&#39;/, "'"))
+
+      resp = send_message(xml)
       (resp/"//#{NS_WIN_SHELL}:CommandId").text
     end
 

test/spec/cmd_spec.rb

@@ -8,21 +8,32 @@
 
   it 'should run a CMD command string' do
     output = @winrm.run_cmd('ipconfig /all')
-    output[:exitcode].should == 0
-    output[:data].should_not be_empty
+    expect(output[:exitcode]).to eq(0)
+    expect(output[:data]).to_not be_empty
   end
 
   it 'should run a CMD command with proper arguments' do
     output = @winrm.run_cmd('ipconfig', %w{/all})
-    output[:exitcode].should == 0
-    output[:data].should_not be_empty
+    expect(output[:exitcode]).to eq(0)
+    expect(output[:data]).to_not be_empty
   end
 
   it 'should run a CMD command with block' do
     outvar = ''
     @winrm.run_cmd('ipconfig', %w{/all}) do |stdout, stderr|
       outvar << stdout
     end
-    outvar.should =~ /Windows IP Configuration/
+    expect(outvar).to match(/Windows IP Configuration/)
+  end
+
+  it 'should run a CMD command that contains an apostrophe' do
+    output = @winrm.run_cmd(%q{echo 'hello world'})
+    expect(output[:exitcode]).to eq(0)
+    expect(output[:data][0][:stdout]).to match(/'hello world'/)
+  end
+
+  it 'should run a CMD command that is empty' do
+    output = @winrm.run_cmd('')
+    expect(output[:exitcode]).to eq(0)
   end
 end