geordi 9.1.0 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337e7767788852ee10b537112f4151f4b12e267740fa20557b7786e12babd97d
-  data.tar.gz: 0dd146812562eb28fa115cbbdefa1bffcc8b172f1b509d44414bcca667ce3774
+  metadata.gz: 53000c0f7a45eb1abdbda692ef86f6add4b03a526a663d2080ae893d739e5e79
+  data.tar.gz: 92f23443438253a43960d00b726646a57e1e9a2c413f167bbce1c4d747addd99
 SHA512:
-  metadata.gz: '07256569d49cf31224e4a69d5fc0e240d9c8df820e527fd615b1e5956f320fa01077572b4e79401bf7a5ee8b8d9bf135b94c369ef807a2bc40c36aa76eb7180a'
-  data.tar.gz: 18bf3b9d1026575a5c0c3d33281de6b211ffa38c8c0d316656c6aee90bcdc2b81e5cec2feae0f006f2ef3fb8458834c1813dcd8d2aff5adcdf17bed732a06217
+  metadata.gz: 37e18e79036a4d13cec85463458f2be6e1752485f747d10873c8a8a8ae29be92580233bb895d8fb73c059d0905cc2a646db34d5fd163228d66d59a215f4c4757
+  data.tar.gz: 9a58e6558bcd390d1f1749764fef54c6b590e3c67899256797afaaf9ebcb4efc10d5cfd91fcbdda113ed2ed8301903d5ecbbf16dc8c1c5a6c8c04f219d1a03a7

data/CHANGELOG.md

@@ -3,14 +3,26 @@
 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
+* Use YAML.safe_load in dumple and allow aliases
 
 ### Breaking changes
 
 
+## 9.3.0 2022-04-26
+
+### Compatible changes
+* Add dump loading in multi-database-setups.
+
+
+## 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.
+
+
 ## 9.1.0 2022-02-14
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (9.1.0)
+    geordi (9.3.1)
       thor (~> 1)
 
 GEM
@@ -165,4 +165,4 @@ DEPENDENCIES
   tracker_api
 
 BUNDLED WITH
-   2.2.27
+   2.3.6

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`
@@ -195,16 +195,20 @@ specified target's database and downloads it to `tmp/`.
 option) sources the dump into the development database after downloading it.
 
 If you are using multiple databases per environment, Geordi defaults to the
-"primary" database, or the first entry in database.yml. To dump a specific
+"primary" database, or the first entry in database.yml. To target a specific
 database, pass the database name like this:
+```
+geordi dump -d primary
+```
 
-    geordi dump -d primary
-
-Loading a dump into one of multiple local databases is not supported yet.
+When used with the blank `load` option ("dump and source"), the `database` option
+will be respected both for the remote *and* the local database. If these should
+not match, please issue separate commands for dumping (`dump -d`) and sourcing
+(`dump -l -d`).
 
 **Options**
 - `-l, [--load=[DUMP_FILE]]`: Load a dump
-- `-d, [--database=NAME]`: Database name, if there are multiple databases
+- `-d, [--database=NAME]`: Target database, if there are multiple databases
 
 
 ### `geordi help [COMMAND]`

data/exe/dumple

@@ -92,7 +92,11 @@ end
 def find_database_config(config_path, environment, database)
   environment ||= 'production'
   database_yml = ERB.new(File.read(config_path)).result
-  config = YAML::load(database_yml)
+  config = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+    YAML.safe_load(database_yml, aliases: true)
+  else
+    YAML.safe_load(database_yml, [], [], true)
+  end
   config = config[environment] or raise "x No #{environment} database found.\nUsage: dumple ENVIRONMENT [DATABASE]"
 
   if config.values[0].is_a? Hash # Multi-db setup

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/commands/dump.rb

@@ -12,16 +12,20 @@ specified target's database and downloads it to `tmp/`.
 option) sources the dump into the development database after downloading it.
 
 If you are using multiple databases per environment, Geordi defaults to the
-"primary" database, or the first entry in database.yml. To dump a specific
+"primary" database, or the first entry in database.yml. To target a specific
 database, pass the database name like this:
-
-    geordi dump -d primary
-
-Loading a dump into one of multiple local databases is not supported yet.
+```
+geordi dump -d primary
+```
+
+When used with the blank `load` option ("dump and source"), the `database` option
+will be respected both for the remote *and* the local database. If these should
+not match, please issue separate commands for dumping (`dump -d`) and sourcing
+(`dump -l -d`).
 DESC
 
 option :load, aliases: '-l', type: :string, desc: 'Load a dump', banner: '[DUMP_FILE]'
-option :database, aliases: '-d', type: :string, desc: 'Database name, if there are multiple databases', banner: 'NAME'
+option :database, aliases: '-d', type: :string, desc: 'Target database, if there are multiple databases', banner: 'NAME'
 
 def dump(target = nil, *_args)
   require 'geordi/dump_loader'
@@ -33,7 +37,7 @@ def dump(target = nil, *_args)
       Interaction.fail 'Missing a dump file.' if options.load == 'load'
       File.exist?(options.load) || raise('Could not find the given dump file: ' + options.load)
 
-      loader = DumpLoader.new(options.load)
+      loader = DumpLoader.new(options.load, options.database)
 
       Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load
@@ -53,7 +57,7 @@ def dump(target = nil, *_args)
     dump_path = Geordi::Remote.new(target).dump(options)
 
     if options.load # … and dump loading
-      loader = DumpLoader.new(dump_path)
+      loader = DumpLoader.new(dump_path, options.database)
 
       Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load

data/lib/geordi/dump_loader.rb

@@ -6,24 +6,45 @@ require 'geordi/util'
 module Geordi
   class DumpLoader
 
-    def initialize(file)
+    def initialize(file, database)
       @dump_file = file
+      @database = database
     end
 
     def development_database_config
+      return @config if @config
+
       require 'yaml'
 
       evaluated_config_file = ERB.new(File.read('config/database.yml')).result
 
       # Allow aliases and a special set of classes like symbols and time objects
       permitted_classes = [Symbol, Time]
-      @config ||= if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+      database_config = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
         YAML.safe_load(evaluated_config_file, permitted_classes: permitted_classes, aliases: true)
       else
         YAML.safe_load(evaluated_config_file, permitted_classes, [], true)
       end
 
-      @config['development']
+      development_config = database_config['development']
+
+      if development_config.values[0].is_a? Hash # Multi-db setup
+        @config = if @database
+          development_config[@database] || Interaction.fail(%(Unknown development database "#{@database}".))
+        elsif development_config.has_key? 'primary'
+          development_config['primary']
+        else
+          development_config.values[0]
+        end
+      else # Single-db setup
+        if @database
+          Interaction.fail %(Could not select "#{@database}" database in a single-db setup.)
+        else
+          @config = development_config
+        end
+      end
+
+      @config
     end
     alias_method :config, :development_database_config
 
@@ -61,9 +82,12 @@ module Geordi
     end
 
     def load
+      adapter_command = "#{config['adapter']}_command"
+      Interaction.fail "Unknown database adapter #{config['adapter'].inspect} in config/database.yml." unless respond_to? adapter_command
+
       Interaction.note 'Source file: ' + dump_file
 
-      source_command = send("#{config['adapter']}_command")
+      source_command = send(adapter_command)
       Util.run! source_command, fail_message: "An error occurred loading #{File.basename(dump_file)}"
     end
 

data/lib/geordi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.3.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-06-07 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.3
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails