actual_db_schema 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac7885f8774402bb8f0532caf66d4304df61be50ef0c22f1fd8f6ef325b8330
-  data.tar.gz: 8c90d4101e41941a4c247f6af2695e050f450a46435b659c99e1d5fe8fd71929
+  metadata.gz: ca3780aca89ac715ade8441154b10a78b258514b3daa1d23db1ede9d37d63108
+  data.tar.gz: cb4ce56d44d5a5c61d20220ab2ead11830db440438e1dd433d0774cdf23aef97
 SHA512:
-  metadata.gz: 794038e111d31a3e99b1a48c3c3a0603498e6492e8b2a8f050d4e9e481debe047d908ff5cae5940789c96c3d76da13a10a841c55834275392e0d08076b4b6b52
-  data.tar.gz: 342ba459e1705c42a64d0f476c50054724a48b212bbba79a82f85a1a4118ac342bac7d0ebab3158bcab58f5d6068c1e4f344f813a6464091e20545815ff09dc3
+  metadata.gz: bf59099adf9a660b934fc65c3573460c4034e59876f0770691019799601217b6eeee29b9f3eda43d1ea837380d6da2bb2930819b81dbc9eb334c6bc2f4e4777c
+  data.tar.gz: 8c9f16c0bf8f0571f163bcf07a73fe4b62dc4c031897d2d156e234aac3d4ca749a6380a41e983c5dec722d61909b0aaf09caf1f3b2303f885bc76385da6b1039

data/.rubocop.yml

@@ -24,3 +24,7 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Exclude:
     -  test/**/*
+
+Metrics/ClassLength:
+  Exclude:
+    -  test/**/*

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.7.3] - 2024-04-06
+- add multipe databases support
+
+## [0.7.2] - 2024-03-30
+- update title and description in Rubygems
+
 ## [0.7.1] - 2024-03-19
 
 - add csv as a dependency since Ruby 3.3 has removed it from the standard library

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    actual_db_schema (0.7.1)
+    actual_db_schema (0.7.3)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
       csv
@@ -93,7 +93,7 @@ GEM
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     crass (1.0.6)
-    csv (3.2.8)
+    csv (3.3.0)
     date (3.3.3)
     debug (1.8.0)
       irb (>= 1.5.0)

data/README.md

@@ -48,6 +48,8 @@ And then execute:
 
     $ bundle install
 
+If you cannot commit changes to the repo or Gemfile, consider the local Gemfile installation described in [this post](https://blog.widefix.com/personal-gemfile-for-development/).
+
 ## Usage
 
 Just run `rails db:migrate` inside the current branch.

data/actual_db_schema.gemspec

@@ -8,20 +8,19 @@ Gem::Specification.new do |spec|
   spec.authors = ["Andrei Kaleshka"]
   spec.email = ["ka8725@gmail.com"]
 
-  spec.summary = "Keep your DB clean and consistent between branches."
+  spec.summary = "Keep your DB and schema.rb consistent in dev branches."
   spec.description = <<~DESC
-    Switching between branches with migrations and running them can make your DB inconsistent
-    and not working in another branch if not roll the migration back.
-    Install this gem and forget about that issue by running the standard rake db:migrate.
+    Wipe out inconsistent DB and schema.rb when switching branches.
+    Just install this gem and use the standard rake db:migrate command.
   DESC
-  spec.homepage = "https://github.com/widefix/actual_db_schema"
+  spec.homepage = "https://blog.widefix.com/actual-db-schema/"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.7.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/widefix/actual_db_schema"
   spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.

data/gemfiles/rails.6.0.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 6.0.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails.6.1.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 6.1.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails.7.0.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 7.0.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/gemfiles/rails.7.1.gemfile

@@ -9,5 +9,6 @@ gem "activesupport", "~> 7.1.0"
 gem "minitest", "~> 5.0"
 gem "rake"
 gem "rubocop", "~> 1.21"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/lib/actual_db_schema/commands/base.rb

@@ -9,10 +9,6 @@ module ActualDbSchema
           raise "ActualDbSchema is disabled. Set ActualDbSchema.config[:enabled] = true to enable it."
         end
 
-        if ActiveRecord::Migration.current_version >= 6
-          ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:rollback_branches")
-        end
-
         call_impl
       end
 

data/lib/actual_db_schema/patches/migration_context.rb

@@ -5,7 +5,6 @@ module ActualDbSchema
     # Add new command to roll back the phantom migrations
     module MigrationContext
       def rollback_branches
-        ActualDbSchema.failed = []
         migrations.reverse_each do |migration|
           migrator = down_migrator_for(migration)
           migrator.extend(ActualDbSchema::Patches::Migrator)

data/lib/actual_db_schema/store.rb

@@ -9,6 +9,7 @@ module ActualDbSchema
 
     def write(filename)
       basename = File.basename(filename)
+      FileUtils.mkdir_p(folder)
       FileUtils.copy(filename, folder.join(basename))
       record_metadata(filename)
     end

data/lib/actual_db_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActualDbSchema
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

data/lib/actual_db_schema.rb

@@ -29,12 +29,41 @@ module ActualDbSchema
   }
 
   def self.migrated_folder
-    Rails.root.join("tmp", "migrated").tap { |folder| FileUtils.mkdir_p(folder) }
+    migrated_folders.first
+  end
+
+  def self.migrated_folders
+    return [default_migrated_folder] unless migrations_paths
+
+    Array(migrations_paths).map do |path|
+      if path.end_with?("db/migrate")
+        default_migrated_folder
+      else
+        postfix = path.split("/").last
+        Rails.root.join("tmp", "migrated_#{postfix}")
+      end
+    end
+  end
+
+  def self.default_migrated_folder
+    Rails.root.join("tmp", "migrated")
+  end
+
+  def self.migrations_paths
+    ActiveRecord::Base.connection_db_config.migrations_paths
   end
 
   def self.migration_filename(fullpath)
     fullpath.split("/").last
   end
+
+  def self.for_each_db_connection
+    configs = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env)
+    configs.each do |db_config|
+      ActiveRecord::Base.establish_connection(db_config)
+      yield
+    end
+  end
 end
 
 ActiveRecord::MigrationProxy.prepend(ActualDbSchema::Patches::MigrationProxy)

data/lib/tasks/db.rake

@@ -3,13 +3,18 @@
 namespace :db do
   desc "Rollback migrations that were run inside not a merged branch."
   task rollback_branches: :load_config do
-    ActualDbSchema::Commands::Rollback.new.call
+    ActualDbSchema.failed = []
+    ActualDbSchema.for_each_db_connection do
+      ActualDbSchema::Commands::Rollback.new.call
+    end
   end
 
   desc "List all phantom migrations - non-relevant migrations that were run inside not a merged branch."
   task phantom_migrations: :load_config do
-    ActualDbSchema::Commands::List.new.call
+    ActualDbSchema.for_each_db_connection do
+      ActualDbSchema::Commands::List.new.call
+    end
   end
 
-  task _dump: :rollback_branches
+  task "schema:dump" => :rollback_branches
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actual_db_schema
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Andrei Kaleshka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,9 +109,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |
-  Switching between branches with migrations and running them can make your DB inconsistent
-  and not working in another branch if not roll the migration back.
-  Install this gem and forget about that issue by running the standard rake db:migrate.
+  Wipe out inconsistent DB and schema.rb when switching branches.
+  Just install this gem and use the standard rake db:migrate command.
 email:
 - ka8725@gmail.com
 executables: []
@@ -145,13 +144,13 @@ files:
 - lib/railtie.rb
 - lib/tasks/db.rake
 - sig/actual_db_schema.rbs
-homepage: https://github.com/widefix/actual_db_schema
+homepage: https://blog.widefix.com/actual-db-schema/
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/widefix/actual_db_schema
+  homepage_uri: https://blog.widefix.com/actual-db-schema/
   source_code_uri: https://github.com/widefix/actual_db_schema
-  changelog_uri: https://github.com/widefix/actual_db_schema/blob/main/CHANGELOG.md
+  changelog_uri: https://blog.widefix.com/actual-db-schema//blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -167,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: Keep your DB clean and consistent between branches.
+summary: Keep your DB and schema.rb consistent in dev branches.
 test_files: []