winrm 1.0.0rc4 → 1.0.0

data/.gitignore

@@ -0,0 +1,6 @@
+*.swp
+*.gem
+pkg/*
+.rvmrc
+test/spec/creds*.json
+traces/

data/Rakefile

@@ -1,52 +1,20 @@
 require 'rubygems'
 require 'rake/clean'
-require 'rake/gempackagetask'
 require 'date'
 
 CLEAN.include("pkg")
 CLEAN.include("doc")
+CLEAN.include("*.gem")
 
-GEMSPEC = Gem::Specification.new do |gem|
-  gem.name = "winrm"
-  gem.version = File.open('VERSION').readline.chomp
-  gem.date		= Date.today.to_s
-  gem.platform = Gem::Platform::RUBY
-  gem.rubyforge_project  = nil
+task :default => [:gem]
 
-  gem.author = "Dan Wanek"
-  gem.email = "dan.wanek@gmail.com"
-  gem.homepage = "http://github.com/zenchild/WinRM"
-
-  gem.summary = 'Ruby library for Windows Remote Management'
-  gem.description	= <<-EOF
-    Ruby library for Windows Remote Management
-  EOF
-
-  gem.files = `git ls-files`.split(/\n/)
-  gem.require_path = "lib"
-  gem.rdoc_options	= %w(-x test/ -x examples/)
-  gem.extra_rdoc_files = %w(README COPYING.txt)
-
-  gem.required_ruby_version	= '>= 1.8.7'
-  gem.add_runtime_dependency  'handsoap'
-  gem.add_runtime_dependency  'nokogiri'
-  gem.add_runtime_dependency  'httpclient'
-  gem.add_runtime_dependency  'rubyntlm'
-  gem.add_runtime_dependency  'uuid'
+desc "Build the gem from the gemspec"
+task :repackage do
+    system "gem build winrm.gemspec"
 end
- 
-Rake::GemPackageTask.new(GEMSPEC) do |pkg|
-  pkg.need_tar = true
-end
-
-task :default => [:buildgem]
 
 desc "Build the gem without a version change"
-task :buildgem => [:clean, :repackage]
-
-desc "Build the gem, but increment the version first"
-task :newrelease => [:versionup, :clean, :repackage]
-
+task :gem => [:clean, :repackage]
 
 desc "Increment the version by 1 minor release"
 task :versionup do
@@ -54,6 +22,9 @@ task :versionup do
 	puts "New version: #{ver}"
 end
 
+desc "Build the gem, but increment the version first"
+task :newrelease => [:versionup, :clean, :repackage]
+
 
 def up_min_version
 	f = File.open('VERSION', 'r+')

data/VERSION

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

data/lib/winrm/exceptions/exceptions.rb

@@ -29,5 +29,8 @@ module WinRM
 
   # A Fault returned in the SOAP response. The XML node is a WSManFault
   class WinRMWSManFault < StandardError; end
+
+  # Bad HTTP Transport
+  class WinRMHTTPTransportError < StandardError; end
 end # WinRM
 

data/lib/winrm/http/transport.rb

@@ -11,6 +11,7 @@ module WinRM
       def initialize(endpoint)
         @endpoint = endpoint.is_a?(String) ? URI.parse(endpoint) : endpoint
         @httpcli = HTTPClient.new(:agent_name => 'Ruby WinRM Client')
+        @httpcli.receive_timeout = 3600 # Set this to an unreasonable amount for now because WinRM has timeouts
       end
 
       def send_request(message)
@@ -19,19 +20,17 @@ module WinRM
         if(resp.status == 200)
           # Version 1.1 of WinRM adds the namespaces in the document instead of the envelope so we have to
           # add them ourselves here. This should have no affect version 2.
-          doc = Nokogiri::XML(resp.body.content)
+          doc = Nokogiri::XML(resp.http_body.content)
           doc.collect_namespaces.each_pair do |k,v|
             doc.root.add_namespace((k.split(/:/).last),v) unless doc.namespaces.has_key?(k)
           end
           return doc
         else
-          puts "RESPONSE was #{resp.status}"
-          # TODO: raise error
+          raise WinRMHTTPTransportError, "Bad HTTP response returned from server (#{resp.status})."
         end
       end
 
       # We'll need this to force basic authentication if desired
-      # TODO: implement this for basic auth needs
       def basic_auth_only!
         auths = @httpcli.www_auth.instance_variable_get('@authenticator')
         auths.delete_if {|i| i.scheme !~ /basic/i}
@@ -64,6 +63,9 @@ module WinRM
       # @param [String<optional>] keytab the path to a keytab file if you are using one
       def initialize(endpoint, realm, service = nil, keytab = nil, opts)
         super(endpoint)
+        # Remove the GSSAPI auth from HTTPClient because we are doing our own thing
+        auths = @httpcli.www_auth.instance_variable_get('@authenticator')
+        auths.delete_if {|i| i.is_a?(HTTPClient::SSPINegotiateAuth)}
         service ||= 'HTTP'
         @service = "#{service}/#{@endpoint.host}@#{realm}"
         init_krb
@@ -92,7 +94,7 @@ Content-Type: application/octet-stream\r
 
         r = @httpcli.post(@endpoint, body, hdr)
 
-        winrm_decrypt(r.body.content)
+        winrm_decrypt(r.http_body.content)
       end
 
 

data/lib/winrm/soap_provider.rb

@@ -20,8 +20,7 @@
 
 require 'httpclient'
 require 'savon/soap/xml'
-require 'uuid'
-require 'gssapi'
+require 'uuidtools'
 require 'base64'
 require 'nokogiri'
 
@@ -36,6 +35,7 @@ module WinRM
   NS_SCHEMA_INST ='xsi' # http://www.w3.org/2001/XMLSchema-instance
   NS_WIN_SHELL   ='rsp' # http://schemas.microsoft.com/wbem/wsman/1/windows/shell
   NS_WSMAN_FAULT = 'f'  # http://schemas.microsoft.com/wbem/wsman/1/wsmanfault
+  NS_WSMAN_CONF  = 'cfg'# http://schemas.microsoft.com/wbem/wsman/1/config
 end
 
 require 'winrm/exceptions/exceptions'

data/lib/winrm/winrm_service.rb

@@ -7,7 +7,7 @@ module WinRM
     DEFAULT_MAX_ENV_SIZE = 153600
     DEFAULT_LOCALE = 'en-US'
 
-    attr_reader :endpoint
+    attr_reader :endpoint, :timeout
 
     # @param [String,URI] endpoint the WinRM webservice endpoint
     # @param [Symbol] transport either :kerberos(default)/:ssl/:plaintext
@@ -22,6 +22,7 @@ module WinRM
       @locale = DEFAULT_LOCALE
       case transport
       when :kerberos
+        require 'gssapi'
         # TODO: check fo keys and throw error if missing
         @xfer = HTTP::HttpGSSAPI.new(endpoint, opts[:realm], opts[:service], opts[:keytab], opts)
       when :plaintext
@@ -32,34 +33,64 @@ module WinRM
     end
 
     # Operation timeout
-    def op_timeout(sec)
+    # @see http://msdn.microsoft.com/en-us/library/ee916629(v=PROT.13).aspx
+    # @param [Fixnum] sec the number of seconds to set the timeout to. It will be converted to an ISO8601 format.
+    def set_timeout(sec)
       @timeout = Iso8601Duration.sec_to_dur(sec)
     end
+    alias :op_timeout :set_timeout
 
     # Max envelope size
-    def max_env_size(sz)
-      @max_env_sz = sz
+    # @see http://msdn.microsoft.com/en-us/library/ee916127(v=PROT.13).aspx
+    # @param [Fixnum] byte_sz the max size in bytes to allow for the response
+    def max_env_size(byte_sz)
+      @max_env_sz = byte_sz
     end
 
-    # Default locale
+    # Set the locale
+    # @see http://msdn.microsoft.com/en-us/library/gg567404(v=PROT.13).aspx
+    # @param [String] locale the locale to set for future messages
     def locale(locale)
       @locale = locale
     end
 
     # Create a Shell on the destination host
-    # @param [String<optional>] i_stream Which input stream to open.  Leave this alone unless you know what you're doing
-    # @param [String<optional>] o_stream Which output stream to open.  Leave this alone unless you know what you're doing
+    # @param [Hash<optional>] shell_opts additional shell options you can pass
+    # @option shell_opts [String] :i_stream Which input stream to open.  Leave this alone unless you know what you're doing (default: stdin)
+    # @option shell_opts [String] :o_stream Which output stream to open.  Leave this alone unless you know what you're doing (default: stdout stderr)
+    # @option shell_opts [String] :working_directory the directory to create the shell in
+    # @option shell_opts [Hash] :env_vars environment variables to set for the shell. For instance;
+    #   :env_vars => {:myvar1 => 'val1', :myvar2 => 'var2'}
     # @return [String] The ShellId from the SOAP response.  This is our open shell instance on the remote machine.
-    def open_shell(i_stream = 'stdin', o_stream = 'stdout stderr')
+    def open_shell(shell_opts = {})
+      i_stream = shell_opts.has_key?(:i_stream) ? shell_opts[:i_stream] : 'stdin'
+      o_stream = shell_opts.has_key?(:o_stream) ? shell_opts[:o_stream] : 'stdout stderr'
+      codepage = shell_opts.has_key?(:codepage) ? shell_opts[:codepage] : 437
+      noprofile = shell_opts.has_key?(:noprofile) ? shell_opts[:noprofile] : 'FALSE'
       s = Savon::SOAP::XML.new
       s.version = 2
       s.namespaces.merge!(namespaces)
-      h_opts = { "#{NS_WSMAN_DMTF}:OptionSet" => { "#{NS_WSMAN_DMTF}:Option" => ['FALSE',437],
+      h_opts = { "#{NS_WSMAN_DMTF}:OptionSet" => { "#{NS_WSMAN_DMTF}:Option" => [noprofile, codepage],
         :attributes! => {"#{NS_WSMAN_DMTF}:Option" => {'Name' => ['WINRS_NOPROFILE','WINRS_CODEPAGE']}}}}
       s.header.merge!(merge_headers(header,resource_uri_cmd,action_create,h_opts))
       s.input = "#{NS_WIN_SHELL}:Shell"
-      s.body = { "#{NS_WIN_SHELL}:InputStreams" => i_stream,
-        "#{NS_WIN_SHELL}:OutputStreams" => o_stream}
+      s.body = {
+        "#{NS_WIN_SHELL}:InputStreams" => i_stream,
+        "#{NS_WIN_SHELL}:OutputStreams" => o_stream
+      }
+      s.body["#{NS_WIN_SHELL}:WorkingDirectory"] = shell_opts[:working_directory] if shell_opts.has_key?(:working_directory)
+      # TODO: research Lifetime a bit more: http://msdn.microsoft.com/en-us/library/cc251546(v=PROT.13).aspx
+      #s.body["#{NS_WIN_SHELL}:Lifetime"] = Iso8601Duration.sec_to_dur(shell_opts[:lifetime]) if(shell_opts.has_key?(:lifetime) && shell_opts[:lifetime].is_a?(Fixnum))
+      # @todo make it so the input is given in milliseconds and converted to xs:duration
+      s.body["#{NS_WIN_SHELL}:IdleTimeOut"] = shell_opts[:idle_timeout] if(shell_opts.has_key?(:idle_timeout) && shell_opts[:idle_timeout].is_a?(String))
+      if(shell_opts.has_key?(:env_vars) && shell_opts[:env_vars].is_a?(Hash))
+        keys = shell_opts[:env_vars].keys
+        vals = shell_opts[:env_vars].values
+        s.body["#{NS_WIN_SHELL}:Environment"] = {
+          "#{NS_WIN_SHELL}:Variable" => vals,
+          :attributes! => {"#{NS_WIN_SHELL}:Variable" => {'Name' => keys}}
+        }
+      end
 
       resp = send_message(s.to_xml)
       (resp/"//*[@Name='ShellId']").text
@@ -70,12 +101,14 @@ module WinRM
     # @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, arguments = [])
+    def run_command(shell_id, command, arguments = [], cmd_opts = {})
+      consolemode = cmd_opts.has_key?(:console_mode_stdin) ? cmd_opts[:console_mode_stdin] : 'TRUE'
+      skipcmd     = cmd_opts.has_key?(:skip_cmd_shell) ? cmd_opts[:skip_cmd_shell] : 'FALSE'
       s = Savon::SOAP::XML.new
       s.version = 2
       s.namespaces.merge!(namespaces)
       h_opts = { "#{NS_WSMAN_DMTF}:OptionSet" => {
-        "#{NS_WSMAN_DMTF}:Option" => ['TRUE','FALSE'],
+        "#{NS_WSMAN_DMTF}:Option" => [consolemode, skipcmd],
         :attributes! => {"#{NS_WSMAN_DMTF}:Option" => {'Name' => ['WINRS_CONSOLEMODE_STDIN','WINRS_SKIP_CMD_SHELL']}}}
       }
       s.header.merge!(merge_headers(header,resource_uri_cmd,action_command,h_opts,selector_shell_id(shell_id)))
@@ -177,9 +210,7 @@ module WinRM
       end
 
       resp = send_message(s.to_xml)
-
-      resp.remove_namespaces!
-      (resp/"//Fault").empty?
+      true
     end
 
     # Run a CMD command
@@ -219,6 +250,7 @@ module WinRM
       close_shell(shell_id)
       command_output
     end
+    alias :powershell :run_powershell_script
 
 
     # Run a WQL Query
@@ -250,6 +282,7 @@ module WinRM
       end
       items
     end
+    alias :wql :run_wql
 
 
     private
@@ -261,7 +294,9 @@ module WinRM
         'xmlns:x' => 'http://schemas.xmlsoap.org/ws/2004/09/transfer',
         'xmlns:w' => 'http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd',
         'xmlns:p' => 'http://schemas.microsoft.com/wbem/wsman/1/wsman.xsd',
-        'xmlns:rsp' => 'http://schemas.microsoft.com/wbem/wsman/1/windows/shell'}
+        'xmlns:rsp' => 'http://schemas.microsoft.com/wbem/wsman/1/windows/shell',
+        'xmlns:cfg' => 'http://schemas.microsoft.com/wbem/wsman/1/config',
+      }
     end
 
     def header
@@ -270,9 +305,10 @@ module WinRM
         "#{NS_ADDRESSING}:Address" => 'http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous',
           :attributes! => {"#{NS_ADDRESSING}:Address" => {'mustUnderstand' => true}}},
         "#{NS_WSMAN_DMTF}:MaxEnvelopeSize" => @max_env_sz,
-        "#{NS_ADDRESSING}:MessageID" => "uuid:#{UUID.generate.upcase}",
+        "#{NS_ADDRESSING}:MessageID" => "uuid:#{UUIDTools::UUID.random_create.to_s.upcase}",
         "#{NS_WSMAN_DMTF}:Locale/" => '',
         "#{NS_WSMAN_MSFT}:DataLocale/" => '',
+        #"#{NS_WSMAN_CONF}:MaxTimeoutms" => 600, #TODO: research this a bit http://msdn.microsoft.com/en-us/library/cc251561(v=PROT.13).aspx
         "#{NS_WSMAN_DMTF}:OperationTimeout" => @timeout,
         :attributes! => {
           "#{NS_WSMAN_DMTF}:MaxEnvelopeSize" => {'mustUnderstand' => true},
@@ -296,13 +332,19 @@ module WinRM
     def send_message(message)
       resp = @xfer.send_request(message)
 
-      errors = resp/"//#{NS_SOAP_ENV}:Body/#{NS_SOAP_ENV}:Fault/*"
-      if errors.empty?
-        return resp
-      else
-        resp.root.add_namespace(NS_WSMAN_FAULT,'http://schemas.microsoft.com/wbem/wsman/1/wsmanfault')
-        fault = (errors/"//#{NS_WSMAN_FAULT}:WSManFault").first
-        raise WinRMWSManFault, "[WSMAN ERROR CODE: #{fault['Code']}]: #{fault.text}"
+      begin
+        errors = resp/"//#{NS_SOAP_ENV}:Body/#{NS_SOAP_ENV}:Fault/*"
+        if errors.empty?
+          return resp
+        else
+          resp.root.add_namespace(NS_WSMAN_FAULT,'http://schemas.microsoft.com/wbem/wsman/1/wsmanfault')
+          fault = (errors/"//#{NS_WSMAN_FAULT}:WSManFault").first
+          raise WinRMWSManFault, "[WSMAN ERROR CODE: #{fault['Code']}]: #{fault.text}"
+        end
+      # Sometimes a blank response is returned and it will throw this error when the XPath is evaluated for Fault
+      # The returned string will be '<?xml version="1.0"?>\n' in these cases
+      rescue Nokogiri::XML::XPath::SyntaxError => e
+        raise WinRMWebServiceError, "Bad SOAP Packet returned. Sometimes a retry will solve this error."
       end
     end
 

data/test/.rspec

@@ -0,0 +1,2 @@
+--color
+--format nested

data/test/spec/cmd_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "Test remote WQL features via WinRM" do
+  before(:all) do
+    @winrm = winrm_connection
+  end
+
+  it 'should run a CMD command string' do
+    output = @winrm.run_cmd('ipconfig /all')
+    output[:exitcode].should == 0
+    output[:data].should_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
+  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/
+  end
+end

data/test/spec/powershell_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "Test remote Powershell features via WinRM" do
+  before(:all) do
+    @winrm = winrm_connection
+  end
+
+  it 'should run a test Powershell script' do
+    ps_file = File.open('spec/test.ps1', 'r+')
+    output = @winrm.run_powershell_script(File.open('spec/test.ps1'))
+    ps_file.close
+    output[:exitcode].should == 0
+  end
+end

data/test/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+$: << File.dirname(__FILE__) + '/../../lib/'
+require 'winrm'
+require 'json'
+
+module ConnectionHelper
+  # To run this test put a file called 'creds.json' in this directory with the following format:
+  #   {"user":"myuser","pass":"mypass","endpoint":"http://mysys.com/wsman","realm":"MY.REALM"}
+  CREDS_FILE='spec/creds.json'
+
+  def winrm_connection
+    creds = JSON.load(File.open(CREDS_FILE,'r'))
+    winrm = WinRM::WinRMWebService.new(creds['endpoint'], :kerberos, :realm => creds['realm'])
+    #winrm = WinRM::WinRMWebService.new(creds['endpoint'], :plaintext, :user => creds['user'], :pass => creds['pass'])
+    #winrm = WinRM::WinRMWebService.new(creds['endpoint'], :plaintext, :user => creds['user'], :pass => creds['pass'], :basic_auth_only => true)
+    winrm
+  end
+end
+
+RSpec.configure do |config|
+  config.include(ConnectionHelper)
+end

data/test/spec/winrm_primitives_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe "Test WinRM primitive methods" do
+  before(:all) do
+    @winrm = winrm_connection
+  end
+
+  it 'should #open_shell and #close_shell' do
+    sid = @winrm.open_shell
+    # match a UUID
+    sid.should =~ /^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}$/
+    @winrm.close_shell(sid).should be_true
+  end
+
+  it 'should #run_command and #cleanup_command' do
+    sid = @winrm.open_shell
+
+    cmd_id = @winrm.run_command(sid, 'ipconfig', %w{/all})
+    cmd_id.should =~ /^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}$/
+
+    @winrm.cleanup_command(sid, cmd_id).should be_true
+    @winrm.close_shell(sid)
+  end
+
+  it 'should #get_command_output' do
+    sid = @winrm.open_shell
+    cmd_id = @winrm.run_command(sid, 'ipconfig', %w{/all})
+
+    output = @winrm.get_command_output(sid, cmd_id)
+    output[:exitcode].should == 0
+    output[:data].should_not be_empty
+
+    @winrm.cleanup_command(sid, cmd_id)
+    @winrm.close_shell(sid)
+  end
+  
+  it 'should #get_command_output with a block' do
+    sid = @winrm.open_shell
+    cmd_id = @winrm.run_command(sid, 'ipconfig', %w{/all})
+
+    outvar = ''
+    @winrm.get_command_output(sid, cmd_id) do |stdout, stderr|
+      outvar << stdout
+    end
+    outvar.should =~ /Windows IP Configuration/
+
+    @winrm.cleanup_command(sid, cmd_id)
+    @winrm.close_shell(sid)
+  end
+
+  it 'should set #op_timeout' do
+    @winrm.op_timeout(120).should == 'PT2M0S'
+    @winrm.op_timeout(1202).should == 'PT20M2S'
+    @winrm.op_timeout(86400).should == 'PT24H0S'
+  end
+
+  it 'should set #max_env_size' do
+    @winrm.max_env_size(153600 * 4)
+    @winrm.instance_variable_get('@max_env_sz').should == 614400
+  end
+
+  it 'should set #locale' do
+    @winrm.locale('en-ca')
+    @winrm.instance_variable_get('@locale').should == 'en-ca'
+  end
+
+end

data/test/spec/wql_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "Test remote WQL features via WinRM" do
+  before(:all) do
+    @winrm = winrm_connection
+  end
+
+  it 'should run a WQL query against Win32_Service' do
+    output = @winrm.run_wql('select Name,Status from Win32_Service')
+    output.should_not be_empty
+  end
+end

data/winrm.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README COPYING.txt)
 
   s.required_ruby_version	= '>= 1.9.0'
-  s.add_runtime_dependency  'gssapi', '>= 0.1.5'
-  s.add_runtime_dependency  'nokogiri'
-  s.add_runtime_dependency  'httpclient'
-  s.add_runtime_dependency  'rubyntlm'
-  s.add_runtime_dependency  'uuid'
-  s.add_runtime_dependency  'savon'
+  s.add_runtime_dependency  'gssapi', '~> 0.1.5'
+  s.add_runtime_dependency  'nokogiri', '~> 1.4.4'
+  s.add_runtime_dependency  'httpclient', '~> 2.2.0.2'
+  s.add_runtime_dependency  'rubyntlm', '~> 0.1.1'
+  s.add_runtime_dependency  'uuidtools', '~> 2.1.2'
+  s.add_runtime_dependency  'savon', '~> 0.9.1'
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: winrm
 version: !ruby/object:Gem::Version 
-  prerelease: 5
-  version: 1.0.0rc4
+  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors: 
 - Dan Wanek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -05:00
+date: 2011-04-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.1.5
   type: :runtime
@@ -30,9 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.4.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -41,9 +41,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.2.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -52,20 +52,20 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: uuid
+  name: uuidtools
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.1.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -74,9 +74,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.1
   type: :runtime
   version_requirements: *id006
 description: "    Ruby library for Windows Remote Management\n"
@@ -89,6 +89,7 @@ extra_rdoc_files:
 - README
 - COPYING.txt
 files: 
+- .gitignore
 - COPYING.txt
 - README
 - Rakefile
@@ -100,10 +101,13 @@ files:
 - lib/winrm/soap_provider.rb
 - lib/winrm/winrm_service.rb
 - preamble
-- test/spec/powershell_tests.spec
-- test/spec/spec.opts
+- test/.rspec
+- test/spec/cmd_spec.rb
+- test/spec/powershell_spec.rb
+- test/spec/spec_helper.rb
 - test/spec/test.ps1
-- test/spec/wql_tests.spec
+- test/spec/winrm_primitives_spec.rb
+- test/spec/wql_spec.rb
 - winrm.gemspec
 has_rdoc: true
 homepage: http://github.com/zenchild/WinRM
@@ -126,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/test/spec/powershell_tests.spec

@@ -1,25 +0,0 @@
-$: << File.dirname(__FILE__) + '/../../lib/'
-require 'kconv'
-require 'winrm'
-require 'json'
-
-# To run this test put a file called 'creds.json' in this directory with the following format:
-#   {"user":"myuser","pass":"mypass","endpoint":"http://mysys.com/wsman"}
-
-
-describe "Test remote Powershell features via WinRM" do
-  before(:all) do
-    creds = JSON.load(File.open('spec/creds.json','r'))
-    WinRM::WinRM.endpoint = creds['endpoint']
-    WinRM::WinRM.set_auth(creds['user'],creds['pass'])
-    WinRM::WinRM.set_ca_trust_path('/etc/ssl/certs')
-    WinRM::WinRM.instance
-  end
-
-  it 'should run a test Powershell script' do
-    winrm = WinRM::WinRM.instance
-    output = winrm.powershell('spec/test.ps1')
-    output[:exitcode].should eql(0)
-  end
-
-end

data/test/spec/spec.opts

@@ -1,5 +0,0 @@
-spec/powershell_tests.spec
-spec/wql_tests.spec
---format
-nested
---color

data/test/spec/wql_tests.spec

@@ -1,24 +0,0 @@
-$: << File.dirname(__FILE__) + '/../../lib/'
-require 'kconv'
-require 'winrm'
-require 'json'
-
-# To run this test put a file called 'creds.json' in this directory with the following format:
-#   {"user":"myuser","pass":"mypass","endpoint":"http://mysys.com/wsman"}
-
-
-describe "Test remote WQL features via WinRM" do
-  before(:all) do
-    creds = JSON.load(File.open('spec/creds.json','r'))
-    WinRM::WinRM.endpoint = creds['endpoint']
-    WinRM::WinRM.set_auth(creds['user'],creds['pass'])
-    WinRM::WinRM.set_ca_trust_path('/etc/ssl/certs')
-    WinRM::WinRM.instance
-  end
-
-  it 'should run a WQL query against Win32_Service' do
-    winrm = WinRM::WinRM.instance
-    output = winrm.wql('select Name,Status from Win32_Service')
-    output.should_not be_empty
-  end
-end