webdrivers 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28974e49008ce2ee61b8456679884651537c5527
-  data.tar.gz: 2c4a8ce5c5ec17a568a4dd966de0594a2490d15f
+  metadata.gz: 617d5fa4e06abcdbf66ad776593c1e409303f4a7
+  data.tar.gz: f92d3f5b6e78c7f4de29b3cee38e17dfb1e7bb5c
 SHA512:
-  metadata.gz: 24676074712c8cc796347070ea7aef26388ca1c10a834a456cb10a9d1c661d21bddb4cf67e776aff37b29f092dca9fe1c1441163d245f6db3ffe1f6b83fbffdb
-  data.tar.gz: f0e5923038eb6f006f283c876d6d317e1b8b1cfe40d3d715982a0d224bc5f4aaef1c8beda52a0ad43327ecdf751932b66aefb3695998efd3b37b1727a5670f56
+  metadata.gz: 219decd97dc9bf88005d95605133a77b325841e0eb933fd6c47527d4de5ac0be2ed47bb2be57e8c8b15fe6a52ab145eeffaedd8ad656e2ab77f2011e833f817f
+  data.tar.gz: 892b73d4f0d90c26f5b39bbb4afe58901282817ac6a4c49a1397ac30e7d0084c48626c3f7bc99d9e233a0df1a766cef267e8bc88684255785d65833de0388fbb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+### 3.0.0.beta2 (2017-08-16)
+
+* Supports geckodriver on Mac and Linux
+
 ### 3.0.0.beta1 (2017-08-15)
 
 * Complete Rewrite of 2.x
 * Implemented with Monkey Patch not Shims
-* Supports chromedriver on 
+* Supports chromedriver on Mac and Linux

data/lib/webdrivers/chromedriver.rb

@@ -2,19 +2,10 @@ require 'nokogiri'
 require 'open-uri'
 require 'zip'
 
-
 module Webdrivers
-  class Chromedriver
+  class Chromedriver < Common
     class << self
 
-      def update
-        unless site_available?
-          return current.nil? ? nil : binary
-        end
-        return binary if current == latest
-        remove && download
-      end
-
       def current
         return nil unless downloaded?
         puts binary
@@ -23,34 +14,6 @@ module Webdrivers
         normalize string.match(/ChromeDriver (\d\.\d+)/)[1]
       end
 
-      def latest
-        downloads.keys.sort.last
-      end
-
-      def remove
-        FileUtils.rm_f binary
-      end
-
-      def download(version = nil)
-        url = downloads[version || latest]
-        filename = File.basename url
-
-        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
-          end
-          raise "Could not download #{url}" unless File.exists? filename
-          dcf = decompress_file(filename)
-          extract_file(dcf) if respond_to? :extract_file
-        end
-        raise "Could not unzip #{filename} to get #{binary}" unless File.exists?(binary)
-        FileUtils.chmod "ugo+rx", binary
-        binary
-      end
-
       private
 
       def normalize(string)
@@ -61,82 +24,17 @@ module Webdrivers
         'chromedriver'
       end
 
-      def downloaded?
-        File.exist? binary
-      end
-
-      def binary
-        File.join install_dir, file_name
-      end
-
       def base_url
         'http://chromedriver.storage.googleapis.com'
       end
 
-      def site_available?
-        true if open(base_url)
-      rescue
-        false
-      end
-
-      def platform
-        cfg = RbConfig::CONFIG
-        case cfg['host_os']
-        when /linux/
-          cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
-        when /darwin/
-          "mac"
-        else
-          "win"
-        end
-      end
-
-      def decompress_file(filename)
-        case filename
-        when /tar\.gz$/
-          untargz_file(filename)
-        when /tar\.bz2$/
-          system "tar xjf #{filename}"
-          filename.gsub('.tar.bz2', '')
-        when /\.zip$/
-          unzip_file(filename)
-        end
-      end
-
-      def untargz_file(filename)
-        tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(filename))
-        tar_extract.rewind
-
-        ucf = File.open(file_name, "w+")
-        tar_extract.each {|entry| ucf << entry.read}
-        ucf.close
-        File.basename ucf
-      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
-
-      def install_dir
-        File.expand_path(File.join(ENV['HOME'], ".webdrivers")).tap {|dir| FileUtils.mkdir_p dir}
-      end
-
       def downloads
         raise StandardError, "Can not reach site" unless site_available?
 
         @downloads ||= begin
           doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url))
           items = doc.css("Contents Key").collect(&:text)
-          items.select! {|item| item.include?('linux64')}
+          items.select! {|item| item.include?(platform)}
           items.each_with_object({}) do |item, hash|
             key = normalize item[/^[^\/]+/]
             hash[key] = "#{base_url}/#{item}"

data/lib/webdrivers/common.rb

@@ -0,0 +1,114 @@
+require 'rubygems/package'
+require 'nokogiri'
+require 'open-uri'
+require 'zip'
+
+module Webdrivers
+  class Common
+    class << self
+
+      def update
+        unless site_available?
+          return current.nil? ? nil : binary
+        end
+        return binary if current == latest
+        remove && download
+      end
+
+      def latest
+        downloads.keys.sort.last
+      end
+
+      def remove
+        FileUtils.rm_f binary
+      end
+
+      def download(version = nil)
+        url = downloads[version || latest]
+        filename = File.basename url
+
+        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
+          end
+          raise "Could not download #{url}" unless File.exists? filename
+          dcf = decompress_file(filename)
+          extract_file(dcf) if respond_to? :extract_file
+        end
+        raise "Could not unzip #{filename} to get #{binary}" unless File.exists?(binary)
+        FileUtils.chmod "ugo+rx", binary
+        binary
+      end
+
+      private
+
+      def downloaded?
+        File.exist? binary
+      end
+
+      def binary
+        File.join install_dir, file_name
+      end
+
+      def site_available?
+        true if open(base_url)
+      rescue
+        false
+      end
+
+      def platform
+        cfg = RbConfig::CONFIG
+        case cfg['host_os']
+        when /linux/
+          cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
+        when /darwin/
+          "mac"
+        else
+          "win"
+        end
+      end
+
+      def decompress_file(filename)
+        case filename
+        when /tar\.gz$/
+          untargz_file(filename)
+        when /tar\.bz2$/
+          system "tar xjf #{filename}"
+          filename.gsub('.tar.bz2', '')
+        when /\.zip$/
+          unzip_file(filename)
+        end
+      end
+
+      def untargz_file(filename)
+        tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(filename))
+        tar_extract.rewind
+
+        ucf = File.open(file_name, "w+")
+        tar_extract.each {|entry| ucf << entry.read}
+        ucf.close
+        File.basename ucf
+      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
+
+      def install_dir
+        File.expand_path(File.join(ENV['HOME'], ".webdrivers")).tap {|dir| FileUtils.mkdir_p dir}
+      end
+    end
+  end
+end

data/lib/webdrivers/geckodriver.rb

@@ -0,0 +1,46 @@
+require 'nokogiri'
+require 'open-uri'
+require 'zip'
+
+module Webdrivers
+  class Geckodriver < Common
+    class << self
+
+      def current
+        return nil unless downloaded?
+        puts binary
+        string = %x(#{binary} --version)
+        puts string
+        normalize string.match(/geckodriver (\d+\.\d+\.\d+)/)[1]
+      end
+
+      private
+
+      def normalize(string)
+        string.match(/(\d+)\.(\d+\.\d+)/).to_a.map {|v| v.tr('.', '') }[1..-1].join('.').to_f
+      end
+
+      def downloads
+        raise StandardError, "Can not reach site" unless site_available?
+
+        doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url))
+        items = doc.css(".release-downloads a").collect {|item| item["href"]}
+        items.reject! {|item| item.include?('archive')}
+        items.select! {|item| item.include?(platform)}
+        items.each_with_object({}) do |item, hash|
+          key = normalize item[/v(\d+\.\d+\.\d+)/, 1]
+          hash[key] = "https://github.com#{item}"
+        end
+      end
+
+      def file_name
+        'geckodriver'
+      end
+
+      def base_url
+        'https://github.com/mozilla/geckodriver/releases'
+      end
+
+    end
+  end
+end

data/lib/webdrivers/selenium.rb

@@ -7,5 +7,11 @@ module Selenium
         @driver_path ||= Webdrivers::Chromedriver.update
       end
     end
+
+    module Firefox
+      def self.driver_path
+        @driver_path ||= Webdrivers::Geckodriver.update
+      end
+    end
   end
 end

data/lib/webdrivers.rb

@@ -1,2 +1,4 @@
 require "webdrivers/selenium"
+require "webdrivers/common"
 require "webdrivers/chromedriver"
+require "webdrivers/geckodriver"

data/spec/chromedriver_spec.rb

@@ -14,6 +14,7 @@ describe Webdrivers::Chromedriver do
   end
 
   it 'downloads latest version by default' do
+    chromedriver.remove
     chromedriver.download
     expect(chromedriver.current).to eq chromedriver.latest
   end

data/spec/geckodriver_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe Webdrivers::Geckodriver do
+
+  let(:geckodriver) { Webdrivers::Geckodriver }
+
+  it 'finds latest version' do
+    expect(geckodriver.latest).to be > 0.17
+    expect(geckodriver.latest).to be < 0.2
+  end
+
+  it 'downloads latest version by default' do
+    geckodriver.download
+    expect(geckodriver.current).to eq geckodriver.latest
+  end
+
+  it 'downloads specified version' do
+    geckodriver.remove
+    geckodriver.download(0.17)
+    expect(geckodriver.current).to eq 0.17
+  end
+
+  it 'removes geckodriver' do
+    geckodriver.remove
+    expect(geckodriver.current).to be_nil
+  end
+
+  context 'when offline' do
+    before { allow(geckodriver).to receive(:site_available?).and_return(false) }
+
+    it 'raises exception finding latest version' do
+      expect {geckodriver.latest}.to raise_error(StandardError, "Can not reach site")
+    end
+
+    it 'raises exception downloading' do
+      expect {geckodriver.download}.to raise_error(StandardError, "Can not reach site")
+    end
+  end
+
+end

data/webdrivers.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -97,8 +97,11 @@ files:
 - Rakefile
 - lib/webdrivers.rb
 - lib/webdrivers/chromedriver.rb
+- lib/webdrivers/common.rb
+- lib/webdrivers/geckodriver.rb
 - lib/webdrivers/selenium.rb
 - spec/chromedriver_spec.rb
+- spec/geckodriver_spec.rb
 - spec/spec_helper.rb
 - webdrivers.gemspec
 homepage: https://github.com/titusfortner/webdrivers
@@ -127,4 +130,5 @@ specification_version: 4
 summary: Easy download and use of browser drivers.
 test_files:
 - spec/chromedriver_spec.rb
+- spec/geckodriver_spec.rb
 - spec/spec_helper.rb