webdrivers 3.6.0 → 3.7.0

data/lib/webdrivers/geckodriver.rb

@@ -1,44 +1,44 @@
-require 'nokogiri'
-
-module Webdrivers
-  class Geckodriver < Common
-    class << self
-
-      def current_version
-        Webdrivers.logger.debug "Checking current version"
-        return nil unless downloaded?
-        string = %x(#{binary} --version)
-        Webdrivers.logger.debug "Current version of #{binary} is #{string}"
-        normalize string.match(/geckodriver (\d+\.\d+\.\d+)/)[1]
-      end
-
-      private
-
-      def downloads
-        Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
-
-        @downloads ||= begin
-          doc = Nokogiri::HTML.parse(get(base_url))
-          items = doc.css(".py-1 a").collect {|item| item["href"]}
-          items.reject! {|item| item.include?('archive')}
-          items.select! {|item| item.include?(platform)}
-          ds = items.each_with_object({}) do |item, hash|
-            key = normalize item[/v(\d+\.\d+\.\d+)/, 1]
-            hash[key] = "https://github.com#{item}"
-          end
-          Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
-          ds
-        end
-      end
-
-      def file_name
-        platform == "win" ? "geckodriver.exe" : "geckodriver"
-      end
-
-      def base_url
-        'https://github.com/mozilla/geckodriver/releases'
-      end
-
-    end
-  end
+require 'nokogiri'
+
+module Webdrivers
+  class Geckodriver < Common
+    class << self
+
+      def current_version
+        Webdrivers.logger.debug "Checking current version"
+        return nil unless downloaded?
+        string = %x(#{binary} --version)
+        Webdrivers.logger.debug "Current version of #{binary} is #{string}"
+        normalize string.match(/geckodriver (\d+\.\d+\.\d+)/)[1]
+      end
+
+      private
+
+      def downloads
+        Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
+
+        @downloads ||= begin
+          doc = Nokogiri::HTML.parse(get(base_url))
+          items = doc.css(".py-1 a").collect {|item| item["href"]}
+          items.reject! {|item| item.include?('archive')}
+          items.select! {|item| item.include?(platform)}
+          ds = items.each_with_object({}) do |item, hash|
+            key = normalize item[/v(\d+\.\d+\.\d+)/, 1]
+            hash[key] = "https://github.com#{item}"
+          end
+          Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
+          ds
+        end
+      end
+
+      def file_name
+        platform == "win" ? "geckodriver.exe" : "geckodriver"
+      end
+
+      def base_url
+        'https://github.com/mozilla/geckodriver/releases'
+      end
+
+    end
+  end
 end

data/lib/webdrivers/iedriver.rb

@@ -1,44 +1,44 @@
-require 'nokogiri'
-require 'rubygems/version'
-
-module Webdrivers
-  class IEdriver < Common
-    class << self
-
-      def current_version
-        Webdrivers.logger.debug "Checking current version"
-        return nil unless downloaded?
-        string = %x(#{binary} --version)
-        Webdrivers.logger.debug "Current version of #{binary} is #{string}"
-        normalize string.match(/IEDriverServer.exe (\d\.\d+\.\d*\.\d*)/)[1]
-      end
-
-      private
-
-      def file_name
-        "IEDriverServer.exe"
-      end
-
-      def base_url
-        'http://selenium-release.storage.googleapis.com/'
-      end
-
-      def downloads
-        Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
-
-        @downloads ||= begin
-          doc = Nokogiri::XML.parse(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 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
+require 'nokogiri'
+require 'rubygems/version'
+
+module Webdrivers
+  class IEdriver < Common
+    class << self
+
+      def current_version
+        Webdrivers.logger.debug "Checking current version"
+        return nil unless downloaded?
+        string = %x(#{binary} --version)
+        Webdrivers.logger.debug "Current version of #{binary} is #{string}"
+        normalize string.match(/IEDriverServer.exe (\d\.\d+\.\d*\.\d*)/)[1]
+      end
+
+      private
+
+      def file_name
+        "IEDriverServer.exe"
+      end
+
+      def base_url
+        'https://selenium-release.storage.googleapis.com/'
+      end
+
+      def downloads
+        Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
+
+        @downloads ||= begin
+          doc = Nokogiri::XML.parse(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 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
 end

data/lib/webdrivers/logger.rb

@@ -1,109 +1,109 @@
-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'.freeze
-          @logger.level = DEBUG
-        when 'info'.freeze
-          @logger.level = INFO
-        when 'warn'.freeze
-          @logger.level = WARN
-        when 'error'.freeze
-          @logger.level = ERROR
-        when 'fatal'.freeze
-          @logger.level = FATAL
-        when 'unknown'.freeze
-          @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
+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'.freeze
+          @logger.level = DEBUG
+        when 'info'.freeze
+          @logger.level = INFO
+        when 'warn'.freeze
+          @logger.level = WARN
+        when 'error'.freeze
+          @logger.level = ERROR
+        when 'fatal'.freeze
+          @logger.level = FATAL
+        when 'unknown'.freeze
+          @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

data/lib/webdrivers/mswebdriver.rb

@@ -1,58 +1,58 @@
-module Webdrivers
-  class MSWebdriver < Common
-
-    class << self
-
-      def windows_version
-        Webdrivers.logger.debug "Checking current version"
-
-        # current_version() from other webdrivers returns the version from the webdriver EXE.
-        # Unfortunately, MicrosoftWebDriver.exe does not have an option to get the version.
-        # To work around it we query the currently installed version of Microsoft Edge instead
-        # and compare it to the list of available downloads.
-        version = `powershell (Get-AppxPackage -Name Microsoft.MicrosoftEdge).Version`
-        raise "Failed to check Microsoft Edge version." if version.empty? # Package name changed?
-        Webdrivers.logger.debug "Current version of Microsoft Edge is #{version.chomp!}"
-
-        build = version.split('.')[1] # "41.16299.248.0" => "16299"
-        Webdrivers.logger.debug "Expecting MicrosoftWebDriver.exe version #{build}"
-        build.to_i
-      end
-
-      # Webdriver binaries for Microsoft Edge are not backwards compatible.
-      # For this reason, instead of downloading the latest binary we download the correct one for the
-      # currently installed browser version.
-      alias :version :windows_version
-
-      def version=(*)
-        raise "Version can not be set for MSWebdriver because it is dependent on the version of Edge"
-      end
-
-      private
-
-      def file_name
-        "MicrosoftWebDriver.exe"
-      end
-
-      def downloads
-        array = Nokogiri::HTML(get(base_url)).xpath("//li[@class='driver-download']/a")
-        array.each_with_object({}) do |link, hash|
-          next if link.text == 'Insiders'
-          key = normalize link.text.scan(/\d+/).first.to_i
-          hash[key] = link['href']
-        end
-      end
-
-      def base_url
-        'https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/'
-      end
-
-      # Assume we have the latest if file exists since MicrosoftWebdriver.exe does not have an
-      # argument to check the current version.
-      def correct_binary?
-        File.exist?(binary)
-      end
-
-    end
-  end
+module Webdrivers
+  class MSWebdriver < Common
+
+    class << self
+
+      def windows_version
+        Webdrivers.logger.debug "Checking current version"
+
+        # current_version() from other webdrivers returns the version from the webdriver EXE.
+        # Unfortunately, MicrosoftWebDriver.exe does not have an option to get the version.
+        # To work around it we query the currently installed version of Microsoft Edge instead
+        # and compare it to the list of available downloads.
+        version = `powershell (Get-AppxPackage -Name Microsoft.MicrosoftEdge).Version`
+        raise "Failed to check Microsoft Edge version." if version.empty? # Package name changed?
+        Webdrivers.logger.debug "Current version of Microsoft Edge is #{version.chomp!}"
+
+        build = version.split('.')[1] # "41.16299.248.0" => "16299"
+        Webdrivers.logger.debug "Expecting MicrosoftWebDriver.exe version #{build}"
+        build.to_i
+      end
+
+      # Webdriver binaries for Microsoft Edge are not backwards compatible.
+      # For this reason, instead of downloading the latest binary we download the correct one for the
+      # currently installed browser version.
+      alias :version :windows_version
+
+      def version=(*)
+        raise "Version can not be set for MSWebdriver because it is dependent on the version of Edge"
+      end
+
+      private
+
+      def file_name
+        "MicrosoftWebDriver.exe"
+      end
+
+      def downloads
+        array = Nokogiri::HTML(get(base_url)).xpath("//li[@class='driver-download']/a")
+        array.each_with_object({}) do |link, hash|
+          next if link.text == 'Insiders'
+          key = normalize link.text.scan(/\d+/).first.to_i
+          hash[key] = link['href']
+        end
+      end
+
+      def base_url
+        'https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/'
+      end
+
+      # Assume we have the latest if file exists since MicrosoftWebdriver.exe does not have an
+      # argument to check the current version.
+      def correct_binary?
+        File.exist?(binary)
+      end
+
+    end
+  end
 end