webdrivers 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e2cdd947c31a0a97e4679da3b987d008a240c1
-  data.tar.gz: 40cb38781d815e54008e917667ea22de595fc755
+  metadata.gz: 2aa8499f7225e17c17d4653cfcdbb5d0387805fa
+  data.tar.gz: 8036fcb9040fc3852a04f6d4ec0dc688fa6ce8ff
 SHA512:
-  metadata.gz: d73bd319ce124e487211a5150406c219e2572b2cf6eb9e836492c81e9d7270a7324d0d04b7e6a924499e8610ce87a5476c155df410635749916c916637d92e63
-  data.tar.gz: f83caf1cecc3f29b55c84f20edcc53115327d1e6197d52f5159cd8b3a0bf8eee42f7d897635a382bfff5fdf190669fd49a9c94ad6469c61a8055325beea2d7a0
+  metadata.gz: 3b87bb262f00d419f4eb347582dc93d689484ccabc189433b2631d0d21b4a0e419ba2a6b4f7b94b38ce6b181f95b952c92064cea96128d2500ccac204893c8bd
+  data.tar.gz: 036b3660764a74fc2daa9cf5162c0d6f5aeda2c154a9cf59d675448c73b982d22316f5ecb2b9242a32edaf11c836b01651f6d1867903ae4f18deb1323b7106d2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.2.0 (2017-08-21)
+
+* Implemented Proxy support 
+
 ### 3.1.0 (2017-08-21)
 
 * Implemented Logging functionality 

data/lib/webdrivers/chromedriver.rb

@@ -1,6 +1,4 @@
 require 'nokogiri'
-require 'open-uri'
-require 'zip'
 
 module Webdrivers
   class Chromedriver < Common
@@ -33,7 +31,7 @@ module Webdrivers
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin
-          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url))
+          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url, proxy_opt))
           items = doc.css("Contents Key").collect(&:text)
           items.select! {|item| item.include?(platform)}
           ds = items.each_with_object({}) do |item, hash|

data/lib/webdrivers/common.rb

@@ -30,10 +30,8 @@ module Webdrivers
         Dir.mkdir(install_dir) unless File.exists?(install_dir)
         Dir.chdir install_dir do
           FileUtils.rm_f filename
-          File.open(filename, "wb") do |saved_file|
-            URI.parse(url).open("rb") do |read_file|
-              saved_file.write(read_file.read)
-            end
+          open(filename, "wb") do |file|
+            file.print open(url, proxy_opt, &:read)
           end
           raise "Could not download #{url}" unless File.exists? filename
           Webdrivers.logger.debug "Successfully downloaded #{filename}"
@@ -56,6 +54,20 @@ module Webdrivers
 
       private
 
+      def proxy_opt
+        proxy_uri = ENV['WD_PROXY_URI']
+        proxy_user = ENV['WD_PROXY_USER']
+        proxy_pass = ENV['WD_PROXY_PASS']
+
+        if proxy_uri && proxy_user
+          {proxy_http_basic_authentication: [proxy_uri, proxy_user, proxy_pass]}
+        elsif proxy_uri
+          {proxy: proxy_uri}
+        else
+          {}
+        end
+      end
+
       def download_url(version)
         downloads[version || latest]
       end

data/lib/webdrivers/geckodriver.rb

@@ -1,5 +1,4 @@
 require 'nokogiri'
-require 'open-uri'
 
 module Webdrivers
   class Geckodriver < Common
@@ -24,7 +23,7 @@ module Webdrivers
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin
-          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url))
+          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url, proxy_opt))
           items = doc.css(".release-downloads a").collect {|item| item["href"]}
           items.reject! {|item| item.include?('archive')}
           items.select! {|item| item.include?(platform)}

data/lib/webdrivers/iedriver.rb

@@ -1,5 +1,4 @@
 require 'nokogiri'
-require 'open-uri'
 
 module Webdrivers
   class IEdriver < Common
@@ -32,7 +31,7 @@ module Webdrivers
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin
-          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url))
+          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url, proxy_opt))
           items = doc.css("Key").collect(&:text)
           items.select! { |item| item.include?('IEDriverServer_Win32') }
           ds = items.each_with_object({}) do |item, hash|

data/lib/webdrivers/mswebdriver.rb

@@ -1,6 +1,3 @@
-require 'nokogiri'
-require 'open-uri'
-
 module Webdrivers
   class MSWebdriver < Common
     class << self

data/webdrivers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "webdrivers"
-  s.version     = "3.1.0"
+  s.version     = "3.2.0"
   s.authors     = ["Titus Fortner"]
   s.email       = ["titusfortner@gmail.com"]
   s.homepage    = "https://github.com/titusfortner/webdrivers"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Titus Fortner