winrm 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7008164689e6ff66359218a1c3d35aa83690f0
-  data.tar.gz: 61301e63b59b0080c7e97c1a24cd9fe8feff58a2
+  metadata.gz: ab6bcb370baa18dbd4e1b94d90511cd56d125b0a
+  data.tar.gz: 6d9c7835ea837bab0450b4955955831fcdb73407
 SHA512:
-  metadata.gz: 3947c9f5095f99380485cc7df15d9cc999ca57216882d56c8e32e8b0ae744e8fd2b2bbd4a03db012cbcf2dc66de041259d0fbdfdcbc5e4c2e9b3a60c912e8a7d
-  data.tar.gz: a451b042529eec914cb0cfcb72d4c59b76453e49fb371b3f35ae8b0abf362d2a9b307807fc8cce582adcafd3e32dfe29b7aa7485afcf713db59db37ef8506a4b
+  metadata.gz: ed23571d9ad2479542694df5217dfdbe82c4697a1f3844324ba9c11c0112a96e2ea047355e2bc173c8fff68c2432b020cdf30e7e3b40241c12190f80342b1309
+  data.tar.gz: 2650558508f0a36ec2f20caf21d22a68fc743cb5942c731273f04f1000f9520d2bf51ddf1df410042c2f2bd83c3e0735b835a25e08510c344423d0cde5098212

data/changelog.md

@@ -1,5 +1,9 @@
 # WinRM Gem Changelog
 
+# 2.1.3
+- Ignore WSManFault 2150858843 during command cleanup
+- Uns `Integer` in place of `Fixnum` to remove deprecation warnings in ruby 2.4
+
 # 2.1.2
 - Fix kerberos transport
 

data/lib/winrm/connection_opts.rb

@@ -75,16 +75,16 @@ module WinRM
     end
 
     def validate_data_types
-      validate_fixnum(:retry_limit)
-      validate_fixnum(:retry_delay)
-      validate_fixnum(:max_envelope_size)
-      validate_fixnum(:operation_timeout)
-      validate_fixnum(:receive_timeout, self[:operation_timeout])
+      validate_integer(:retry_limit)
+      validate_integer(:retry_delay)
+      validate_integer(:max_envelope_size)
+      validate_integer(:operation_timeout)
+      validate_integer(:receive_timeout, self[:operation_timeout])
     end
 
-    def validate_fixnum(key, min = 0)
+    def validate_integer(key, min = 0)
       value = self[key]
-      raise "#{key} must be a Fixnum" unless value && value.is_a?(Fixnum)
+      raise "#{key} must be a Integer" unless value && value.is_a?(Integer)
       raise "#{key} must be greater than #{min}" unless value > min
     end
   end

data/lib/winrm/psrp/fragment.rb

@@ -21,9 +21,9 @@ module WinRM
     # PowerShell Remoting Protocol message fragment.
     class Fragment
       # Creates a new PSRP message fragment
-      # @param object_id [Fixnum] The id of the fragmented message.
+      # @param object_id [Integer] The id of the fragmented message.
       # @param blob [Array] Array of fragmented bytes.
-      # @param fragment_id [Fixnum] The id of this fragment
+      # @param fragment_id [Integer] The id of this fragment
       # @param start_fragment [Boolean] If the fragment is the first fragment
       # @param end_fragment [Boolean] If the fragment is the last fragment
       def initialize(object_id, blob, fragment_id = 0, start_fragment = true, end_fragment = true)

data/lib/winrm/psrp/message.rb

@@ -70,10 +70,10 @@ module WinRM
       # Creates a new PSRP message instance
       # @param runspace_pool_id [String] The UUID of the remote shell/runspace pool.
       # @param pipeline_id [String] The UUID to correlate the command/pipeline response
-      # @param type [Fixnum] The PSRP MessageType. This is most commonly
+      # @param type [Integer] The PSRP MessageType. This is most commonly
       # specified in hex, e.g. 0x00010002.
       # @param data [String] The PSRP payload as serialized XML
-      # @param destination [Fixnum] The destination for this message - client or server
+      # @param destination [Integer] The destination for this message - client or server
       def initialize(
         runspace_pool_id,
         type,

data/lib/winrm/shells/base.rb

@@ -30,6 +30,7 @@ module WinRM
     class Base
       TOO_MANY_COMMANDS = '2150859174'.freeze
       ERROR_OPERATION_ABORTED = '995'.freeze
+      SHELL_NOT_FOUND = '2150858843'.freeze
 
       FAULTS_FOR_RESET = [
         '2150858843', # Shell has been closed
@@ -150,7 +151,7 @@ module WinRM
           command_id: command_id)
         transport.send_request(cleanup_msg.build)
       rescue WinRMWSManFault => e
-        raise unless e.fault_code == ERROR_OPERATION_ABORTED
+        raise unless [ERROR_OPERATION_ABORTED, SHELL_NOT_FOUND].include?(e.fault_code)
       rescue WinRMHTTPTransportError => t
         # dont let the cleanup raise so we dont lose any errors from the command
         logger.info("[WinRM] #{t.status_code} returned in cleanup with error: #{t.message}")

data/lib/winrm/shells/retryable.rb

@@ -31,8 +31,8 @@ module WinRM
       end
 
       # Retries the operation a specified number of times with a delay between
-      # @param retries [Fixnum] The number of times to retry
-      # @param delay [Fixnum] The number of seconds to wait between retry attempts
+      # @param retries [Integer] The number of times to retry
+      # @param delay [Integer] The number of seconds to wait between retry attempts
       def retryable(retries, delay)
         yield
       rescue *RETRYABLE_EXCEPTIONS.call

data/lib/winrm/version.rb

@@ -3,5 +3,5 @@
 # WinRM module
 module WinRM
   # The version of the WinRM library
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3'.freeze
 end

data/lib/winrm/wsmv/iso8601_duration.rb

@@ -23,7 +23,7 @@ module WinRM
     module Iso8601Duration
       # Convert the number of seconds to an ISO8601 duration format
       # @see http://tools.ietf.org/html/rfc2445#section-4.3.6
-      # @param [Fixnum] seconds The amount of seconds for this duration
+      # @param [Integer] seconds The amount of seconds for this duration
       def self.sec_to_dur(seconds)
         seconds = seconds.to_i
         iso_str = 'P'

data/tests/spec/shells/base_spec.rb

@@ -117,6 +117,20 @@ describe DummyShell do
       subject.run(command, arguments)
     end
 
+    it 'does not error if shell is not present anymore' do
+      allow(SecureRandom).to receive(:uuid).and_return('uuid')
+      expect(transport).to receive(:send_request)
+        .with(
+          WinRM::WSMV::CleanupCommand.new(
+            connection_options,
+            shell_uri: nil,
+            shell_id: shell_id,
+            command_id: command_id
+          ).build
+        ).and_raise(WinRM::WinRMWSManFault.new('oops', '2150858843'))
+      subject.run(command, arguments)
+    end
+
     it 'opens a shell only once when shell is already open' do
       expect(subject).to receive(:open_shell).and_call_original.once
       subject.run(command, arguments)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Dan Wanek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gssapi