webdrivers 3.9.1 → 3.9.2

data/lib/webdrivers/geckodriver.rb

@@ -1,72 +1,80 @@
-# frozen_string_literal: true
-
-require 'nokogiri'
-require 'webdrivers/common'
-
-module Webdrivers
-  class Geckodriver < Common
-    class << self
-      def current_version
-        Webdrivers.logger.debug 'Checking current version'
-        return nil unless exists?
-
-        version = binary_version
-        return nil if version.nil?
-
-        normalize_version version.match(/geckodriver (\d+\.\d+\.\d+)/)[1]
-      end
-
-      def latest_version
-        @latest_version ||= with_cache(file_name) { normalize_version(Network.get_url("#{base_url}/latest")[/[^v]*$/]) }
-      end
-
-      private
-
-      def file_name
-        System.platform == 'win' ? 'geckodriver.exe' : 'geckodriver'
-      end
-
-      def base_url
-        'https://github.com/mozilla/geckodriver/releases'
-      end
-
-      def download_url
-        @download_url ||= if required_version == EMPTY_VERSION
-                            direct_url(latest_version)
-                          else
-                            direct_url(required_version)
-                          end
-      end
-
-      def direct_url(version)
-        "#{base_url}/download/v#{version}/geckodriver-v#{version}-#{platform_ext}"
-      end
-
-      def platform_ext
-        case System.platform
-        when 'linux'
-          "linux#{System.bitsize}.tar.gz"
-        when 'mac'
-          'macos.tar.gz'
-        when 'win'
-          "win#{System.bitsize}.zip"
-        end
-      end
-    end
-  end
-end
-
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::Firefox::Service.driver_path = proc { ::Webdrivers::Geckodriver.update }
-else
-  # v3.141.0 and lower
-  module Selenium
-    module WebDriver
-      module Firefox
-        def self.driver_path
-          @driver_path ||= Webdrivers::Geckodriver.update
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'nokogiri'
+require 'webdrivers/common'
+
+module Webdrivers
+  class Geckodriver < Common
+    class << self
+      #
+      # Returns current geckodriver version.
+      #
+      # @return [Gem::Version]
+      def current_version
+        Webdrivers.logger.debug 'Checking current version'
+        return nil unless exists?
+
+        version = binary_version
+        return nil if version.nil?
+
+        normalize_version version.match(/geckodriver (\d+\.\d+\.\d+)/)[1]
+      end
+
+      #
+      # Returns latest available geckodriver version.
+      #
+      # @return [Gem::Version]
+      def latest_version
+        @latest_version ||= with_cache(file_name) { normalize_version(Network.get_url("#{base_url}/latest")[/[^v]*$/]) }
+      end
+
+      private
+
+      def file_name
+        System.platform == 'win' ? 'geckodriver.exe' : 'geckodriver'
+      end
+
+      def base_url
+        'https://github.com/mozilla/geckodriver/releases'
+      end
+
+      def download_url
+        @download_url ||= if required_version == EMPTY_VERSION
+                            direct_url(latest_version)
+                          else
+                            direct_url(required_version)
+                          end
+      end
+
+      def direct_url(version)
+        "#{base_url}/download/v#{version}/geckodriver-v#{version}-#{platform_ext}"
+      end
+
+      def platform_ext
+        case System.platform
+        when 'linux'
+          "linux#{System.bitsize}.tar.gz"
+        when 'mac'
+          'macos.tar.gz'
+        when 'win'
+          "win#{System.bitsize}.zip"
+        end
+      end
+    end
+  end
+end
+
+if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+  ::Selenium::WebDriver::Firefox::Service.driver_path = proc { ::Webdrivers::Geckodriver.update }
+else
+  # v3.141.0 and lower
+  module Selenium
+    module WebDriver
+      module Firefox
+        def self.driver_path
+          @driver_path ||= Webdrivers::Geckodriver.update
+        end
+      end
+    end
+  end
+end

data/lib/webdrivers/iedriver.rb

@@ -1,62 +1,70 @@
-# frozen_string_literal: true
-
-require 'nokogiri'
-require 'rubygems/version'
-require 'webdrivers/common'
-
-module Webdrivers
-  class IEdriver < Common
-    class << self
-      def current_version
-        Webdrivers.logger.debug 'Checking current version'
-        return nil unless exists?
-
-        version = binary_version
-        return nil if version.nil?
-
-        normalize_version version.match(/IEDriverServer.exe (\d\.\d+\.\d+)/)[1]
-      end
-
-      def latest_version
-        @latest_version ||= with_cache(file_name) { downloads.keys.max }
-      end
-
-      private
-
-      def file_name
-        'IEDriverServer.exe'
-      end
-
-      def base_url
-        'https://selenium-release.storage.googleapis.com/'
-      end
-
-      def downloads
-        doc = Nokogiri::XML.parse(Network.get(base_url))
-        items = doc.css('Key').collect(&:text)
-        items.select! { |item| item.include?('IEDriverServer_Win32') }
-        ds = items.each_with_object({}) do |item, hash|
-          key = normalize_version item[/([^_]+)\.zip/, 1]
-          hash[key] = "#{base_url}#{item}"
-        end
-        Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
-        ds
-      end
-    end
-  end
-end
-
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::IE::Service.driver_path = proc { ::Webdrivers::IEdriver.update }
-else
-  # v3.141.0 and lower
-  module Selenium
-    module WebDriver
-      module IE
-        def self.driver_path
-          @driver_path ||= Webdrivers::IEdriver.update
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'nokogiri'
+require 'rubygems/version'
+require 'webdrivers/common'
+
+module Webdrivers
+  class IEdriver < Common
+    class << self
+      #
+      # Returns current IEDriverServer.exe version.
+      #
+      # @return [Gem::Version]
+      def current_version
+        Webdrivers.logger.debug 'Checking current version'
+        return nil unless exists?
+
+        version = binary_version
+        return nil if version.nil?
+
+        normalize_version version.match(/IEDriverServer.exe (\d\.\d+\.\d+)/)[1]
+      end
+
+      #
+      # Returns latest available IEDriverServer.exe version.
+      #
+      # @return [Gem::Version]
+      def latest_version
+        @latest_version ||= with_cache(file_name) { downloads.keys.max }
+      end
+
+      private
+
+      def file_name
+        'IEDriverServer.exe'
+      end
+
+      def base_url
+        'https://selenium-release.storage.googleapis.com/'
+      end
+
+      def downloads
+        doc = Nokogiri::XML.parse(Network.get(base_url))
+        items = doc.css('Key').collect(&:text)
+        items.select! { |item| item.include?('IEDriverServer_Win32') }
+        ds = items.each_with_object({}) do |item, hash|
+          key = normalize_version item[/([^_]+)\.zip/, 1]
+          hash[key] = "#{base_url}#{item}"
+        end
+        Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
+        ds
+      end
+    end
+  end
+end
+
+if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+  ::Selenium::WebDriver::IE::Service.driver_path = proc { ::Webdrivers::IEdriver.update }
+else
+  # v3.141.0 and lower
+  module Selenium
+    module WebDriver
+      module IE
+        def self.driver_path
+          @driver_path ||= Webdrivers::IEdriver.update
+        end
+      end
+    end
+  end
+end

data/lib/webdrivers/logger.rb

@@ -1,111 +1,111 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-require 'logger'
-
-# Code adapted from Selenium Implementation
-# https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/common/logger.rb
-
-module Webdrivers
-  #
-  # @example Enable full logging
-  #   Webdrivers.logger.level = :debug
-  #
-  # @example Log to file
-  #   Webdrivers.logger.output = 'webdrivers.log'
-  #
-  # @example Use logger manually
-  #   Webdrivers.logger.info('This is info message')
-  #   Webdrivers.logger.warn('This is warning message')
-  #
-  class Logger
-    extend Forwardable
-    include ::Logger::Severity
-
-    def_delegators :@logger, :debug, :debug?,
-                   :info, :info?,
-                   :warn, :warn?,
-                   :error, :error?,
-                   :fatal, :fatal?,
-                   :level
-
-    def initialize
-      @logger = create_logger($stdout)
-    end
-
-    def output=(io)
-      # `Logger#reopen` was added in Ruby 2.3
-      if @logger.respond_to?(:reopen)
-        @logger.reopen(io)
-      else
-        @logger = create_logger(io)
-      end
-    end
-
-    #
-    # For Ruby < 2.3 compatibility
-    # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
-    #
-
-    def level=(severity)
-      if severity.is_a?(Integer)
-        @logger.level = severity
-      else
-        case severity.to_s.downcase
-        when 'debug'
-          @logger.level = DEBUG
-        when 'info'
-          @logger.level = INFO
-        when 'warn'
-          @logger.level = WARN
-        when 'error'
-          @logger.level = ERROR
-        when 'fatal'
-          @logger.level = FATAL
-        when 'unknown'
-          @logger.level = UNKNOWN
-        else
-          raise ArgumentError, "invalid log level: #{severity}"
-        end
-      end
-    end
-
-    #
-    # Returns IO object used by logger internally.
-    #
-    # Normally, we would have never needed it, but we want to
-    # use it as IO object for all child processes to ensure their
-    # output is redirected there.
-    #
-    # It is only used in debug level, in other cases output is suppressed.
-    #
-    # @api private
-    #
-    def io
-      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
-    end
-
-    #
-    # Marks code as deprecated with replacement.
-    #
-    # @param [String] old
-    # @param [String] new
-    #
-    def deprecate(old, new)
-      warn "[DEPRECATION] #{old} is deprecated. Use #{new} instead."
-    end
-
-    private
-
-    def create_logger(output)
-      logger = ::Logger.new(output)
-      logger.progname = 'Webdrivers'
-      logger.level = ($DEBUG ? DEBUG : WARN)
-      logger.formatter = proc do |severity, time, progname, msg|
-        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
-      end
-
-      logger
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'logger'
+
+# Code adapted from Selenium Implementation
+# https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/common/logger.rb
+
+module Webdrivers
+  #
+  # @example Enable full logging
+  #   Webdrivers.logger.level = :debug
+  #
+  # @example Log to file
+  #   Webdrivers.logger.output = 'webdrivers.log'
+  #
+  # @example Use logger manually
+  #   Webdrivers.logger.info('This is info message')
+  #   Webdrivers.logger.warn('This is warning message')
+  #
+  class Logger
+    extend Forwardable
+    include ::Logger::Severity
+
+    def_delegators :@logger, :debug, :debug?,
+                   :info, :info?,
+                   :warn, :warn?,
+                   :error, :error?,
+                   :fatal, :fatal?,
+                   :level
+
+    def initialize
+      @logger = create_logger($stdout)
+    end
+
+    def output=(io)
+      # `Logger#reopen` was added in Ruby 2.3
+      if @logger.respond_to?(:reopen)
+        @logger.reopen(io)
+      else
+        @logger = create_logger(io)
+      end
+    end
+
+    #
+    # For Ruby < 2.3 compatibility
+    # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
+    #
+
+    def level=(severity)
+      if severity.is_a?(Integer)
+        @logger.level = severity
+      else
+        case severity.to_s.downcase
+        when 'debug'
+          @logger.level = DEBUG
+        when 'info'
+          @logger.level = INFO
+        when 'warn'
+          @logger.level = WARN
+        when 'error'
+          @logger.level = ERROR
+        when 'fatal'
+          @logger.level = FATAL
+        when 'unknown'
+          @logger.level = UNKNOWN
+        else
+          raise ArgumentError, "invalid log level: #{severity}"
+        end
+      end
+    end
+
+    #
+    # Returns IO object used by logger internally.
+    #
+    # Normally, we would have never needed it, but we want to
+    # use it as IO object for all child processes to ensure their
+    # output is redirected there.
+    #
+    # It is only used in debug level, in other cases output is suppressed.
+    #
+    # @api private
+    #
+    def io
+      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
+    end
+
+    #
+    # Marks code as deprecated with replacement.
+    #
+    # @param [String] old
+    # @param [String] new
+    #
+    def deprecate(old, new)
+      warn "[DEPRECATION] #{old} is deprecated. Use #{new} instead."
+    end
+
+    private
+
+    def create_logger(output)
+      logger = ::Logger.new(output)
+      logger.progname = 'Webdrivers'
+      logger.level = ($DEBUG ? DEBUG : WARN)
+      logger.formatter = proc do |severity, time, progname, msg|
+        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
+      end
+
+      logger
+    end
+  end
+end