winrm 1.0.0rc3 → 1.0.0rc4

data/README

@@ -63,10 +63,14 @@ end
 
 CONNECTION TYPES:
 
-BASIC:
+PLAINTEXT:
   WinRM::WinRMWebService.new(endpoint, :plaintext, :user => myuser, :pass => mypass)
-BASIC + SSL:
+  # Same but force basic authentication
+  WinRM::WinRMWebService.new(endpoint, :plaintext, :user => myuser, :pass => mypass, :basic_auth_only => true)
+SSL:
   WinRM::WinRMWebService.new(endpoint, :ssl, :user => myuser, :pass => mypass)
+  # Same but force basic authentication
+  WinRM::WinRMWebService.new(endpoint, :ssl, :user => myuser, :pass => mypass, :basic_auth_only => true)
 KERBEROS:
   WinRM::WinRMWebService.new(endpoint, :kerberos, :realm => 'MYREALM.COM')
 
@@ -80,3 +84,7 @@ http://github.com/zenchild/WinRM/issues
 
 Cheers!
 --------------------------------------------------------------------------
+
+
+Thurs : #9 5:30-6:30
+

data/VERSION

@@ -1 +1 @@
-1.0.0rc3
+1.0.0rc4

data/lib/winrm/http/transport.rb

@@ -39,18 +39,20 @@ module WinRM
     end
 
     class HttpPlaintext < HttpTransport
-      def initialize(endpoint, user, pass)
+      def initialize(endpoint, user, pass, opts)
         super(endpoint)
         @httpcli.set_auth(nil, user, pass)
+        basic_auth_only! if opts[:basic_auth_only]
       end
     end
 
     # Uses SSL to secure the transport
     class HttpSSL < HttpTransport
-      def initialize(endpoint, user, pass, ca_trust_path = nil)
+      def initialize(endpoint, user, pass, ca_trust_path = nil, opts)
         super(endpoint)
         @httpcli.set_auth(endpoint, user, pass)
         @httpcli.ssl_config.set_trust_ca(ca_trust_path) unless ca_trust_path.nil?
+        basic_auth_only! if opts[:basic_auth_only]
       end
     end
 
@@ -60,7 +62,7 @@ module WinRM
       # @param [String] realm the Kerberos realm we are authenticating to
       # @param [String<optional>] service the service name, default is HTTP
       # @param [String<optional>] keytab the path to a keytab file if you are using one
-      def initialize(endpoint, realm, service = nil, keytab = nil)
+      def initialize(endpoint, realm, service = nil, keytab = nil, opts)
         super(endpoint)
         service ||= 'HTTP'
         @service = "#{service}/#{@endpoint.host}@#{realm}"

data/lib/winrm/winrm_service.rb

@@ -23,11 +23,11 @@ module WinRM
       case transport
       when :kerberos
         # TODO: check fo keys and throw error if missing
-        @xfer = HTTP::HttpGSSAPI.new(endpoint, opts[:realm], opts[:service], opts[:keytab])
+        @xfer = HTTP::HttpGSSAPI.new(endpoint, opts[:realm], opts[:service], opts[:keytab], opts)
       when :plaintext
-        @xfer = HTTP::HttpPlaintext.new(endpoint, opts[:user], opts[:pass])
+        @xfer = HTTP::HttpPlaintext.new(endpoint, opts[:user], opts[:pass], opts)
       when :ssl
-        @xfer = HTTP::HttpSSL.new(endpoint, opts[:user], opts[:pass], opts[:ca_trust_path])
+        @xfer = HTTP::HttpSSL.new(endpoint, opts[:user], opts[:pass], opts[:ca_trust_path], opts)
       end
     end
 
@@ -68,8 +68,9 @@ module WinRM
     # Run a command on a machine with an open shell
     # @param [String] shell_id The shell id on the remote machine.  See #open_shell
     # @param [String] command The command to run on the remote machine
+    # @param [Array<String>] arguments An array of arguments for this command
     # @return [String] The CommandId from the SOAP response.  This is the ID we need to query in order to get output.
-    def run_command(shell_id, command)
+    def run_command(shell_id, command, arguments = [])
       s = Savon::SOAP::XML.new
       s.version = 2
       s.namespaces.merge!(namespaces)
@@ -79,7 +80,7 @@ module WinRM
       }
       s.header.merge!(merge_headers(header,resource_uri_cmd,action_command,h_opts,selector_shell_id(shell_id)))
       s.input = "#{NS_WIN_SHELL}:CommandLine"
-      s.body = { "#{NS_WIN_SHELL}:Command" => "\"#{command}\"" }
+      s.body = { "#{NS_WIN_SHELL}:Command" => "\"#{command}\"", "#{NS_WIN_SHELL}:Arguments" => arguments}
 
       resp = send_message(s.to_xml)
       (resp/"//#{NS_WIN_SHELL}:CommandId").text
@@ -183,10 +184,11 @@ module WinRM
 
     # Run a CMD command
     # @param [String] command The command to run on the remote system
+    # @param [Array <String>] arguments arguments to the command
     # @return [Hash] :stdout and :stderr
-    def run_cmd(command, &block)
+    def run_cmd(command, arguments = [], &block)
       shell_id = open_shell
-      command_id =  run_command(shell_id, command)
+      command_id =  run_command(shell_id, command, arguments)
       command_output = get_command_output(shell_id, command_id, &block)
       cleanup_command(shell_id, command_id)
       close_shell(shell_id)
@@ -222,36 +224,34 @@ module WinRM
     # Run a WQL Query
     # @see http://msdn.microsoft.com/en-us/library/aa394606(VS.85).aspx
     # @param [String] wql The WQL query
-    # @return [Array<Hash>] Returns an array of Hashes that contain the key/value pairs returned from the query.
+    # @return [Hash] Returns a Hash that contain the key/value pairs returned from the query.
     def run_wql(wql)
-      header = {}.merge(resource_uri_wmi).merge(action_enumerate)
-
-      begin
-        resp = invoke("#{NS_ENUM}:Enumerate", {:soap_action => :auto, :http_options => nil, :soap_header => header}) do |enum|
-          enum.add("#{NS_WSMAN_DMTF}:OptimizeEnumeration")
-          enum.add("#{NS_WSMAN_DMTF}:MaxElements",'32000')
-          mattr = nil
-          enum.add("#{NS_WSMAN_DMTF}:Filter", wql) do |filt|
-            filt.set_attr('Dialect','http://schemas.microsoft.com/wbem/wsman/1/WQL')
-          end
-        end
-      rescue Handsoap::Fault => e
-        raise WinRMWebServiceError, e.reason
-      end
+      s = Savon::SOAP::XML.new
+      s.version = 2
+      s.namespaces.merge!(namespaces)
+      s.header.merge!(merge_headers(header,resource_uri_wmi,action_enumerate))
+      s.input = "#{NS_ENUM}:Enumerate"
+      s.body = { "#{NS_WSMAN_DMTF}:OptimizeEnumeration" => nil,
+        "#{NS_WSMAN_DMTF}:MaxElements" => '32000',
+        "#{NS_WSMAN_DMTF}:Filter" => wql,
+        :attributes! => { "#{NS_WSMAN_DMTF}:Filter" => {'Dialect' => 'http://schemas.microsoft.com/wbem/wsman/1/WQL'}}
+      }
 
-      query_response = []
-      (resp/"//#{NS_ENUM}:EnumerateResponse//#{NS_WSMAN_DMTF}:Items/*").each do |i|
-        qitem = {}
-        (i/'*').each do |si|
-          qitem[si.node_name] = si.to_s
+      resp = send_message(s.to_xml)
+      hresp = Savon::SOAP::XML.to_hash resp.to_xml
+      # Normalize items so the type always has an array even if it's just a single item.
+      items = {}
+      hresp[:enumerate_response][:items].each_pair do |k,v|
+        if v.is_a?(Array)
+          items[k] = v
+        else
+          items[k] = [v]
         end
-        query_response << qitem
       end
-      query_response
+      items
     end
 
 
-
     private
 
     def namespaces

metadata

@@ -2,7 +2,7 @@
 name: winrm
 version: !ruby/object:Gem::Version 
   prerelease: 5
-  version: 1.0.0rc3
+  version: 1.0.0rc4
 platform: ruby
 authors: 
 - Dan Wanek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -05:00
+date: 2011-03-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency