winrm 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/soap/winrm_service.rb

@@ -153,7 +153,9 @@ module WinRM
       # Get the Output of the given shell and command
       # @param [String] shell_id The shell id on the remote machine.  See #open_shell
       # @param [String] command_id The command id on the remote machine.  See #run_command
-      # @return [Hash] :stdout and :stderr
+      # @return [Hash] Returns a Hash with a key :exitcode and :data.  Data is an Array of Hashes where the cooresponding key
+      #   is either :stdout or :stderr.  The reason it is in an Array so so we can get the output in the order it ocurrs on
+      #   the console.
       def get_command_output(shell_id, command_id)
         header = {}.merge(resource_uri_cmd).merge(action_receive).merge(selector_shell_id(shell_id))
 
@@ -164,15 +166,10 @@ module WinRM
           end
         end
 
-        cmd_stdout = ''
-        cmd_stderr = ''
-        (resp/"//*[@Name='stdout']").each do |n|
-          next if n.to_s.nil?
-          cmd_stdout << Base64.decode64(n.to_s)
-        end
-        (resp/"//*[@Name='stderr']").each do |n|
+        output = {:data => []}
+        (resp/"//#{NS_WIN_SHELL}:Stream").each do |n|
           next if n.to_s.nil?
-          cmd_stderr << Base64.decode64(n.to_s)
+          output[:data] << {n['Name'].to_sym => Base64.decode64(n.to_s)}
         end
 
         # We may need to get additional output if the stream has not finished.
@@ -185,12 +182,13 @@ module WinRM
         #     <rsp:ExitCode>0</rsp:ExitCode>
         #   </rsp:CommandState>
         if((resp/"//#{NS_WIN_SHELL}:ExitCode").empty?)
-          more_out = get_command_output(shell_id,command_id)
-          cmd_stdout << more_out[:stdout]
-          cmd_stderr << more_out[:stderr]
+          output.merge!(get_command_output(shell_id,command_id)) do |key, old_data, new_data|
+            old_data += new_data
+          end
+        else
+          output[:exitcode] = (resp/"//#{NS_WIN_SHELL}:ExitCode").first.to_i
         end
-
-        {:stdout => cmd_stdout, :stderr => cmd_stderr}
+        output
       end
 
       # Clean-up after a command.
@@ -218,13 +216,29 @@ module WinRM
         true
       end
 
+      # Run a CMD command
+      # @param [String] command The command to run on the remote system
+      # @return [Hash] :stdout and :stderr
+      def run_cmd(command)
+        shell_id = open_shell
+        command_id =  run_command(shell_id, command)
+        command_output = get_command_output(shell_id, command_id)
+        cleanup_command(shell_id, command_id)
+        close_shell(shell_id)
+        command_output
+      end
+
+
       # Run a Powershell script that resides on the local box.
       # @param [String] script_file The string representing the path to a Powershell script
       # @return [Hash] :stdout and :stderr
       def run_powershell_script(script_file)
         script = File.read(script_file)
-        script = script.chars.to_a.join("\x00").chomp.encode('ASCII-8BIT')
-        script = Base64.strict_encode64(script)
+        script = script.chars.to_a.join("\x00").chomp
+        if(defined?(script.encode))
+          script = script.encode('ASCII-8BIT')
+        end
+        script = Base64.encode64(script)
 
         shell_id = open_shell
         command_id =  run_command(shell_id, "powershell -encodedCommand #{script}")

data/lib/winrm.rb

@@ -72,6 +72,12 @@ module WinRM
       @winrm = SOAP::WinRMWebService.new
     end
 
+    # Run a CMD command
+    # @see WinRM::SOAP::WinRMWebService#run_cmd
+    def cmd(command)
+      @winrm.run_cmd(command)
+    end
+
     # Run a Powershell script
     # @see WinRM::SOAP::WinRMWebService#run_powershell_script
     def powershell(script_file)

data/test/spec/powershell_tests.spec

@@ -18,7 +18,7 @@ describe "Test remote Powershell features via WinRM" do
   it 'should run a test Powershell script' do
     winrm = WinRM::WinRM.instance
     output = winrm.powershell('spec/test.ps1')
-    output[:stdout].should_not be_empty
+    output[:exitcode].should eql(0)
   end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winrm
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dan Wanek
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -05:00
+date: 2010-09-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,6 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,6 +68,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -77,6 +82,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -123,6 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
@@ -133,6 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"