heroku_tool 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 896b566139715224a901f3119080b64e5e127f325bee2e040e210e4734a774f0
-  data.tar.gz: 18bf3e7d65ea20c497107af42d4b6a5b6eaa98e6ad6fac4654005b86689e9ce5
+  metadata.gz: 366d3213e1b652d45f89a3cdc8cd76ccfdf48c5727c13cbdcf215cef666c1a2e
+  data.tar.gz: 315e1c68673b6f3af2d944633b19d3f75d3856a9e8d81d028ada208834cd9759
 SHA512:
-  metadata.gz: bda281415b8e1859bf0b127665650f5faa6079285a96d1ed8e96edf29b8b4c51d73102fa77f9558869563e4bb53baa81bbcbd4936cc2402c88c335396e1c5a17
-  data.tar.gz: 35754cfb7317c05f6d6b3e720870bd2f781e1f19c1f5f76bdd4bb385b98cca6a3dbd1bfaa28b471ba25f5ff56ebb0b035b7df1662022a8641372e8e9db84a300
+  metadata.gz: ee39dd422b621fe18873394e5ae60e68f6294137de76dc0bfa67e084e4763791edc4d2bb74f1e7f0ccd2e4e05e0113b0ad9b38f92c0e825445d4095064cceb80
+  data.tar.gz: b9b3254bb923175c97f69ead7cb9658063a94ed499bb41b0da30075e406cd1c0b31a41127e924593a0f9f27df542e81940529d0bb0514c385c22888cc6fa21cb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.8.0
+
+- allow for multiple databases in configuration
+
 ## v0.7.1
 
 - update for changes to heroku cli in heroku 9.0 (#12)

data/lib/heroku_tool/db_configuration.rb

@@ -1,9 +1,19 @@
 # NB need to specify a username in the database.yml if you want to use any of these commands
 module HerokuTool
   class DbConfiguration
-    def config
-      db_config_from_file = ERB.new(File.read("config/database.yml")).result
-      @config ||= YAML.safe_load(db_config_from_file, permitted_classes: [], permitted_symbols: [], aliases: true)
+    attr_reader :config_all, :config_env
+
+    def initialize(filepath: "config/database.yml", rails_env: ENV["RAILS_ENV"] || "development")
+      db_config_from_file = ERB.new(File.read(filepath)).result
+      @config_all = YAML.safe_load(db_config_from_file, permitted_classes: [], permitted_symbols: [], aliases: true)
+      config_env = @config_all[rails_env]
+      @config_env = if config_env["database"].is_a?(String)
+                      config_env
+                    elsif config_env.key?("primary")
+                      config_env["primary"]
+                    else
+                      config_env.values.first
+                    end
     end
 
     def generate_drop_tables_sql
@@ -12,22 +22,13 @@ module HerokuTool
     end
 
     def user_arg
-      username = db_config["username"]
+      username = config_env["username"]
       username.present? && "-U #{username}" || ""
     end
 
     def database
-      db_config["database"]
+      config_env["database"]
     end
 
-    private
-
-    def db_config
-      config[env]
-    end
-
-    def env
-      ENV["RAILS_ENV"] || "development"
-    end
   end
 end

data/lib/heroku_tool/tasks/heroku.thor

@@ -391,12 +391,8 @@ class Heroku < Thor
     def from_dump
       invoke "warn", [], from: options[:from]
       source = lookup_heroku(options[:from])
-      rails_env = ENV["RAILS_ENV"] || "development"
-      db_config = HerokuTool::DbConfiguration.new.config[rails_env]
-      db_username = db_config["username"]
-      db = db_config["database"]
-      db_username_params = db_username.blank? && "" || "-U #{db_username}"
-      puts_and_system "pg_restore --verbose --clean --no-acl --no-owner -h localhost #{db_username_params} -d #{db} #{source.dump_filename}"
+      db_config = HerokuTool::DbConfiguration.new
+      puts_and_system "pg_restore --verbose --clean --no-acl --no-owner -h localhost #{db_config.user_arg} -d #{db_config.database} #{source.dump_filename}"
       Configuration.after_sync_down(self) unless options[:just_restore]
     end
 

data/lib/heroku_tool/version.rb

@@ -1,3 +1,3 @@
 module HerokuTool
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_tool
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Tim Diggins
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor