webdrivers 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34401dfca4c7657382c5f0203e823f316e1d5a73
-  data.tar.gz: ab41f5bed5199f4ab2c23e2b53587781210cb103
+  metadata.gz: d48dd7ab5521a67cc6fe9c30fa30878264ae2a82
+  data.tar.gz: eec19913069b05438341878692f4705ba2be4890
 SHA512:
-  metadata.gz: 8fd791e52d68ca138804e819eb3b63d36d1224b4c75ca0248c038cba80ee9ceade86a0bbbf03ae092bcbcdc7aa5ac40e57e145716975df59d6984272dc3af461
-  data.tar.gz: cc25381adcdfaaff27b83cd719c4971a14008c531336c582b14443bc326743056f0cd0e8d4517c961c39cc728deb8ba08823fb4a81e942ba956cd3b85b80feb3
+  metadata.gz: 285e46750351b6a1e002c4b6aeb7839f1f2336fefb8b3e3c974378883f039e85e3b554d42823bcfee6685bab19f4f55ea4c8d4dd62cfdce2cd37995a418bca21
+  data.tar.gz: ce3eb1716aded508d92c16f09ca3b381b1d3509ae7d037f4e2183aee5524479fc3ab9b5b5ccda5dd0b946cf3157926e2a88c24225e5b0ece8b2d671e72622bf1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 ==========
 
+2.2.1 - 2016-11-26
+----------
+
+* Bug fixes for Windows
+
+
 2.2.0 - 2016-11-26
 ----------
 

data/lib/webdrivers.rb

@@ -5,4 +5,3 @@ require "webdrivers/phantomjs"
 require 'fileutils'
 require 'rbconfig'
 require 'open-uri'
-require 'archive/zip'

data/lib/webdrivers/common.rb

@@ -1,4 +1,5 @@
 require 'rubygems/package'
+require 'zip'
 
 module Webdrivers
   class Common
@@ -51,8 +52,15 @@ module Webdrivers
       end
 
       def unzip_file(filename)
-        Archive::Zip.extract(filename, '.', :overwrite => :all)
-        filename.gsub('.zip', '')
+        Zip::ZipFile.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.mkdir_p(File.dirname(f_path))
+            zip_file.extract(f, f_path) unless File.exist?(f_path)
+          end
+        end
+        @top_path
       end
 
       def download_url(version = nil)

data/lib/webdrivers/phantomjs.rb

@@ -10,7 +10,7 @@ module Webdrivers
 
       def current_version
         return nil unless File.exists?(binary_path)
-        %x(#{binary_path} --version).match(/phantomjs (\d\.\d+\.\d+)/)[1]
+        %x(#{binary_path} --version).strip.match(/(\d\.\d+\.\d+)/)[1]
       end
 
       def newest_version
@@ -32,7 +32,7 @@ module Webdrivers
       end
 
       def extract_file(filename)
-        FileUtils.mv("#{platform_install_dir}/#{filename}/bin/phantomjs", 'phantomjs')
+        FileUtils.mv("#{platform_install_dir}/#{filename}bin/#{filename}", file_name)
       end
     end
 

data/spec/chromedriver_spec.rb

@@ -12,7 +12,7 @@ describe Webdrivers::Chromedriver do
 
   it { expect(chromedriver.newest_version.to_f).to be >= 2.25 }
 
-  it { expect(chromedriver.downloads.size).to be >= 26 }
+  it { expect(chromedriver.downloads.size).to be >= 25 }
 
   context "on a linux platform" do
     before { allow(chromedriver).to receive(:platform) { "linux32" } }

data/webdrivers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "webdrivers"
-  s.version     = "2.2.0"
+  s.version     = "2.2.1"
   s.authors     = ["Titus Fortner"]
   s.email       = ["titusfortner@gmail.com"]
   s.homepage    = "https://github.com/titusfortner/webdrivers"
@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake",    "~> 10.0"
 
   s.add_runtime_dependency "nokogiri",    "~> 1.6"
-  s.add_runtime_dependency "archive-zip", "~> 0.7.0"
+  s.add_runtime_dependency "zip"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Titus Fortner
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: archive-zip
+  name: zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 description: Run Selenium tests more easily with install and updates for all supported
   webdrivers.
 email: