branch_db 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a44bc87f28c22ce64d6203b277410bca8c1b5d700d6985023cda0f759057b83
-  data.tar.gz: f801399f3ba42bd476428c96f64412fc51d2705c05ab2762dbb5d219cc96babc
+  metadata.gz: b89c858576fe083b0a57357468a32253f332a639ca96386ecfe5e740fdbb5359
+  data.tar.gz: e454deaba31ed922ecef875a625c5d17c72c2428e90efb214981efde90196c07
 SHA512:
-  metadata.gz: 0e0f292f72bb117d603377611f6f09d0849a01b2a14658b1113331c0646c22323775dafacd437727f3136fa5e13a6536043e7b03cce3c4061ebec76f1f9b01c1
-  data.tar.gz: ac74c3bd8eee25af6139b29cec4ed0071621c04f02dbb4c94316bfe855053272fd6ec820da281249cdc36aee5327268d3e56eddd3f7be5324926552c824ff623
+  metadata.gz: 21a0fcd375d2fdba1b9f3c2ce6829b6b539f8615cd292bf443eabd515cea4908b3b6df3c535578939e87acee063fd9905097e74a217745d006722fa23dc1577c
+  data.tar.gz: eb0a1722a367714346d82886c695bfbb734b195a8062c4bf5d97b207e635227dd0378488c4c2a1a88b23b01f2d3f2ff3372b960b7e0f2e94cfdccdb9459fdfaf

data/Appraisals

@@ -0,0 +1,24 @@
+appraise "rails-7-0" do
+  gem "railties", "~> 7.0.0"
+  gem "activerecord", "~> 7.0.0"
+end
+
+appraise "rails-7-1" do
+  gem "railties", "~> 7.1.0"
+  gem "activerecord", "~> 7.1.0"
+end
+
+appraise "rails-7-2" do
+  gem "railties", "~> 7.2.0"
+  gem "activerecord", "~> 7.2.0"
+end
+
+appraise "rails-8-0" do
+  gem "railties", "~> 8.0.0"
+  gem "activerecord", "~> 8.0.0"
+end
+
+appraise "rails-8-1" do
+  gem "railties", "~> 8.1.0"
+  gem "activerecord", "~> 8.1.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [0.1.2] - 2026-01-26
+
+### Fixed
+
+- Fixed `main_database_name` to truncate the branch name to the configured length
+- Fixed parent branch detection to find the original parent instead of the most recent checkout
+
+### Changed
+
+- Refactored internal modules for improved code quality
+
 ## [0.1.1] - 2026-01-18
 
 ### Fixed

data/README.md

@@ -43,6 +43,8 @@ git status
 # Run db:migrate? Schema.rb still shows the foreign column
 ```
 
+More complex migrations could cause the code to stop working like renaming tables, adding foreign keys, or removing columns!
+
 ## The Solution
 
 BranchDb automatically manages separate databases for each branch:
@@ -78,14 +80,14 @@ Update your `config/database.yml`:
 ```yaml
 development:
   <<: *default
-  database: <%= defined?(BranchDb) ? BranchDb.database_name('myapp_development') : 'myapp_development' %>
+  database: <%= BranchDb.database_name('myapp_development') rescue 'myapp_development' %>
 
 test:
   <<: *default
-  database: <%= defined?(BranchDb) ? BranchDb.database_name('myapp_test') : 'myapp_test' %>
+  database: <%= BranchDb.database_name('myapp_test') rescue 'myapp_test' %>
 ```
 
-> **Note:** The `defined?(BranchDb)` guard ensures production/staging environments work correctly since the gem is only loaded in development/test. Replace `myapp` with your application name.
+> **Note:** The `rescue` fallback ensures production/staging environments work correctly since the gem is only loaded in development/test. Replace `myapp` with your application name.
 
 Initialize your first branch database:
 

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "irb"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.21"
+gem "rubocop-rake", "~> 0.7.1"
+gem "rubocop-rspec", "~> 3.9"
+gem "simplecov", "~> 0.22", require: false
+gem "appraisal", "~> 2.5"
+gem "railties", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_7_1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.1.0"
+gem "irb"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.21"
+gem "rubocop-rake", "~> 0.7.1"
+gem "rubocop-rspec", "~> 3.9"
+gem "simplecov", "~> 0.22", require: false
+gem "appraisal", "~> 2.5"
+gem "railties", "~> 7.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7_2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.2.0"
+gem "irb"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.21"
+gem "rubocop-rake", "~> 0.7.1"
+gem "rubocop-rspec", "~> 3.9"
+gem "simplecov", "~> 0.22", require: false
+gem "appraisal", "~> 2.5"
+gem "railties", "~> 7.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_8_0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 8.0.0"
+gem "irb"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.21"
+gem "rubocop-rake", "~> 0.7.1"
+gem "rubocop-rspec", "~> 3.9"
+gem "simplecov", "~> 0.22", require: false
+gem "appraisal", "~> 2.5"
+gem "railties", "~> 8.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_8_1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 8.1.0"
+gem "irb"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.21"
+gem "rubocop-rake", "~> 0.7.1"
+gem "rubocop-rspec", "~> 3.9"
+gem "simplecov", "~> 0.22", require: false
+gem "appraisal", "~> 2.5"
+gem "railties", "~> 8.1.0"
+
+gemspec path: "../"

data/lib/branch_db/cleaner.rb

@@ -16,15 +16,13 @@ module BranchDb
     end
 
     def list_branch_databases
-      dev_dbs = find_databases(dev_prefix)
-      test_dbs = find_databases(test_prefix)
+      all_dbs = all_branch_databases
 
-      if dev_dbs.empty? && test_dbs.empty?
+      if all_dbs.empty?
         log "No branch databases found#{db_label}."
         return []
       end
 
-      all_dbs = dev_dbs + test_dbs
       log "Found #{all_dbs.size} branch database(s)#{db_label}:"
       all_dbs.each { |db| log "  - #{db}" }
       all_dbs
@@ -40,6 +38,17 @@ module BranchDb
                                            done_msg: "Prune complete#{db_label}!", confirm:)
     end
 
+    private
+
+    def deletable_databases = all_branch_databases.reject { |db| protected_databases.include?(db) }
+
+    def prunable_databases
+      existing = BranchDb::Naming.git_branches.map { BranchDb::Naming.sanitize_branch(_1) }
+      all_branch_databases.reject { |db| protected_databases.include?(db) || branch_exists?(db, existing) }
+    end
+
+    def all_branch_databases = find_databases(dev_prefix) + find_databases(test_prefix)
+
     def protected_databases
       current_dev = config[:database]
       current_test = current_dev.sub(dev_prefix, test_prefix)
@@ -52,19 +61,6 @@ module BranchDb
       ]
     end
 
-    private
-
-    def deletable_databases
-      all_branch_databases.reject { |db| protected_databases.include?(db) }
-    end
-
-    def prunable_databases
-      existing = BranchDb::Naming.git_branches.map { BranchDb::Naming.sanitize_branch(_1) }
-      all_branch_databases.reject { |db| protected_databases.include?(db) || branch_exists?(db, existing) }
-    end
-
-    def all_branch_databases = find_databases(dev_prefix) + find_databases(test_prefix)
-
     def branch_exists?(db, existing_branches)
       prefix = db.start_with?(test_prefix) ? test_prefix : dev_prefix
       existing_branches.include?(db.sub(prefix, ""))

data/lib/branch_db/cloner.rb

@@ -21,20 +21,9 @@ module BranchDb
       database_exists?(source_db)
     end
 
-    def source_db
-      @source_db ||= determine_source_db
-    end
-
-    def target_db
-      config[:database]
-    end
-
-    def base_name
-      suffix = BranchDb::Naming.branch_suffix
-      return target_db if suffix.empty?
+    def source_db = @source_db ||= determine_source_db
 
-      target_db.sub(/#{Regexp.escape(suffix)}\z/, "")
-    end
+    def target_db = config[:database]
 
     private
 
@@ -48,6 +37,13 @@ module BranchDb
       database_exists?(parent_db) ? parent_db : main_db
     end
 
+    def base_name
+      suffix = BranchDb::Naming.branch_suffix
+      return target_db if suffix.empty?
+
+      target_db.sub(/#{Regexp.escape(suffix)}\z/, "")
+    end
+
     def database_exists?(db_name)
       check_cmd = "#{list_databases_cmd} | grep -qx #{db_name.shellescape}"
       system(pg_env, "bash", "-c", check_cmd)

data/lib/branch_db/git_utils.rb

@@ -1,21 +1,15 @@
 module BranchDb
   module GitUtils
-    def current_branch
-      `git symbolic-ref HEAD 2>/dev/null`.chomp.sub("refs/heads/", "")
-    end
+    def current_branch = `git symbolic-ref HEAD 2>/dev/null`.chomp.sub("refs/heads/", "")
 
     def git_branches
       output = `git branch --format='%(refname:short)' 2>/dev/null`
       output.split("\n").map(&:strip).reject(&:empty?)
     end
 
-    def parent_branch
-      @parent_branch ||= detect_parent_branch
-    end
+    def parent_branch = @parent_branch ||= detect_parent_branch
 
-    def reset_parent_cache!
-      @parent_branch = nil
-    end
+    def reset_parent_cache! = @parent_branch = nil
 
     private
 
@@ -29,11 +23,9 @@ module BranchDb
       current = current_branch
       return nil if current.empty?
 
-      `git reflog show --format='%gs' -n 100 2>/dev/null`.each_line do |line|
-        parent = extract_parent_from_reflog_line(line.chomp, current)
-        return parent if parent
-      end
-      nil
+      `git reflog show --format='%gs' -n 1000 2>/dev/null`.each_line.filter_map do |line|
+        extract_parent_from_reflog_line(line.chomp, current)
+      end.last
     end
 
     def extract_parent_from_reflog_line(line, current)

data/lib/branch_db/logging.rb

@@ -4,13 +4,9 @@ module BranchDb
 
     private
 
-    def log(message)
-      output.puts prefix? ? "#{PREFIX} #{message}" : message
-    end
+    def log(message) = output.puts prefix? ? "#{PREFIX} #{message}" : message
 
-    def log_indented(message)
-      output.puts prefix? ? "#{PREFIX}    #{message}" : "   #{message}"
-    end
+    def log_indented(message) = output.puts prefix? ? "#{PREFIX}    #{message}" : "   #{message}"
 
     def prefix? = @prefix != false
   end

data/lib/branch_db/naming.rb

@@ -3,22 +3,22 @@ module BranchDb
     extend GitUtils
 
     class << self
-      def sanitize_branch(branch)
-        branch.gsub(/[^a-zA-Z0-9_]/, "_")
-      end
+      def main_database_name(base_name) = "#{base_name}#{suffix_for(BranchDb.configuration.main_branch)}"
+
+      def database_name(base_name) = "#{base_name}#{branch_suffix}"
+
+      def branch_suffix = suffix_for(current_branch)
 
-      def branch_suffix
-        branch = sanitize_branch(current_branch)
+      def suffix_for(branch)
+        branch = sanitize_branch(branch)
         max_length = BranchDb.configuration.max_branch_length
         truncated = branch[0, max_length]
         truncated.empty? ? "" : "_#{truncated}"
       end
 
-      def database_name(base_name) = "#{base_name}#{branch_suffix}"
-
-      def main_database_name(base_name) = "#{base_name}_#{BranchDb.configuration.main_branch}"
-
       def parent_database_name(base_name) = "#{base_name}_#{sanitize_branch(parent_branch)}"
+
+      def sanitize_branch(branch) = branch.gsub(/[^a-zA-Z0-9_]/, "_")
     end
   end
 end

data/lib/branch_db/pg_utils.rb

@@ -14,13 +14,9 @@ module BranchDb
       "-h #{host} -p #{port} -U #{username}"
     end
 
-    def pg_env
-      { "PGPASSWORD" => config[:password].to_s }
-    end
+    def pg_env = { "PGPASSWORD" => config[:password].to_s }
 
-    def list_databases_cmd
-      "psql #{psql_flags} -lqt | cut -d \\| -f 1 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'"
-    end
+    def list_databases_cmd = "psql #{psql_flags} -lqt | cut -d \\| -f 1 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'"
 
     def check_pg_tools!(*tools)
       tools = PG_TOOLS if tools.empty?

data/lib/branch_db/preparer.rb

@@ -24,13 +24,9 @@ module BranchDb
 
     private
 
-    def config
-      db_config.configuration_hash
-    end
+    def config = db_config.configuration_hash
 
-    def db_label
-      db_config.name == "primary" ? "" : " (#{db_config.name})"
-    end
+    def db_label = db_config.name == "primary" ? "" : " (#{db_config.name})"
 
     def needs_cloning?
       establish_connection
@@ -39,9 +35,7 @@ module BranchDb
       true
     end
 
-    def establish_connection
-      ActiveRecord::Base.establish_connection(db_config)
-    end
+    def establish_connection = ActiveRecord::Base.establish_connection(db_config)
 
     def attempt_clone
       cloner = Cloner.new(config, output:)

data/lib/branch_db/version.rb

@@ -1,3 +1,3 @@
 module BranchDb
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/branch_db.rb

@@ -13,20 +13,12 @@ module BranchDb
   class Error < StandardError; end
 
   class << self
-    def configuration
-      @configuration ||= Configuration.new
-    end
+    def configuration = @configuration ||= Configuration.new
 
-    def configure
-      yield(configuration)
-    end
+    def configure = yield(configuration)
 
-    def database_name(base_name)
-      Naming.database_name(base_name)
-    end
+    def database_name(base_name) = Naming.database_name(base_name)
 
-    def main_database_name(base_name)
-      Naming.main_database_name(base_name)
-    end
+    def main_database_name(base_name) = Naming.main_database_name(base_name)
   end
 end

data/lib/generators/branch_db/install_generator.rb

@@ -19,10 +19,10 @@ module BranchDb
       say "1. Update your config/database.yml to use dynamic database names:"
       say ""
       say "   development:"
-      say "     database: <%= BranchDb.database_name('#{app_name}_development') %>"
+      say "     database: <%= BranchDb.database_name('#{app_name}_development') rescue '#{app_name}_development' %>"
       say ""
       say "   test:"
-      say "     database: <%= BranchDb.database_name('#{app_name}_test') %>"
+      say "     database: <%= BranchDb.database_name('#{app_name}_test') rescue '#{app_name}_test' %>"
       say ""
       say "2. Initialize your database:"
       say "   rails db:prepare          # Creates and clones from main"
@@ -36,8 +36,6 @@ module BranchDb
 
     private
 
-    def app_name
-      Rails.application.class.module_parent_name.underscore
-    end
+    def app_name = Rails.application.class.module_parent_name.underscore
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_db
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ali Hamdi Ali Fadel
@@ -31,10 +31,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Appraisals
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
+- gemfiles/rails_8_0.gemfile
+- gemfiles/rails_8_1.gemfile
 - lib/branch_db.rb
 - lib/branch_db/cleaner.rb
 - lib/branch_db/cloner.rb