geordi 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337e7767788852ee10b537112f4151f4b12e267740fa20557b7786e12babd97d
-  data.tar.gz: 0dd146812562eb28fa115cbbdefa1bffcc8b172f1b509d44414bcca667ce3774
+  metadata.gz: 702407b6104865ae130f2c2793aa673f3c6f847d3652689a76e6d04c59a828e6
+  data.tar.gz: 4718d6e956efa941c25452f382761dcb3727db98364cfd0847c4edb0b947a608
 SHA512:
-  metadata.gz: '07256569d49cf31224e4a69d5fc0e240d9c8df820e527fd615b1e5956f320fa01077572b4e79401bf7a5ee8b8d9bf135b94c369ef807a2bc40c36aa76eb7180a'
-  data.tar.gz: 18bf3b9d1026575a5c0c3d33281de6b211ffa38c8c0d316656c6aee90bcdc2b81e5cec2feae0f006f2ef3fb8458834c1813dcd8d2aff5adcdf17bed732a06217
+  metadata.gz: b43e0bf03b775a47bfbfee4ebd87aaa615cdd1d13b9f85d0952fabb23f2591d3d736cb6ef852695bdec56d562cabd18e87abd37a8f204ca5ce9af74575c4b5bb
+  data.tar.gz: 4a8963f968e73e040a9486337881f52549563d019abf0601589cfaf64af28d950b921e990bd196d060c78212c5a1b7893d6f2d1fc3641c51697f18698406060c

data/CHANGELOG.md

@@ -3,7 +3,6 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-
 ## Unreleased
 
 ### Compatible changes
@@ -11,6 +10,14 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 9.2.0 2022-02-18
+
+### Compatible changes
+* Change the update mechanism of `geordi chromedriver-update`: This command (and `geordi cucumber`/`geordi tests` if the `auto_update_chromedriver` option is active) will now always update to the latest version of chromedriver for the current chrome version.
+
+### Breaking changes
+
+
 ## 9.1.0 2022-02-14
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (9.1.0)
+    geordi (9.2.0)
       thor (~> 1)
 
 GEM

data/README.md

@@ -53,10 +53,10 @@ installed Chrome.
 
 Setting `auto_update_chromedriver` to `true` in your global Geordi config file 
 (`~/.config/geordi/global.yml`), will automatically update chromedriver before 
-cucumber tests, in case Chrome and chromedriver versions don't match
+cucumber tests if a newer chromedriver version is available.
 
 **Options**
-- `[--quiet-if-matching], [--no-quiet-if-matching]`: Suppress notification if chromedriver and chrome versions match
+- `[--quiet-if-matching], [--no-quiet-if-matching]`: Suppress notification if chromedriver is already on the latest version
 
 
 ### `geordi clean`

data/lib/geordi/chromedriver_updater.rb

@@ -7,18 +7,13 @@ module Geordi
 
     def run(options)
       chrome_version = determine_chrome_version
-      chromedriver_version = determine_chromedriver_version
+      current_chromedriver_version = determine_chromedriver_version
 
-      if skip_update?(chrome_version, chromedriver_version)
-        Interaction.success "No update required: both Chrome and chromedriver are on v#{chrome_version}!" unless options[:quiet_if_matching]
+      latest_chromedriver_version = latest_version(chrome_version)
+      if current_chromedriver_version == latest_chromedriver_version
+        Interaction.success "No update required: Chromedriver is already on the latest version v#{latest_chromedriver_version}!" unless options[:quiet_if_matching]
       else
-        chromedriver_zip = download_chromedriver(chrome_version)
-        unzip(chromedriver_zip, File.expand_path('~/bin'))
-
-        chromedriver_zip.unlink
-
-        # We need to determine the version again, as it could be nil in case no chromedriver was installed before
-        Interaction.success "Chromedriver updated to v#{determine_chromedriver_version}."
+        update_chromedriver(latest_chromedriver_version)
       end
     end
 
@@ -27,13 +22,13 @@ module Geordi
     def determine_chrome_version
       stdout_str, _error_str, status = Open3.capture3('google-chrome', '--version')
       chrome_version = unless stdout_str.nil?
-        stdout_str[/\AGoogle Chrome (\d+)/, 1]
+        stdout_str[/\AGoogle Chrome ([\d.]+)/, 1]
       end
 
       if !status.success? || chrome_version.nil?
         Interaction.fail('Could not determine the version of Google Chrome.')
       else
-        chrome_version.to_i
+        chrome_version
       end
     end
 
@@ -42,23 +37,32 @@ module Geordi
 
       stdout_str, _error_str, status = Open3.capture3('chromedriver', '-v')
       chromedriver_version = unless stdout_str.nil?
-        stdout_str[/\AChromeDriver (\d+)/, 1]
+        stdout_str[/\AChromeDriver ([\d.]+)/, 1]
       end
 
       if !status.success? || chromedriver_version.nil?
         Interaction.fail('Could not determine the version of chromedriver.')
       else
-        chromedriver_version.to_i
+        chromedriver_version
       end
     end
 
-    def skip_update?(chrome_version, chromedriver_version)
-      chrome_version == chromedriver_version
+    # Check https://groups.google.com/a/chromium.org/g/chromium-discuss/c/4BB4jmsRyv8/m/TY3FXS4HBgAJ
+    # for information how chrome version numbers work
+    def major_version(full_version)
+      full_version.match(/^(\d+\.\d+\.\d+)\.\d+$/)[1]
     end
 
-    def download_chromedriver(chrome_version)
-      latest_version = latest_version(chrome_version)
+    def update_chromedriver(latest_chromedriver_version)
+      chromedriver_zip = download_chromedriver(latest_chromedriver_version)
+
+      unzip(chromedriver_zip, File.expand_path('~/bin'))
 
+      # We need to determine the version again, as it could be nil in case no chromedriver was installed before
+      Interaction.success "Chromedriver updated to v#{determine_chromedriver_version}."
+    end
+
+    def download_chromedriver(latest_version)
       uri = URI("https://chromedriver.storage.googleapis.com/#{latest_version}/chromedriver_linux64.zip")
       response = Net::HTTP.get_response(uri)
 
@@ -73,11 +77,13 @@ module Geordi
     end
 
     def latest_version(chrome_version)
-      uri = URI("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_#{chrome_version}")
+      return @latest_version if @latest_version
+
+      uri = URI("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_#{major_version(chrome_version)}")
       response = Net::HTTP.get_response(uri)
 
       if response.is_a?(Net::HTTPSuccess)
-        response.body.to_s
+        @latest_version = response.body.to_s
       else
         Interaction.fail("Could not download the chromedriver v#{chrome_version}.")
       end

data/lib/geordi/commands/chromedriver_update.rb

@@ -7,11 +7,11 @@ installed Chrome.
 
 Setting `auto_update_chromedriver` to `true` in your global Geordi config file 
 (`~/.config/geordi/global.yml`), will automatically update chromedriver before 
-cucumber tests, in case Chrome and chromedriver versions don't match
+cucumber tests if a newer chromedriver version is available.
 LONGDESC
 
 option :quiet_if_matching, type: :boolean, default: false,
-  desc: 'Suppress notification if chromedriver and chrome versions match'
+  desc: 'Suppress notification if chromedriver is already on the latest version'
 
 def chromedriver_update
   require 'geordi/chromedriver_updater'

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '9.1.0'.freeze
+  VERSION = '9.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails