winrm-s 0.3.0.dev.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4d1d4e2a4b4ccc8dd0ad20d284645601ea0e12
-  data.tar.gz: cb836c96410f6b98edfba92bad359344abeb13b4
+  metadata.gz: 0fe95dd37da3da6c1086e54af81ee41a014eee5e
+  data.tar.gz: cb34e1952b1e46cb7ed05f06f1a48243792dd295
 SHA512:
-  metadata.gz: c94f858518f0cf2b1fb417cf1eb233a188758c37fb7866847860ad0af4d88892e130a8059c1207508319c05728ffd3b03b45f0e015e0611ca27a4aad9f5f0589
-  data.tar.gz: f7cf4738f2826fb4c9bfed5dfeb94c7c5187da4d7dd7ce0a877d07f4efbe77c5cc82cbb5b1f639db42e6b6f05d568d5bef788edd7db2b77933602bb6c306d26d
+  metadata.gz: b2cdbb900ec5b64f22972ccac8d95da645a9018854a2ab239f582e63192298f96705421d92d2b90af2a79242fe20bec05688d900cad067c64bd40df67955d774
+  data.tar.gz: 38e93c9eb50579c9fb57dfdce072bf7064f5f226985fd733bd5a288ff612be7f77ed5ff1129143ca84db809a08cd55a3997f7d252bfb84d0a465f5ebdb0df6ab

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 # winrm-s  Change Log
 
-## Unreleased
-None
+Unreleased
+--------------
+
+Release: 0.3.0
+--------------
+* [Issue #21](https://github.com/chef/winrm-s/issues/21): Bumps winrm dependency from 1.2 to 1.3.
+* [Issue #25](https://github.com/opscode/winrm-s/pull/25): [Fix for knife-windows issue 218](https://github.com/opscode/knife-windows/issues/218)
 
-Last release: 0.2.4
--------------------
+Release: 0.2.4
+--------------
 * DOC change only: correct omission from CHANGELOG items in 0.2.3 release
 
 Release: 0.2.3
@@ -24,6 +29,3 @@ Release: 0.2.0
 Release: 0.1.0
 --------------
 * Initial implementation
-
-
-

data/lib/winrm-s/version.rb

@@ -17,6 +17,6 @@
 #
 
 module WinrmS
-  VERSION = "0.3.0.dev.0"
+  VERSION = "0.3.0"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/winrm/winrm_service_patch.rb

@@ -30,5 +30,60 @@ module WinRM
         @xfer = HTTP::HttpSSL.new(endpoint, opts[:user], opts[:pass], opts[:ca_trust_path], opts)
       end
     end
+
+    # Get the builder obj for output request
+    # @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 [Builder::XmlMarkup] Returns a Builder::XmlMarkup for request message 
+    def get_builder_obj(shell_id, command_id, &block)
+      body = { "#{NS_WIN_SHELL}:DesiredStream" => 'stdout stderr',
+        :attributes! => {"#{NS_WIN_SHELL}:DesiredStream" => {'CommandId' => command_id}}}
+      builder = Builder::XmlMarkup.new
+      builder.instruct!(:xml, :encoding => 'UTF-8')
+      builder.tag! :env, :Envelope, namespaces do |env|
+        env.tag!(:env, :Header) { |h| h << Gyoku.xml(merge_headers(header,resource_uri_cmd,action_receive,selector_shell_id(shell_id))) }
+        env.tag!(:env, :Body) do |env_body|
+          env_body.tag!("#{NS_WIN_SHELL}:Receive") { |cl| cl << Gyoku.xml(body) }
+        end
+      end
+      builder
+    end
+
+    # 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] 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, &block)
+      done_elems = []
+      while done_elems.empty?
+        resp_doc = nil
+        builder = get_builder_obj(shell_id, command_id, &block)
+        request_msg = builder.target!
+        resp_doc = send_get_output_message(request_msg)
+
+        output = Output.new
+        REXML::XPath.match(resp_doc, "//#{NS_WIN_SHELL}:Stream").each do |n|
+          next if n.text.nil? || n.text.empty?
+          stream = { n.attributes['Name'].to_sym => Base64.decode64(n.text) }
+          output[:data] << stream
+          yield stream[:stdout], stream[:stderr] if block_given?
+        end
+
+        # We may need to get additional output if the stream has not finished.
+        # The CommandState will change from Running to Done like so:
+        # @example
+        #   from...
+        #   <rsp:CommandState CommandId="..." State="http://schemas.microsoft.com/wbem/wsman/1/windows/shell/CommandState/Running"/>
+        #   to...
+        #   <rsp:CommandState CommandId="..." State="http://schemas.microsoft.com/wbem/wsman/1/windows/shell/CommandState/Done">
+        #     <rsp:ExitCode>0</rsp:ExitCode>
+        #   </rsp:CommandState>
+        done_elems = REXML::XPath.match(resp_doc, "//*[@State='http://schemas.microsoft.com/wbem/wsman/1/windows/shell/CommandState/Done']")
+      end
+      output[:exitcode] = REXML::XPath.first(resp_doc, "//#{NS_WIN_SHELL}:ExitCode").text.to_i
+      output
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winrm-s
 version: !ruby/object:Gem::Version
-  version: 0.3.0.dev.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -126,9 +126,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14