webdrivers 3.8.0 → 3.8.1

data/Rakefile

@@ -1,9 +1,9 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: %w[spec rubocop]
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
+RSpec::Core::RakeTask.new(:spec)

data/appveyor.yml

@@ -0,0 +1,23 @@
+build: off
+cache:
+  - vendor/bundle
+environment:
+  matrix:
+    - RUBY_VERSION: 24
+      RAKE_TASK: spec
+    - RUBY_VERSION: 24
+      RAKE_TASK: rubocop
+    - RUBY_VERSION: 25
+      RAKE_TASK: spec
+    - RUBY_VERSION: 26
+      RAKE_TASK: spec
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
+  - bundle install
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+test_script:
+  - bundle exec rake %RAKE_TASK%

data/lib/webdrivers.rb

@@ -1,26 +1,28 @@
-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
-      raise 'Webdrivers.net_http_ssl_fix is no longer available.' \
-      ' Please see https://github.com/titusfortner/webdrivers#ssl_connect-errors.'
-    end
-  end
-end
+# frozen_string_literal: true
+
+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
+      raise 'Webdrivers.net_http_ssl_fix is no longer available.' \
+      ' Please see https://github.com/titusfortner/webdrivers#ssl_connect-errors.'
+    end
+  end
+end

data/lib/webdrivers/chromedriver.rb

@@ -1,140 +1,161 @@
-require 'nokogiri'
-require 'shellwords'
-
-module Webdrivers
-  class Chromedriver < Common
-    class << self
-      def current_version
-        Webdrivers.logger.debug 'Checking current version'
-        return nil unless downloaded?
-
-        ver = `#{binary} --version`
-        Webdrivers.logger.debug "Current #{binary} version: #{ver}"
-
-        # Matches 2.46, 2.46.628411 and 73.0.3683.75
-        normalize ver[/\d+\.\d+(\.\d+)?(\.\d+)?/]
-      end
-
-      def latest_version
-        raise StandardError, 'Can not reach site' unless site_available?
-
-        # Versions before 70 do not have a LATEST_RELEASE file
-        return Gem::Version.new('2.46') if release_version < '70.0.3538'
-
-        # Latest webdriver release for installed Chrome version
-        release_file     = "LATEST_RELEASE_#{release_version}"
-        latest_available = get(URI.join(base_url, release_file))
-        Webdrivers.logger.debug "Latest version available: #{latest_available}"
-        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[%r{^[^/]+}]
-            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
-
-        raise StandardError, 'Failed to find Chrome binary or its version.' if ver.nil? || ver.empty?
-
-        # Google Chrome 73.0.3683.75 -> 73.0.3683.75
-        ver[/\d+\.\d+\.\d+\.\d+/]
-      end
-
-      def chrome_on_windows
-        if browser_binary
-          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
-          return `powershell (Get-ItemProperty '#{browser_binary}').VersionInfo.ProductVersion`.strip
-        end
-
-        # Workaround for Google Chrome when using Jruby on Windows.
-        # @see https://github.com/titusfortner/webdrivers/issues/41
-        if RUBY_PLATFORM == 'java' && platform == 'win'
-          ver = 'powershell (Get-Item -Path ((Get-ItemProperty "HKLM:\\Software\\Microsoft' \
-          "\\Windows\\CurrentVersion\\App` Paths\\chrome.exe\").\\'(default)\\'))" \
-          '.VersionInfo.ProductVersion'
-          return `#{ver}`.strip
-        end
-
-        # Default to Google Chrome
-        reg        = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe'
-        executable = `powershell (Get-ItemProperty '#{reg}' -Name '(default)').'(default)'`.strip
-        Webdrivers.logger.debug "Browser executable: '#{executable}'"
-        ps = "(Get-Item (Get-ItemProperty '#{reg}').'(default)').VersionInfo.ProductVersion"
-        `powershell #{ps}`.strip
-      end
-
-      def chrome_on_linux
-        if browser_binary
-          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
-          return `#{Shellwords.escape browser_binary} --product-version`.strip
-        end
-
-        # Default to Google Chrome
-        executable = `which google-chrome`.strip
-        Webdrivers.logger.debug "Browser executable: '#{executable}'"
-        `#{executable} --product-version`.strip
-      end
-
-      def chrome_on_mac
-        if browser_binary
-          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
-          return `#{Shellwords.escape browser_binary} --version`.strip
-        end
-
-        # Default to Google Chrome
-        executable = Shellwords.escape '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
-        Webdrivers.logger.debug "Browser executable: #{executable}"
-        `#{executable} --version`.strip
-      end
-
-      #
-      # Returns user defined browser executable path from Selenium::WebDrivers::Chrome#path.
-      #
-      def browser_binary
-        # For Chromium, Brave, or whatever else
-        Selenium::WebDriver::Chrome.path
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'nokogiri'
+require 'shellwords'
+
+module Webdrivers
+  class Chromedriver < Common
+    class << self
+      def current_version
+        Webdrivers.logger.debug 'Checking current version'
+        return nil unless downloaded?
+
+        ver = `#{binary} --version`
+        Webdrivers.logger.debug "Current #{binary} version: #{ver}"
+
+        # Matches 2.46, 2.46.628411 and 73.0.3683.75
+        normalize_version ver[/\d+\.\d+(\.\d+)?(\.\d+)?/]
+      end
+
+      def latest_version
+        return @latest_version if @latest_version
+
+        raise StandardError, 'Can not reach site' unless site_available?
+
+        # Versions before 70 do not have a LATEST_RELEASE file
+        return normalize_version('2.46') if release_version < normalize_version('70.0.3538')
+
+        latest_applicable = latest_point_release(release_version)
+
+        Webdrivers.logger.debug "Latest version available: #{latest_applicable}"
+        @latest_version = normalize_version(latest_applicable)
+      end
+
+      private
+
+      def latest_point_release(version)
+        release_file = "LATEST_RELEASE_#{version}"
+        begin
+          normalize_version(get(URI.join(base_url, release_file)))
+        rescue Net::HTTPServerException
+          latest_release = normalize_version(get(URI.join(base_url, 'LATEST_RELEASE')))
+          Webdrivers.logger.debug "Unable to find a driver for: #{version}"
+
+          msg = version > latest_release ? 'you appear to be using a non-production version of Chrome; ' : ''
+          msg = "#{msg}please set `Webdrivers::Chromedriver.version = <desired driver version>` to an known "\
+'chromedriver version: https://chromedriver.storage.googleapis.com/index.html'
+          raise StandardError, msg
+        end
+      end
+
+      def platform
+        if Selenium::WebDriver::Platform.linux?
+          'linux64'
+        elsif Selenium::WebDriver::Platform.mac?
+          'mac64'
+        else
+          'win32'
+        end
+      end
+
+      def file_name
+        Selenium::WebDriver::Platform.windows? ? 'chromedriver.exe' : 'chromedriver'
+      end
+
+      def base_url
+        'https://chromedriver.storage.googleapis.com'
+      end
+
+      def download_url
+        return @download_url if @download_url
+
+        url = "#{base_url}/#{desired_version}/chromedriver_#{platform}.zip"
+        Webdrivers.logger.debug "chromedriver URL: #{url}"
+        @download_url = url
+      end
+
+      # Returns release version from the currently installed Chrome version
+      #
+      # @example
+      #   73.0.3683.75 -> 73.0.3683
+      def release_version
+        chrome = normalize_version(chrome_version)
+        normalize_version(chrome.segments[0..2].join('.'))
+      end
+
+      # Returns currently installed Chrome version
+      def chrome_version
+        ver = case platform
+              when 'win32'
+                chrome_on_windows
+              when 'linux64'
+                chrome_on_linux
+              when 'mac64'
+                chrome_on_mac
+              else
+                raise NotImplementedError, 'Your OS is not supported by webdrivers gem.'
+              end.chomp
+
+        raise StandardError, 'Failed to find Chrome binary or its version.' if ver.nil? || ver.empty?
+
+        Webdrivers.logger.debug "Browser version: #{ver}"
+        normalize_version ver[/\d+\.\d+\.\d+\.\d+/] # Google Chrome 73.0.3683.75 -> 73.0.3683.75
+      end
+
+      def chrome_on_windows
+        if browser_binary
+          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
+          return `powershell (Get-ItemProperty '#{browser_binary}').VersionInfo.ProductVersion`.strip
+        end
+
+        # Workaround for Google Chrome when using Jruby on Windows.
+        # @see https://github.com/titusfortner/webdrivers/issues/41
+        if RUBY_PLATFORM == 'java'
+          ver = 'powershell (Get-Item -Path ((Get-ItemProperty "HKLM:\\Software\\Microsoft' \
+          "\\Windows\\CurrentVersion\\App` Paths\\chrome.exe\").\\'(default)\\'))" \
+          '.VersionInfo.ProductVersion'
+          return `#{ver}`.strip
+        end
+
+        # Default to Google Chrome
+        reg        = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe'
+        executable = `powershell (Get-ItemProperty '#{reg}' -Name '(default)').'(default)'`.strip
+        Webdrivers.logger.debug "Browser executable: '#{executable}'"
+        ps = "(Get-Item (Get-ItemProperty '#{reg}').'(default)').VersionInfo.ProductVersion"
+        `powershell #{ps}`.strip
+      end
+
+      def chrome_on_linux
+        if browser_binary
+          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
+          return `#{Shellwords.escape browser_binary} --product-version`.strip
+        end
+
+        # Default to Google Chrome
+        executable = `which google-chrome`.strip
+        Webdrivers.logger.debug "Browser executable: '#{executable}'"
+        `#{executable} --product-version`.strip
+      end
+
+      def chrome_on_mac
+        if browser_binary
+          Webdrivers.logger.debug "Browser executable: '#{browser_binary}'"
+          return `#{Shellwords.escape browser_binary} --version`.strip
+        end
+
+        # Default to Google Chrome
+        executable = Shellwords.escape '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+        Webdrivers.logger.debug "Browser executable: #{executable}"
+        `#{executable} --version`.strip
+      end
+
+      #
+      # Returns user defined browser executable path from Selenium::WebDrivers::Chrome#path.
+      #
+      def browser_binary
+        # For Chromium, Brave, or whatever else
+        Selenium::WebDriver::Chrome.path
+      end
+    end
+  end
+end

data/lib/webdrivers/common.rb

@@ -1,205 +1,221 @@
-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.exist?(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 version.is_a?(Gem::Version)
-          version
-        elsif version.nil?
-          latest_version
-        else
-          Gem::Version.new(version.to_s)
-        end
-      end
-
-      def latest_version
-        raise StandardError, 'Can not reach site' unless site_available?
-
-        downloads.keys.max
-      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.exist?(install_dir)
-        Dir.chdir install_dir do
-          FileUtils.rm_f filename
-          File.open(filename, 'wb') do |file|
-            file.print get(url)
-          end
-          raise "Could not download #{url}" unless File.exist? 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.exist?(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.zero?
-
-        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 => e
-        Webdrivers.logger.debug e
-        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.exist?(binary)
-      end
-
-      def normalize(string)
-        Gem::Version.new(string)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+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.exist?(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 version.is_a?(Gem::Version)
+          version
+        elsif version.nil?
+          latest_version
+        else
+          normalize_version(version)
+        end
+      end
+
+      def latest_version
+        return @latest_version if @latest_version
+
+        raise StandardError, 'Can not reach site' unless site_available?
+
+        @latest_version = downloads.keys.max
+      end
+
+      def remove
+        max_attempts  = 3
+        attempts_made = 0
+        delay         = 0.5
+        Webdrivers.logger.debug "Deleting #{binary}"
+        @download_url = nil
+
+        begin
+          attempts_made += 1
+          File.delete binary if File.exist? binary
+        rescue Errno::EACCES # Solves an intermittent file locking issue on Windows
+          sleep(delay)
+          retry if File.exist?(binary) && attempts_made <= max_attempts
+          raise
+        end
+      end
+
+      def download
+        raise StandardError, 'Can not reach site' unless site_available?
+
+        filename = File.basename download_url
+
+        FileUtils.mkdir_p(install_dir) unless File.exist?(install_dir)
+        Dir.chdir install_dir do
+          df = Tempfile.open(['', filename], binmode: true) do |file|
+            file.print get(download_url)
+            file
+          end
+
+          raise "Could not download #{download_url}" unless File.exist? df.to_path
+
+          Webdrivers.logger.debug "Successfully downloaded #{df.to_path}"
+
+          decompress_file(df.to_path, filename)
+          Webdrivers.logger.debug 'Decompression Complete'
+          Webdrivers.logger.debug "Deleting #{df.to_path}"
+          df.close!
+        end
+        raise "Could not decompress #{download_url} to get #{binary}" unless File.exist?(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.zero?
+
+        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 download_url
+        @download_url ||= downloads[desired_version]
+      end
+
+      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 => e
+        Webdrivers.logger.debug e
+        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, target)
+        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'
+          FileUtils.cp(filename, File.join(Dir.pwd, target))
+        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(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.exist?(binary)
+      end
+
+      def normalize_version(version)
+        Gem::Version.new(version.to_s)
+      end
+    end
+  end
+end