webdrivers 3.6.0 → 3.7.0

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/webdrivers.rb

@@ -1,27 +1,27 @@
-require "webdrivers/selenium"
-require "webdrivers/logger"
-require "webdrivers/common"
-require "webdrivers/chromedriver"
-require "webdrivers/geckodriver"
-require "webdrivers/iedriver"
-require "webdrivers/mswebdriver"
-
-module Webdrivers
-
-  class << self
-
-    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass, :install_dir
-
-    def logger
-      @logger ||= Webdrivers::Logger.new
-    end
-
-    def configure
-      yield self
-    end
-
-    def net_http_ssl_fix
-      require "net_http_ssl_fix"
-    end
-  end
-end
+require "webdrivers/selenium"
+require "webdrivers/logger"
+require "webdrivers/common"
+require "webdrivers/chromedriver"
+require "webdrivers/geckodriver"
+require "webdrivers/iedriver"
+require "webdrivers/mswebdriver"
+
+module Webdrivers
+
+  class << self
+
+    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass, :install_dir
+
+    def logger
+      @logger ||= Webdrivers::Logger.new
+    end
+
+    def configure
+      yield self
+    end
+
+    def net_http_ssl_fix
+      require "net_http_ssl_fix"
+    end
+  end
+end

data/lib/webdrivers/chromedriver.rb

@@ -1,48 +1,91 @@
-require 'nokogiri'
-
-module Webdrivers
-  class Chromedriver < 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(/ChromeDriver (\d+\.\d+)/)[1]
-      end
-
-      def latest_version
-        raise StandardError, "Can not reach site" unless site_available?
-        Gem::Version.new(get(URI.join(base_url, "LATEST_RELEASE")))
-      end
-
-      private
-
-      def file_name
-        platform == "win" ? "chromedriver.exe" : "chromedriver"
-      end
-
-      def base_url
-        'http://chromedriver.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("Contents Key").collect(&:text)
-          items.select! {|item| item.include?(platform)}
-          ds = items.each_with_object({}) do |item, hash|
-            key = normalize item[/^[^\/]+/]
-            hash[key] = "#{base_url}/#{item}"
-          end
-          Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
-          ds
-        end
-      end
-
-    end
-  end
-end
+require 'nokogiri'
+
+module Webdrivers
+  class Chromedriver < 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(/ChromeDriver (\d+\.\d+)/)[1]
+      end
+
+      def latest_version
+        raise StandardError, "Can not reach site" unless site_available?
+
+        # Latest webdriver release for installed Chrome version
+        release_file     = "LATEST_RELEASE_#{release_version}"
+        latest_available = get(URI.join(base_url, release_file))
+        Gem::Version.new(latest_available)
+      end
+
+      private
+
+      def file_name
+        platform == "win" ? "chromedriver.exe" : "chromedriver"
+      end
+
+      def base_url
+        'https://chromedriver.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("Contents Key").collect(&:text)
+          items.select! { |item| item.include?(platform) }
+          ds = items.each_with_object({}) do |item, hash|
+            key       = normalize item[/^[^\/]+/]
+            hash[key] = "#{base_url}/#{item}"
+          end
+          Webdrivers.logger.debug "Versions now located on downloads site: #{ds.keys}"
+          ds
+        end
+      end
+
+      # Returns release version from the currently installed Chrome version
+      #
+      # @example
+      #   73.0.3683.75 -> 73.0.3683
+      def release_version
+        chrome_version[/\d+\.\d+\.\d+/]
+      end
+
+      # Returns currently installed Chrome version
+      def chrome_version
+        ver = case platform
+                when 'win'
+                  chrome_on_windows
+                when /linux/
+                  chrome_on_linux
+                when 'mac'
+                  chrome_on_mac
+                else
+                  raise NotImplementedError, 'Your OS is not supported by webdrivers gem.'
+              end.chomp
+
+        # Google Chrome 73.0.3683.75 -> 73.0.3683.75
+        ver[/(\d|\.)+/]
+      end
+
+      def chrome_on_windows
+        reg = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe'
+        ps  = "(Get-Item (Get-ItemProperty '#{reg}').'(Default)').VersionInfo.ProductVersion"
+        `powershell #{ps}`
+      end
+
+      def chrome_on_linux
+        `google-chrome --version`
+      end
+
+      def chrome_on_mac
+        loc = Shellwords.escape '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+        `#{loc} --version`
+      end
+    end
+  end
+end

data/lib/webdrivers/common.rb

@@ -1,204 +1,204 @@
-require 'rubygems/package'
-require 'zip'
-
-module Webdrivers
-  class Common
-    class << self
-
-      attr_accessor :version
-
-      def update
-        unless site_available?
-          return current_version.nil? ? nil : binary
-        end
-
-        # Newer not specified or latest not found, so use existing
-        return binary if desired_version.nil? && File.exists?(binary)
-
-        # Can't find desired and no existing binary
-        if desired_version.nil?
-          msg = "Unable to find the latest version of #{file_name}; try downloading manually from #{base_url} and place in #{install_dir}"
-          raise StandardError, msg
-        end
-
-        if correct_binary?
-          Webdrivers.logger.debug "Expected webdriver version found"
-          return binary
-        end
-
-        remove # Remove outdated exe
-        download # Fetch latest
-      end
-
-      def desired_version
-        if self.version.is_a?(Gem::Version)
-          version
-        elsif self.version.nil?
-          latest_version
-        else
-          Gem::Version.new(self.version.to_s)
-        end
-      end
-
-      def latest_version
-        raise StandardError, "Can not reach site" unless site_available?
-
-        downloads.keys.sort.last
-      end
-
-      def remove
-        Webdrivers.logger.debug "Deleting #{binary}"
-        FileUtils.rm_f binary
-      end
-
-      def download
-        raise StandardError, "Can not reach site" unless site_available?
-
-        url = downloads[desired_version]
-        filename = File.basename url
-
-        FileUtils.mkdir_p(install_dir) unless File.exists?(install_dir)
-        Dir.chdir install_dir do
-          FileUtils.rm_f filename
-          open(filename, "wb") do |file|
-            file.print get(url)
-          end
-          raise "Could not download #{url}" unless File.exists? filename
-          Webdrivers.logger.debug "Successfully downloaded #{filename}"
-          dcf = decompress_file(filename)
-          Webdrivers.logger.debug "Decompression Complete"
-          if dcf
-            Webdrivers.logger.debug "Deleting #{filename}"
-            FileUtils.rm_f filename
-          end
-          if respond_to? :extract_file
-            Webdrivers.logger.debug "Extracting #{dcf}"
-            extract_file(dcf)
-          end
-        end
-        raise "Could not decompress #{filename} to get #{binary}" unless File.exists?(binary)
-        FileUtils.chmod "ugo+rx", binary
-        Webdrivers.logger.debug "Completed download and processing of #{binary}"
-        binary
-      end
-
-      def install_dir
-        Webdrivers.install_dir || File.expand_path(File.join(ENV['HOME'], ".webdrivers"))
-      end
-
-      def binary
-        File.join install_dir, file_name
-      end
-
-      protected
-
-      def get(url, limit = 10)
-        raise StandardError, 'Too many HTTP redirects' if limit == 0
-
-        response = http.get_response(URI(url))
-        Webdrivers.logger.debug "Get response: #{response.inspect}"
-
-        case response
-        when Net::HTTPSuccess
-          response.body
-        when Net::HTTPRedirection
-          location = response['location']
-          Webdrivers.logger.debug "Redirected to #{location}"
-          get(location, limit - 1)
-        else
-          response.value
-        end
-      end
-
-      def http
-        if using_proxy
-          Net::HTTP.Proxy(Webdrivers.proxy_addr, Webdrivers.proxy_port,
-                                 Webdrivers.proxy_user, Webdrivers.proxy_pass)
-        else
-          Net::HTTP
-        end
-      end
-
-      private
-
-      def using_proxy
-        Webdrivers.proxy_addr && Webdrivers.proxy_port
-      end
-
-      def downloaded?
-        result = File.exist? binary
-        Webdrivers.logger.debug "File is already downloaded: #{result}"
-        result
-      end
-
-      def site_available?
-        Webdrivers.logger.debug "Looking for Site: #{base_url}"
-        get(base_url)
-        Webdrivers.logger.debug "Found Site: #{base_url}"
-        true
-      rescue StandardError => ex
-        Webdrivers.logger.debug ex.inspect
-        false
-      end
-
-      def platform
-        if Selenium::WebDriver::Platform.linux?
-          "linux#{Selenium::WebDriver::Platform.bitsize}"
-        elsif Selenium::WebDriver::Platform.mac?
-          'mac'
-        else
-          'win'
-        end
-      end
-
-      def decompress_file(filename)
-        case filename
-          when /tar\.gz$/
-            Webdrivers.logger.debug "Decompressing tar"
-            untargz_file(filename)
-          when /tar\.bz2$/
-            Webdrivers.logger.debug "Decompressing bz2"
-            system "tar xjf #{filename}"
-            filename.gsub('.tar.bz2', '')
-          when /\.zip$/
-            Webdrivers.logger.debug "Decompressing zip"
-            unzip_file(filename)
-          else
-            Webdrivers.logger.debug "No Decompression needed"
-            nil
-        end
-      end
-
-      def untargz_file(filename)
-        tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(filename))
-
-        File.open(file_name, "w+b") do |ucf|
-          tar_extract.each { |entry| ucf << entry.read }
-          File.basename ucf
-        end
-      end
-
-      def unzip_file(filename)
-        Zip::File.open("#{Dir.pwd}/#{filename}") do |zip_file|
-          zip_file.each do |f|
-            @top_path ||= f.name
-            f_path    = File.join(Dir.pwd, f.name)
-            FileUtils.rm_rf(f_path) if File.exist?(f_path)
-            FileUtils.mkdir_p(File.dirname(f_path)) unless File.exist?(File.dirname(f_path))
-            zip_file.extract(f, f_path)
-          end
-        end
-        @top_path
-      end
-
-      # Already have latest version downloaded?
-      def correct_binary?
-        desired_version == current_version && File.exists?(binary)
-      end
-
-      def normalize(string)
-        Gem::Version.new(string)
-      end
-    end
-  end
+require 'rubygems/package'
+require 'zip'
+
+module Webdrivers
+  class Common
+    class << self
+
+      attr_accessor :version
+
+      def update
+        unless site_available?
+          return current_version.nil? ? nil : binary
+        end
+
+        # Newer not specified or latest not found, so use existing
+        return binary if desired_version.nil? && File.exists?(binary)
+
+        # Can't find desired and no existing binary
+        if desired_version.nil?
+          msg = "Unable to find the latest version of #{file_name}; try downloading manually from #{base_url} and place in #{install_dir}"
+          raise StandardError, msg
+        end
+
+        if correct_binary?
+          Webdrivers.logger.debug "Expected webdriver version found"
+          return binary
+        end
+
+        remove # Remove outdated exe
+        download # Fetch latest
+      end
+
+      def desired_version
+        if self.version.is_a?(Gem::Version)
+          version
+        elsif self.version.nil?
+          latest_version
+        else
+          Gem::Version.new(self.version.to_s)
+        end
+      end
+
+      def latest_version
+        raise StandardError, "Can not reach site" unless site_available?
+
+        downloads.keys.sort.last
+      end
+
+      def remove
+        Webdrivers.logger.debug "Deleting #{binary}"
+        FileUtils.rm_f binary
+      end
+
+      def download
+        raise StandardError, "Can not reach site" unless site_available?
+
+        url = downloads[desired_version]
+        filename = File.basename url
+
+        FileUtils.mkdir_p(install_dir) unless File.exists?(install_dir)
+        Dir.chdir install_dir do
+          FileUtils.rm_f filename
+          open(filename, "wb") do |file|
+            file.print get(url)
+          end
+          raise "Could not download #{url}" unless File.exists? filename
+          Webdrivers.logger.debug "Successfully downloaded #{filename}"
+          dcf = decompress_file(filename)
+          Webdrivers.logger.debug "Decompression Complete"
+          if dcf
+            Webdrivers.logger.debug "Deleting #{filename}"
+            FileUtils.rm_f filename
+          end
+          if respond_to? :extract_file
+            Webdrivers.logger.debug "Extracting #{dcf}"
+            extract_file(dcf)
+          end
+        end
+        raise "Could not decompress #{filename} to get #{binary}" unless File.exists?(binary)
+        FileUtils.chmod "ugo+rx", binary
+        Webdrivers.logger.debug "Completed download and processing of #{binary}"
+        binary
+      end
+
+      def install_dir
+        Webdrivers.install_dir || File.expand_path(File.join(ENV['HOME'], ".webdrivers"))
+      end
+
+      def binary
+        File.join install_dir, file_name
+      end
+
+      protected
+
+      def get(url, limit = 10)
+        raise StandardError, 'Too many HTTP redirects' if limit == 0
+
+        response = http.get_response(URI(url))
+        Webdrivers.logger.debug "Get response: #{response.inspect}"
+
+        case response
+        when Net::HTTPSuccess
+          response.body
+        when Net::HTTPRedirection
+          location = response['location']
+          Webdrivers.logger.debug "Redirected to #{location}"
+          get(location, limit - 1)
+        else
+          response.value
+        end
+      end
+
+      def http
+        if using_proxy
+          Net::HTTP.Proxy(Webdrivers.proxy_addr, Webdrivers.proxy_port,
+                                 Webdrivers.proxy_user, Webdrivers.proxy_pass)
+        else
+          Net::HTTP
+        end
+      end
+
+      private
+
+      def using_proxy
+        Webdrivers.proxy_addr && Webdrivers.proxy_port
+      end
+
+      def downloaded?
+        result = File.exist? binary
+        Webdrivers.logger.debug "File is already downloaded: #{result}"
+        result
+      end
+
+      def site_available?
+        Webdrivers.logger.debug "Looking for Site: #{base_url}"
+        get(base_url)
+        Webdrivers.logger.debug "Found Site: #{base_url}"
+        true
+      rescue StandardError => ex
+        Webdrivers.logger.debug ex.inspect
+        false
+      end
+
+      def platform
+        if Selenium::WebDriver::Platform.linux?
+          "linux#{Selenium::WebDriver::Platform.bitsize}"
+        elsif Selenium::WebDriver::Platform.mac?
+          'mac'
+        else
+          'win'
+        end
+      end
+
+      def decompress_file(filename)
+        case filename
+          when /tar\.gz$/
+            Webdrivers.logger.debug "Decompressing tar"
+            untargz_file(filename)
+          when /tar\.bz2$/
+            Webdrivers.logger.debug "Decompressing bz2"
+            system "tar xjf #{filename}"
+            filename.gsub('.tar.bz2', '')
+          when /\.zip$/
+            Webdrivers.logger.debug "Decompressing zip"
+            unzip_file(filename)
+          else
+            Webdrivers.logger.debug "No Decompression needed"
+            nil
+        end
+      end
+
+      def untargz_file(filename)
+        tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(filename))
+
+        File.open(file_name, "w+b") do |ucf|
+          tar_extract.each { |entry| ucf << entry.read }
+          File.basename ucf
+        end
+      end
+
+      def unzip_file(filename)
+        Zip::File.open("#{Dir.pwd}/#{filename}") do |zip_file|
+          zip_file.each do |f|
+            @top_path ||= f.name
+            f_path    = File.join(Dir.pwd, f.name)
+            FileUtils.rm_rf(f_path) if File.exist?(f_path)
+            FileUtils.mkdir_p(File.dirname(f_path)) unless File.exist?(File.dirname(f_path))
+            zip_file.extract(f, f_path)
+          end
+        end
+        @top_path
+      end
+
+      # Already have latest version downloaded?
+      def correct_binary?
+        desired_version == current_version && File.exists?(binary)
+      end
+
+      def normalize(string)
+        Gem::Version.new(string)
+      end
+    end
+  end
 end