chromedriver-helper 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf62727ee028fa0e91b8867a7eae498cbc9577b
-  data.tar.gz: a3529789da5ffac99204f2db6dac4ea9cc893288
+  metadata.gz: 5e0b6307e13449f5b515f02cdb6699ff8fa54abd
+  data.tar.gz: 84d2cc85ae13474a5ba44c2a671778bdba5886f4
 SHA512:
-  metadata.gz: 6e89499aca520cbcb21fa7acdd387929d983eb93d624713fc1bb2b4ae9f32c11e0d8e54edc1646e0be8f33fce31fe18509902e3ad7a82092140ba76cbe86aec6
-  data.tar.gz: 2ab325ecd08e895c93522be086367ab396b5ba06232e72178288ad22ef2703c518e44888766418ec6c636f78f00ff20da7482b1672b38b751f71ab3cde050c16
+  metadata.gz: c8893b243733b783d6d93a0bf0fb6054bd15a39e31b3c6a806dcf5e7736ae7d740ec38802484acb5aabf114e9e4b87e8ae1e15521f7ecc31b961f060b1deb8b9
+  data.tar.gz: 05d5298edb11df1a7c0a545c503da8ff4609d3c22847b895f6b3955507427b535790aa58382bd1ffebd772d686a0a97e51d8b68f952dd730f675efb7b7ce132d

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 chromedriver-helper changelog
 ==========
 
+1.2.0 - 2018-02-03
+----------
+
+Dependencies:
+
+* Bump dependencies on `nokogiri` and `archive-zip. (Thanks, @odlp and @ksylvest!)
+
+
+Bug fixes:
+
+* Use `https` for the URL used to download. [#41] (Thanks, @saraid!)
+* Better platform detection, no longer run Windows on unrecognized platforms. [#49] (Thanks, @duncan-bayne!)
+* `chromedriver-update` without a version specified will update to the latest version available on the internets. [#47]
+
+
+
 1.1.0 - 2017-03-19
 ----------
 

data/chromedriver-helper.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec",     "~> 3.0"
   s.add_development_dependency "rake",      "~> 10.0"
-  s.add_development_dependency "concourse", "~> 0.12"
+  s.add_development_dependency "concourse", "~> 0.16"
 
-  s.add_runtime_dependency "nokogiri",      "~> 1.6"
-  s.add_runtime_dependency "archive-zip",   "~> 0.7.0"
+  s.add_runtime_dependency "nokogiri",      "~> 1.8"
+  s.add_runtime_dependency "archive-zip",   "~> 0.10"
 end

data/concourse/chromedriver-helper.yml

@@ -6,13 +6,6 @@ resources:
       branch: master
       disable_ci_skip: true # always get the latest pipeline configuration
 
-  - name: nokogiri-ci
-    type: git
-    source:
-      uri: https://github.com/sparklemotion/nokogiri/
-      branch: master
-      disable_ci_skip: true # always get the latest pipeline configuration
-
   - name: chromedriver-helper
     type: git
     source:
@@ -20,9 +13,8 @@ resources:
       branch: master
       ignore_paths:
         - concourse/**
-
 jobs:
-  <% ruby_version = RUBIES[:mri].last %>
+% RUBIES[:mri].last(2).each do |ruby_version|
   - name: ruby-<%= ruby_version %>
     public: true
     plan:
@@ -40,39 +32,24 @@ jobs:
             - name: chromedriver-helper
           run:
             path: ci/concourse/tasks/rake-test/run.sh
+% end
 
-  - name: windows-install-ruby-2.3
-    public: true
-    serial_groups: [windows-configuration]
-    plan:
-      - get: nokogiri-ci
-      - get: chromedriver-helper
-        trigger: true
-      - task: setup
-        config:
-          platform: windows
-          inputs:
-            - name: nokogiri-ci
-              path: ci
-          run:
-            path: powershell
-            args: ["-File", "ci/concourse/tasks/windows-config/install-ruby-and-devkit.ps1"]
-
-  - name: ruby-2.3-devkit
+% RUBIES[:windows].last(2).each do |ruby_version|
+  - name: win-ruby-<%= ruby_version %>-devkit
     public: true
     plan:
       - get: ci
-      - get: nokogiri-ci
       - get: chromedriver-helper
         trigger: true
-        passed: ["windows-install-ruby-2.3"]
       - task: rake-test
         config:
           platform: windows
           inputs:
             - name: ci
-            - name: nokogiri-ci
             - name: chromedriver-helper
+          params:
+            WIN_RUBY_VERSION: "<%= ruby_version %>"
           run:
             path: powershell
             args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]
+% end

data/concourse/tasks/rake-test/run.ps1

@@ -1,12 +1,9 @@
-. "nokogiri-ci\concourse\shared\common.ps1"
-
-prepend-path $ruby23_bin_path
-$env:RUBYOPT = "-rdevkit"
+. "c:\var\vcap\packages\windows-ruby-dev-tools\prelude.ps1"
 
 push-location chromedriver-helper
 
-    stream-cmd "gem" "install bundler"
-    stream-cmd "bundle" "install"
-    stream-cmd "bundle" "exec rake spec"
+    system-cmd "gem install bundler"
+    system-cmd "bundle install"
+    system-cmd "bundle exec rake spec"
 
 pop-location

data/lib/chromedriver/helper.rb

@@ -39,9 +39,7 @@ module Chromedriver
     end
 
     def update(version = nil)
-      if version
-        @download_version = version
-      end
+      @download_version = version || google_code_parser.newest_download_version.to_s
 
       hit_network = (current_version != download_version) ? true : false
       download(hit_network)
@@ -99,11 +97,17 @@ module Chromedriver
 
     def platform
       cfg = RbConfig::CONFIG
-      case cfg['host_os']
+      host_cpu = cfg["host_cpu"]
+      host_os = cfg["host_os"]
+
+      case host_os
       when /linux/ then
-        cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
+        host_cpu =~ /x86_64|amd64/ ? "linux64" : "linux32"
       when /darwin/ then "mac"
-      else "win"
+      when /mswin/ then "win"
+      when /mingw/ then "win"
+      else
+        raise("Unsupported host OS '#{host_os}'")
       end
     end
   end

data/lib/chromedriver/helper/google_code_parser.rb

@@ -4,7 +4,7 @@ require 'open-uri'
 module Chromedriver
   class Helper
     class GoogleCodeParser
-      BUCKET_URL = 'http://chromedriver.storage.googleapis.com'
+      BUCKET_URL = 'https://chromedriver.storage.googleapis.com'
 
       attr_reader :source, :platform
 

data/lib/chromedriver/helper/version.rb

@@ -1,5 +1,5 @@
 module Chromedriver
   class Helper
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/spec/google_code_parser_spec.rb

@@ -11,11 +11,11 @@ describe Chromedriver::Helper::GoogleCodeParser do
   describe "#downloads" do
     it "returns an array of URLs for the platform" do
       expect(parser.downloads).to eq [
-        "http://chromedriver.storage.googleapis.com/2.0/chromedriver_mac32.zip",
-        "http://chromedriver.storage.googleapis.com/2.1/chromedriver_mac32.zip",
-        "http://chromedriver.storage.googleapis.com/2.2/chromedriver_mac32.zip",
-        "http://chromedriver.storage.googleapis.com/2.3/chromedriver_mac32.zip",
-        "http://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip"]
+        "https://chromedriver.storage.googleapis.com/2.0/chromedriver_mac32.zip",
+        "https://chromedriver.storage.googleapis.com/2.1/chromedriver_mac32.zip",
+        "https://chromedriver.storage.googleapis.com/2.2/chromedriver_mac32.zip",
+        "https://chromedriver.storage.googleapis.com/2.3/chromedriver_mac32.zip",
+        "https://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip"]
     end
   end
 
@@ -27,10 +27,10 @@ describe Chromedriver::Helper::GoogleCodeParser do
     context "out-of-order versions" do
       before do
         allow(parser).to receive(:downloads).and_return([
-          "http://chromedriver.storage.googleapis.com/2.3/chromedriver_mac32.zip",
-          "http://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip",
-          "http://chromedriver.storage.googleapis.com/2.14/chromedriver_mac32.zip",
-          "http://chromedriver.storage.googleapis.com/2.2/chromedriver_mac32.zip",
+          "https://chromedriver.storage.googleapis.com/2.3/chromedriver_mac32.zip",
+          "https://chromedriver.storage.googleapis.com/2.4/chromedriver_mac32.zip",
+          "https://chromedriver.storage.googleapis.com/2.14/chromedriver_mac32.zip",
+          "https://chromedriver.storage.googleapis.com/2.2/chromedriver_mac32.zip",
         ])
       end
 
@@ -42,7 +42,7 @@ describe Chromedriver::Helper::GoogleCodeParser do
 
   describe '#version_download_url' do
     it 'returns the version asked for' do
-      expect(parser.version_download_url(2.0)).to eq "http://chromedriver.storage.googleapis.com/2.0/chromedriver_mac32.zip"
+      expect(parser.version_download_url(2.0)).to eq "https://chromedriver.storage.googleapis.com/2.0/chromedriver_mac32.zip"
     end
   end
 end

data/spec/helper_spec.rb

@@ -14,4 +14,43 @@ describe Chromedriver::Helper do
       it { expect(helper.binary_path).to match(/chromedriver\.exe$/) }
     end
   end
+
+  describe '#platform' do
+    os_cpu_matrix = [
+      { 'host_os' => 'darwin','host_cpu' => 'irrelevant', 'expected_platform' => 'mac' },
+      { 'host_os' => 'linux', 'host_cpu' => 'amd64',      'expected_platform' => 'linux64' },
+      { 'host_os' => 'linux', 'host_cpu' => 'irrelevant', 'expected_platform' => 'linux32' },
+      { 'host_os' => 'linux', 'host_cpu' => 'x86_64',     'expected_platform' => 'linux64' },
+      { 'host_os' => 'mingw', 'host_cpu' => 'irrelevant', 'expected_platform' => 'win' },
+      { 'host_os' => 'mswin', 'host_cpu' => 'irrelevant', 'expected_platform' => 'win' }
+    ]
+
+    os_cpu_matrix.each do |config|
+      expected_platform = config['expected_platform']
+      host_cpu          = config['host_cpu']
+      host_os           = config['host_os']
+
+      context "given host OS #{host_os} and host CPU #{host_cpu}" do
+        before do
+          RbConfig.send(:remove_const, :CONFIG)
+          RbConfig::CONFIG = { 'host_os' => host_os, 'host_cpu' => host_cpu }
+        end
+
+        it "returns #{expected_platform}" do
+          expect(helper.platform).to eq(expected_platform)
+        end
+      end
+    end
+
+    context 'given an unknown host OS' do
+      before do
+        RbConfig.send(:remove_const, :CONFIG)
+        RbConfig::CONFIG = { 'host_os' => 'freebsd', 'host_cpu' => 'irrelevant' }
+      end
+
+      it 'raises an exception' do
+        expect { helper.platform }.to raise_error("Unsupported host OS 'freebsd'")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chromedriver-helper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.10'
 description: Easy installation and use of chromedriver, the Chromium project's selenium
   webdriver adapter.
 email:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Easy installation and use of chromedriver.