winrm 2.0.3 → 2.1.0

data/lib/winrm.rb

@@ -1,39 +1,39 @@
-# encoding: UTF-8
-#
-# Copyright 2010 Dan Wanek <dan.wanek@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'logging'
-require_relative 'winrm/version'
-require_relative 'winrm/connection'
-require_relative 'winrm/exceptions'
-
-# Main WinRM module entry point
-module WinRM
-  # Enable logging if it is requested. We do this before
-  # anything else so that we can setup the output before
-  # any logging occurs.
-  if ENV['WINRM_LOG'] && ENV['WINRM_LOG'] != ''
-    begin
-      Logging.logger.root.level = ENV['WINRM_LOG']
-      Logging.logger.root.appenders = Logging.appenders.stderr
-    rescue ArgumentError
-      # This means that the logging level wasn't valid
-      $stderr.puts "Invalid WINRM_LOG level is set: #{ENV['WINRM_LOG']}"
-      $stderr.puts ''
-      $stderr.puts 'Please use one of the standard log levels: ' \
-        'debug, info, warn, or error'
-    end
-  end
-end
+# encoding: UTF-8
+#
+# Copyright 2010 Dan Wanek <dan.wanek@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'logging'
+require_relative 'winrm/version'
+require_relative 'winrm/connection'
+require_relative 'winrm/exceptions'
+
+# Main WinRM module entry point
+module WinRM
+  # Enable logging if it is requested. We do this before
+  # anything else so that we can setup the output before
+  # any logging occurs.
+  if ENV['WINRM_LOG'] && ENV['WINRM_LOG'] != ''
+    begin
+      Logging.logger.root.level = ENV['WINRM_LOG']
+      Logging.logger.root.appenders = Logging.appenders.stderr
+    rescue ArgumentError
+      # This means that the logging level wasn't valid
+      $stderr.puts "Invalid WINRM_LOG level is set: #{ENV['WINRM_LOG']}"
+      $stderr.puts ''
+      $stderr.puts 'Please use one of the standard log levels: ' \
+        'debug, info, warn, or error'
+    end
+  end
+end

data/lib/winrm/connection.rb

@@ -1,82 +1,83 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright 2016 Shawn Neal <sneal@sneal.net>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require_relative 'connection_opts'
-require_relative 'http/transport_factory'
-require_relative 'shells/shell_factory'
-require_relative 'wsmv/wql_query'
-
-module WinRM
-  # WinRM connection used to establish a session with the remote WinRM service.
-  class Connection
-    # Creates a new WinRM connection
-    # See the ConnectionOpts class for connection options.
-    def initialize(connection_opts)
-      configure_connection_opts(connection_opts)
-      configure_logger
-    end
-
-    attr_accessor :logger
-
-    # Creates a new shell on the remote Windows server associated with
-    # this connection.
-    # @param shell_type [Symbol] The shell type :cmd or :powershell
-    # @return [Shell] PowerShell or Cmd shell instance.
-    def shell(shell_type)
-      shell = shell_factory.create_shell(shell_type)
-      if block_given?
-        begin
-          yield shell
-        ensure
-          shell.close
-        end
-      else
-        shell
-      end
-    end
-
-    # Executes a WQL query against the WinRM connection
-    # @param wql [String] The wql query
-    # @return [Hash] Hash representation of wql query response
-    def run_wql(wql)
-      query = WinRM::WSMV::WqlQuery.new(@connection_opts, wql)
-      query.process_response(transport.send_request(query.build))
-    end
-
-    private
-
-    def configure_connection_opts(connection_opts)
-      @connection_opts = ConnectionOpts.create_with_defaults(connection_opts)
-    end
-
-    def configure_logger
-      @logger = Logging.logger[self]
-      logger.level = :warn
-      logger.add_appenders(Logging.appenders.stdout)
-    end
-
-    def shell_factory
-      @shell_factory ||= WinRM::Shells::ShellFactory.new(@connection_opts, transport, logger)
-    end
-
-    def transport
-      @transport ||= begin
-        transport_factory = WinRM::HTTP::TransportFactory.new
-        transport_factory.create_transport(@connection_opts)
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2016 Shawn Neal <sneal@sneal.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'connection_opts'
+require_relative 'http/transport_factory'
+require_relative 'shells/shell_factory'
+require_relative 'wsmv/wql_query'
+
+module WinRM
+  # WinRM connection used to establish a session with the remote WinRM service.
+  class Connection
+    # Creates a new WinRM connection
+    # See the ConnectionOpts class for connection options.
+    def initialize(connection_opts)
+      configure_connection_opts(connection_opts)
+      configure_logger
+    end
+
+    attr_accessor :logger
+
+    # Creates a new shell on the remote Windows server associated with
+    # this connection.
+    # @param shell_type [Symbol] The shell type :cmd or :powershell
+    # @param shell_opts [Hash] Options targeted for the created shell
+    # @return [Shell] PowerShell or Cmd shell instance.
+    def shell(shell_type, shell_opts = {})
+      shell = shell_factory.create_shell(shell_type, shell_opts)
+      if block_given?
+        begin
+          yield shell
+        ensure
+          shell.close
+        end
+      else
+        shell
+      end
+    end
+
+    # Executes a WQL query against the WinRM connection
+    # @param wql [String] The wql query
+    # @return [Hash] Hash representation of wql query response
+    def run_wql(wql)
+      query = WinRM::WSMV::WqlQuery.new(@connection_opts, wql)
+      query.process_response(transport.send_request(query.build))
+    end
+
+    private
+
+    def configure_connection_opts(connection_opts)
+      @connection_opts = ConnectionOpts.create_with_defaults(connection_opts)
+    end
+
+    def configure_logger
+      @logger = Logging.logger[self]
+      logger.level = :warn
+      logger.add_appenders(Logging.appenders.stdout)
+    end
+
+    def shell_factory
+      @shell_factory ||= WinRM::Shells::ShellFactory.new(@connection_opts, transport, logger)
+    end
+
+    def transport
+      @transport ||= begin
+        transport_factory = WinRM::HTTP::TransportFactory.new
+        transport_factory.create_transport(@connection_opts)
+      end
+    end
+  end
+end

data/lib/winrm/connection_opts.rb

@@ -1,91 +1,91 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright 2016 Shawn Neal <sneal@sneal.net>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'securerandom'
-
-module WinRM
-  # WinRM connection options, provides defaults and validation.
-  class ConnectionOpts < Hash
-    DEFAULT_OPERATION_TIMEOUT = 60
-    DEFAULT_RECEIVE_TIMEOUT = DEFAULT_OPERATION_TIMEOUT + 10
-    DEFAULT_MAX_ENV_SIZE = 153600
-    DEFAULT_LOCALE = 'en-US'.freeze
-    DEFAULT_RETRY_DELAY = 10
-    DEFAULT_RETRY_LIMIT = 3
-
-    class << self
-      def create_with_defaults(overrides)
-        config = default.merge(overrides)
-        config = ensure_receive_timeout_is_greater_than_operation_timeout(config)
-        config.validate
-        config
-      end
-
-      private
-
-      def ensure_receive_timeout_is_greater_than_operation_timeout(config)
-        if config[:receive_timeout] < config[:operation_timeout]
-          config[:receive_timeout] = config[:operation_timeout] + 10
-        end
-        config
-      end
-
-      def default
-        config = ConnectionOpts.new
-        config[:session_id] = SecureRandom.uuid.to_s.upcase
-        config[:transport] = :negotiate
-        config[:locale] = DEFAULT_LOCALE
-        config[:max_envelope_size] = DEFAULT_MAX_ENV_SIZE
-        config[:operation_timeout] = DEFAULT_OPERATION_TIMEOUT
-        config[:receive_timeout] = DEFAULT_RECEIVE_TIMEOUT
-        config[:retry_delay] = DEFAULT_RETRY_DELAY
-        config[:retry_limit] = DEFAULT_RETRY_LIMIT
-        config
-      end
-    end
-
-    def validate
-      validate_required_fields
-      validate_data_types
-    end
-
-    private
-
-    def validate_required_fields
-      raise 'endpoint is a required option' unless self[:endpoint]
-      if self[:client_cert]
-        raise 'path to client key is required' unless self[:client_key]
-      else
-        raise 'user is a required option' unless self[:user]
-        raise 'password is a required option' unless self[:password]
-      end
-    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])
-    end
-
-    def validate_fixnum(key, min = 0)
-      value = self[key]
-      raise "#{key} must be a Fixnum" unless value && value.is_a?(Fixnum)
-      raise "#{key} must be greater than #{min}" unless value > min
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2016 Shawn Neal <sneal@sneal.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'securerandom'
+
+module WinRM
+  # WinRM connection options, provides defaults and validation.
+  class ConnectionOpts < Hash
+    DEFAULT_OPERATION_TIMEOUT = 60
+    DEFAULT_RECEIVE_TIMEOUT = DEFAULT_OPERATION_TIMEOUT + 10
+    DEFAULT_MAX_ENV_SIZE = 153600
+    DEFAULT_LOCALE = 'en-US'.freeze
+    DEFAULT_RETRY_DELAY = 10
+    DEFAULT_RETRY_LIMIT = 3
+
+    class << self
+      def create_with_defaults(overrides)
+        config = default.merge(overrides)
+        config = ensure_receive_timeout_is_greater_than_operation_timeout(config)
+        config.validate
+        config
+      end
+
+      private
+
+      def ensure_receive_timeout_is_greater_than_operation_timeout(config)
+        if config[:receive_timeout] < config[:operation_timeout]
+          config[:receive_timeout] = config[:operation_timeout] + 10
+        end
+        config
+      end
+
+      def default
+        config = ConnectionOpts.new
+        config[:session_id] = SecureRandom.uuid.to_s.upcase
+        config[:transport] = :negotiate
+        config[:locale] = DEFAULT_LOCALE
+        config[:max_envelope_size] = DEFAULT_MAX_ENV_SIZE
+        config[:operation_timeout] = DEFAULT_OPERATION_TIMEOUT
+        config[:receive_timeout] = DEFAULT_RECEIVE_TIMEOUT
+        config[:retry_delay] = DEFAULT_RETRY_DELAY
+        config[:retry_limit] = DEFAULT_RETRY_LIMIT
+        config
+      end
+    end
+
+    def validate
+      validate_required_fields
+      validate_data_types
+    end
+
+    private
+
+    def validate_required_fields
+      raise 'endpoint is a required option' unless self[:endpoint]
+      if self[:client_cert]
+        raise 'path to client key is required' unless self[:client_key]
+      else
+        raise 'user is a required option' unless self[:user]
+        raise 'password is a required option' unless self[:password]
+      end
+    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])
+    end
+
+    def validate_fixnum(key, min = 0)
+      value = self[key]
+      raise "#{key} must be a Fixnum" unless value && value.is_a?(Fixnum)
+      raise "#{key} must be greater than #{min}" unless value > min
+    end
+  end
+end

data/lib/winrm/exceptions.rb

@@ -1,76 +1,76 @@
-# encoding: UTF-8
-#
-# Copyright 2010 Dan Wanek <dan.wanek@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module WinRM
-  # WinRM base class for errors
-  class WinRMError < StandardError; end
-
-  # Authorization Error
-  class WinRMAuthorizationError < WinRMError; end
-
-  # Shell creation error
-  class InvalidShellError < WinRMError; end
-
-  # Exitcode error
-  class InvalidExitCode < WinRMError; end
-
-  # Shell creation error
-  class InvalidTransportError < WinRMError
-    attr_reader :invalid_transport
-
-    def initialize(invalid_transport, valid_transports)
-      @invalid_transport = invalid_transport
-      super(
-        "Invalid transport '#{invalid_transport}' specified" \
-        ", expected: #{valid_transports.join(', ')}."
-      )
-    end
-  end
-
-  # A Fault returned in the SOAP response. The XML node is a WSManFault
-  class WinRMWSManFault < WinRMError
-    attr_reader :fault_code
-    attr_reader :fault_description
-
-    def initialize(fault_description, fault_code)
-      @fault_description = fault_description
-      @fault_code = fault_code
-      super("[WSMAN ERROR CODE: #{fault_code}]: #{fault_description}")
-    end
-  end
-
-  # A Fault returned in the SOAP response. The XML node is a MSFT_WmiError
-  class WinRMWMIError < WinRMError
-    attr_reader :error_code
-    attr_reader :error
-
-    def initialize(error, error_code)
-      @error = error
-      @error_code = error_code
-      super("[WMI ERROR CODE: #{error_code}]: #{error}")
-    end
-  end
-
-  # non-200 response without a SOAP fault
-  class WinRMHTTPTransportError < WinRMError
-    attr_reader :status_code
-
-    def initialize(msg, status_code = nil)
-      @status_code = status_code
-      super(msg + " (#{status_code}).")
-    end
-  end
-end
+# encoding: UTF-8
+#
+# Copyright 2010 Dan Wanek <dan.wanek@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module WinRM
+  # WinRM base class for errors
+  class WinRMError < StandardError; end
+
+  # Authorization Error
+  class WinRMAuthorizationError < WinRMError; end
+
+  # Shell creation error
+  class InvalidShellError < WinRMError; end
+
+  # Exitcode error
+  class InvalidExitCode < WinRMError; end
+
+  # Shell creation error
+  class InvalidTransportError < WinRMError
+    attr_reader :invalid_transport
+
+    def initialize(invalid_transport, valid_transports)
+      @invalid_transport = invalid_transport
+      super(
+        "Invalid transport '#{invalid_transport}' specified" \
+        ", expected: #{valid_transports.join(', ')}."
+      )
+    end
+  end
+
+  # A Fault returned in the SOAP response. The XML node is a WSManFault
+  class WinRMWSManFault < WinRMError
+    attr_reader :fault_code
+    attr_reader :fault_description
+
+    def initialize(fault_description, fault_code)
+      @fault_description = fault_description
+      @fault_code = fault_code
+      super("[WSMAN ERROR CODE: #{fault_code}]: #{fault_description}")
+    end
+  end
+
+  # A Fault returned in the SOAP response. The XML node is a MSFT_WmiError
+  class WinRMWMIError < WinRMError
+    attr_reader :error_code
+    attr_reader :error
+
+    def initialize(error, error_code)
+      @error = error
+      @error_code = error_code
+      super("[WMI ERROR CODE: #{error_code}]: #{error}")
+    end
+  end
+
+  # non-200 response without a SOAP fault
+  class WinRMHTTPTransportError < WinRMError
+    attr_reader :status_code
+
+    def initialize(msg, status_code = nil)
+      @status_code = status_code
+      super(msg + " (#{status_code}).")
+    end
+  end
+end