webdrivers 3.7.1 → 3.7.2

data/lib/webdrivers/geckodriver.rb

@@ -3,11 +3,11 @@ require 'nokogiri'
 module Webdrivers
   class Geckodriver < Common
     class << self
-
       def current_version
-        Webdrivers.logger.debug "Checking current version"
+        Webdrivers.logger.debug 'Checking current version'
         return nil unless downloaded?
-        string = %x(#{binary} --version)
+
+        string = `#{binary} --version`
         Webdrivers.logger.debug "Current version of #{binary} is #{string}"
         normalize string.match(/geckodriver (\d+\.\d+\.\d+)/)[1]
       end
@@ -19,9 +19,9 @@ module Webdrivers
 
         @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)}
+          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}"
@@ -32,13 +32,12 @@ module Webdrivers
       end
 
       def file_name
-        platform == "win" ? "geckodriver.exe" : "geckodriver"
+        platform == 'win' ? 'geckodriver.exe' : 'geckodriver'
       end
 
       def base_url
         'https://github.com/mozilla/geckodriver/releases'
       end
-
     end
   end
-end
+end

data/lib/webdrivers/iedriver.rb

@@ -4,11 +4,11 @@ require 'rubygems/version'
 module Webdrivers
   class IEdriver < Common
     class << self
-
       def current_version
-        Webdrivers.logger.debug "Checking current version"
+        Webdrivers.logger.debug 'Checking current version'
         return nil unless downloaded?
-        string = %x(#{binary} --version)
+
+        string = `#{binary} --version`
         Webdrivers.logger.debug "Current version of #{binary} is #{string}"
         normalize string.match(/IEDriverServer.exe (\d\.\d+\.\d*\.\d*)/)[1]
       end
@@ -16,7 +16,7 @@ module Webdrivers
       private
 
       def file_name
-        "IEDriverServer.exe"
+        'IEDriverServer.exe'
       end
 
       def base_url
@@ -28,7 +28,7 @@ module Webdrivers
 
         @downloads ||= begin
           doc = Nokogiri::XML.parse(get(base_url))
-          items = doc.css("Key").collect(&:text)
+          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]
@@ -38,7 +38,6 @@ module Webdrivers
           ds
         end
       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,17 +1,16 @@
 module Webdrivers
   class MSWebdriver < Common
-
     class << self
-
       def windows_version
-        Webdrivers.logger.debug "Checking current 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?
+        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"
@@ -22,22 +21,23 @@ module Webdrivers
       # 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
+      alias version windows_version
 
       def version=(*)
-        raise "Version can not be set for MSWebdriver because it is dependent on the version of Edge"
+        raise 'Version can not be set for MSWebdriver because it is dependent on the version of Edge'
       end
 
       private
 
       def file_name
-        "MicrosoftWebDriver.exe"
+        '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
@@ -52,7 +52,6 @@ module Webdrivers
       def correct_binary?
         File.exist?(binary)
       end
-
     end
   end
-end
+end

data/lib/webdrivers/selenium.rb

@@ -1,29 +1,29 @@
-require 'selenium-webdriver'
-
-module Selenium
-  module WebDriver
-    module Chrome
-      def self.driver_path
-        @driver_path ||= Webdrivers::Chromedriver.update
-      end
-    end
-
-    module Firefox
-      def self.driver_path
-        @driver_path ||= Webdrivers::Geckodriver.update
-      end
-    end
-
-    module Edge
-      def self.driver_path
-        @driver_path ||= Webdrivers::MSWebdriver.update
-      end
-    end
-
-    module IE
-      def self.driver_path
-        @driver_path ||= Webdrivers::IEdriver.update
-      end
-    end
-  end
-end
+require 'selenium-webdriver'
+
+module Selenium
+  module WebDriver
+    module Chrome
+      def self.driver_path
+        @driver_path ||= Webdrivers::Chromedriver.update
+      end
+    end
+
+    module Firefox
+      def self.driver_path
+        @driver_path ||= Webdrivers::Geckodriver.update
+      end
+    end
+
+    module Edge
+      def self.driver_path
+        @driver_path ||= Webdrivers::MSWebdriver.update
+      end
+    end
+
+    module IE
+      def self.driver_path
+        @driver_path ||= Webdrivers::IEdriver.update
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,5 @@
-require "rspec"
-require "webdrivers"
+require 'simplecov'
+SimpleCov.start
+
+require 'rspec'
+require 'webdrivers'

data/spec/{chromedriver_spec.rb → webdrivers/chromedriver_spec.rb}

@@ -1,8 +1,7 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Webdrivers::Chromedriver do
-
-  let(:chromedriver) { Webdrivers::Chromedriver }
+  let(:chromedriver) { described_class }
 
   it 'updates' do
     chromedriver.update
@@ -64,21 +63,33 @@ describe Webdrivers::Chromedriver do
     end
   end
 
+  # Workaround for Google Chrome when using Jruby on Windows.
+  # @see https://github.com/titusfortner/webdrivers/issues/41
+  if RUBY_PLATFORM == 'java' && Selenium::WebDriver::Platform.windows?
+    context 'when using Jruby on Windows' do
+      it 'uses Jruby specific workaround to retrieve the Google Chrome version' do
+        chromedriver.remove
+        chromedriver.update
+        expect(chromedriver.current_version).not_to be_nil
+      end
+    end
+  end
+
   context 'when offline' do
     before { allow(chromedriver).to receive(:site_available?).and_return(false) }
 
     it 'raises exception finding latest version' do
-      expect {chromedriver.latest_version}.to raise_error(StandardError, "Can not reach site")
+      expect { chromedriver.latest_version }.to raise_error(StandardError, 'Can not reach site')
     end
 
     it 'raises exception downloading' do
-      expect {chromedriver.download}.to raise_error(StandardError, "Can not reach site")
+      expect { chromedriver.download }.to raise_error(StandardError, 'Can not reach site')
     end
   end
 
   it 'allows setting of install directory' do
     begin
-      install_dir = File.expand_path(File.join(ENV['HOME'], ".webdrivers2"))
+      install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers2'))
       Webdrivers.install_dir = install_dir
       expect(chromedriver.install_dir).to eq install_dir
     ensure
@@ -87,7 +98,7 @@ describe Webdrivers::Chromedriver do
   end
 
   it 'returns full location of binary' do
-    install_dir = File.expand_path(File.join(ENV['HOME'], ".webdrivers"))
-    expect(chromedriver.binary).to match /#{install_dir}\/chromedriver/
+    install_dir = File.expand_path(File.join(ENV['HOME'], '.webdrivers'))
+    expect(chromedriver.binary).to match %r{#{install_dir}/chromedriver}
   end
 end