geordi 9.2.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702407b6104865ae130f2c2793aa673f3c6f847d3652689a76e6d04c59a828e6
-  data.tar.gz: 4718d6e956efa941c25452f382761dcb3727db98364cfd0847c4edb0b947a608
+  metadata.gz: e93051812acfd619f8d5a2db9c2641bb1ff19cf28835096cec1a2f6fd1487620
+  data.tar.gz: 4bc007b0985800b275de9dd0676cf0cbdf51a57800a4a426c0878738b9b00f43
 SHA512:
-  metadata.gz: b43e0bf03b775a47bfbfee4ebd87aaa615cdd1d13b9f85d0952fabb23f2591d3d736cb6ef852695bdec56d562cabd18e87abd37a8f204ca5ce9af74575c4b5bb
-  data.tar.gz: 4a8963f968e73e040a9486337881f52549563d019abf0601589cfaf64af28d950b921e990bd196d060c78212c5a1b7893d6f2d1fc3641c51697f18698406060c
+  metadata.gz: 07105d522e4ed9c4412e95f0e8bd5dfbfbd4c8ea7bb7a58f7f347473eafb5807f7ceeaf82dc18f80dd85c77699970342f91396eec35f4a113a5aad8e0b73dc6d
+  data.tar.gz: 7bb8747a1352e983c3c3cecc848ae2097a01341e8c1bd0d1b32537e0470085d43cec4a639dbdc36eaacdd8fad5f4bce981032c8d06efe11c8ab0951afe4bbaec

data/CHANGELOG.md

@@ -10,13 +10,17 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### 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.
 
-### Breaking changes
-
 
 ## 9.1.0 2022-02-14
 

data/Gemfile.lock

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

data/README.md

@@ -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/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.2.0'.freeze
+  VERSION = '9.3.0'.freeze
 end

metadata

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