squasher 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58b6246f12c84f3e639e620a90d461314bf5d0b8e452d812b4e3ed2e845baae
-  data.tar.gz: 720447fa89a2a8c64f12ab1d0c73b21a71e5e920ad95f6656aa3dd193fc59399
+  metadata.gz: f24c854e23e0551b83dae9c84535512267c5e289b97e6e80bd6f2aa5ef8e114b
+  data.tar.gz: 71907e46c851eb643fcea44e358905ca32118dd927395bd9368180e077bdd88a
 SHA512:
-  metadata.gz: 0bac4b5782dfd94e7f008321f4473b5e7d7bfdf90bf16afbbc777c892223df991d6b9e4cc6a571cf9b6b05203407b395baa217f214a0a20ba04dc6a85ab8d5dd
-  data.tar.gz: 6bd32f9b1fde3da1a34cfdada1898813f0ce3a5db191dcbdf5e48189fe7e86ba3907df40c500be087266226147cb66e6bd58f62a6e60b616ae750143c5aa24e0
+  metadata.gz: 8e2a01c40884087c7f931c0d35535100b128c8acd8bb9f90d2f52d935bed3cc32be6317283ad4aced836f68fe6664f325558cf4e9d644a909b9cac718bb424f7
+  data.tar.gz: 6c87b45b989701ce8731b71141f647905e67089f6a3aca42ef1dbc962f78d059adcc654b81ffdcdb0703dd9029f0670d3669fbb14daa12bf585c7ffed843340e

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  specs:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - head
+          - '3.2'
+          - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
+          - jruby
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+- 0.8.0
+  - Support multiple databases in Rails-style ([@fynsta](https://github.com/fynsta))
 - 0.7.0
   - Support the presence of multiverse ([@mlohbihler](https://github.com/mlohbihler))
 - 0.6.1

data/README.md

@@ -1,6 +1,6 @@
 # Squasher
 
-[![Build Status](https://travis-ci.org/jalkoby/squasher.svg?branch=master)](https://travis-ci.org/jalkoby/squasher)
+[![CI](https://github.com/jalkoby/squasher/actions/workflows/ci.yml/badge.svg)](https://github.com/jalkoby/squasher/actions/workflows/ci.yml)
 [![Code Climate](https://codeclimate.com/github/jalkoby/squasher.svg)](https://codeclimate.com/github/jalkoby/squasher)
 [![Gem Version](https://badge.fury.io/rb/squasher.svg)](http://badge.fury.io/rb/squasher)
 

data/bin/squasher

@@ -32,7 +32,11 @@ parser = OptionParser.new do |config|
     options[:engine] = value
   end
 
-  config.on('--databases=DB_KEY,...', 'alternate database configuration keys to be included dbconfig (for multiverse)') do |value|
+  config.on('--multi-db_format=FORMAT', 'format of the multi-db configuration (rails, multiverse)') do |value|
+    options[:multi_db_format] = value
+  end
+
+  config.on('--databases=DB_KEY,...', 'alternate database configuration keys to be included') do |value|
     options[:databases] = value&.split(",")
   end
 

data/lib/squasher/cleaner.rb

@@ -9,16 +9,31 @@ module Squasher
     end
 
     def process
-      Squasher.error(:migration_folder_missing) unless config.migrations_folder?
+      Squasher.error(:migration_folder_missing) unless config.migrations_folders?
+
+      if config.multi_db_format == 'rails'
+        config.databases.each do |database|
+          process_database(database)
+        end
+      else
+        process_database
+      end
+    end
 
-      migration_file = config.migration_file(now_timestamp, MIGRATION_NAME)
-      if prev_migration
+    def process_database(database = nil)
+      migration_file = config.migration_file(now_timestamp, MIGRATION_NAME, database)
+      if (prev_migration = prev_migration(database))
         FileUtils.rm(prev_migration)
       end
       File.open(migration_file, 'wb') do |stream|
-        stream << ::Squasher::Render.render(MIGRATION_NAME, config)
+        stream << ::Squasher::Render.render(MIGRATION_NAME, config, database)
+      end
+
+      if database.nil?
+        Squasher.rake("db:migrate", :db_cleaning)
+      else
+        Squasher.rake("db:migrate:#{database}", :db_cleaning)
       end
-      Squasher.rake("db:migrate", :db_cleaning)
     end
 
     private
@@ -27,10 +42,10 @@ module Squasher
       Squasher.config
     end
 
-    def prev_migration
+    def prev_migration(database = nil)
       return @prev_migration if defined?(@prev_migration)
 
-      @prev_migration = config.migration_files.detect do |file|
+      @prev_migration = config.migration_files(database).detect do |file|
         File.basename(file).include?(MIGRATION_NAME)
       end
     end

data/lib/squasher/config.rb

@@ -34,12 +34,12 @@ module Squasher
       end
     end
 
-    attr_reader :schema_file, :migration_version
+    attr_reader :migration_version, :multi_db_format, :databases
 
     def initialize
       @root_path = Dir.pwd.freeze
-      @migrations_folder = File.join(@root_path, 'db', 'migrate')
       @flags = []
+      @multi_db_format = nil
       @databases = []
       set_app_path(@root_path)
     end
@@ -59,9 +59,9 @@ module Squasher
       elsif key == :migration
         Squasher.error(:invalid_migration_version, value: value) unless value.to_s =~ /\A\d.\d\z/
         @migration_version = "[#{value}]"
-      elsif key == :sql
-        @schema_file = File.join(@app_path, 'db', 'structure.sql')
-        @flags << key
+      elsif key == :multi_db_format
+        Squasher.error(:invalid_multi_db_format, value: value) unless %w[rails multiverse].include?(value)
+        @multi_db_format = value
       elsif key == :databases
         @databases = value
       else
@@ -73,16 +73,46 @@ module Squasher
       @flags.include?(k)
     end
 
-    def migration_files
-      Dir.glob(File.join(migrations_folder, '**.rb'))
+    def schema_files
+      return [schema_file] unless @multi_db_format == 'rails'
+
+      @databases.map { |db| schema_file(db) }
+    end
+
+    def schema_file(database = nil)
+      prefix = database.nil? || database == 'primary' ? '' : "#{ database }_"
+      file = set?(:sql) ? 'structure.sql' : 'schema.rb'
+
+      File.join(@app_path, 'db', "#{ prefix }#{ file }")
+    end
+
+    def migration_files(database = nil)
+      Dir.glob(File.join(migrations_folder(database), '**.rb'))
     end
 
-    def migration_file(timestamp, migration_name)
-      File.join(migrations_folder, "#{ timestamp }_#{ migration_name }.rb")
+    def migration_file(timestamp, migration_name, database = nil)
+      File.join(migrations_folder(database), "#{ timestamp }_#{ migration_name }.rb")
+    end
+
+    def migrations_folder(database = nil)
+      return default_migration_folder if database.nil?
+
+      migrations_paths = dbconfig['development'][database]['migrations_paths']
+      return default_migration_folder unless migrations_paths
+
+      File.join(@app_path, migrations_paths)
+    end
+
+    def migrations_folders?
+      if @multi_db_format != 'rails'
+        Dir.exist?(migrations_folder)
+      else
+        @databases.all? { |db| Dir.exist?(migrations_folder(db)) }
+      end
     end
 
-    def migrations_folder?
-      Dir.exist?(migrations_folder)
+    def default_migration_folder
+      File.join(@root_path, 'db', 'migrate')
     end
 
     def dbconfig?
@@ -92,7 +122,7 @@ module Squasher
     def stub_dbconfig
       return unless dbconfig?
 
-      list = [dbconfig_file, schema_file]
+      list = [dbconfig_file, *schema_files]
       list.each do |file|
         next unless File.exist?(file)
         FileUtils.mv file, "#{ file }.sq"
@@ -115,7 +145,7 @@ module Squasher
 
     private
 
-    attr_reader :migrations_folder, :dbconfig_file
+    attr_reader :dbconfig_file
 
     def dbconfig
       return @dbconfig if defined?(@dbconfig)
@@ -126,8 +156,27 @@ module Squasher
       begin
         content, soft_error = Render.process(dbconfig_file)
         if content.has_key?('development')
-          @dbconfig = { 'development' => content['development'].merge('database' => 'squasher') }
-          @databases&.each { |database| @dbconfig[database] = content[database] }
+          if @multi_db_format == 'rails'
+            @dbconfig = { 'development' => {} }
+            @databases.each do |database|
+              @dbconfig['development'][database] = content['development'][database].merge('database' => "#{database}_squasher")
+              
+              database_name = content['development'][database]['database']
+              content['development'].select { |_, v| v['database'] == database_name && v['replica'] }.each do |k, v|
+                @dbconfig['development'][k] = v.merge('database' => "#{database}_squasher")
+              end
+            end
+          else
+            @dbconfig = { 'development' => content['development'].merge('database' => 'squasher') }
+
+            multiverse_by_default = @multi_db_format.nil? && @databases.any?
+            if multiverse_by_default
+              puts "Using multiverse format by default is deprecated and will be removed in the next major release. Please specify --multi-db_format=rails or --multi-db_format=multiverse explicitly."
+            end
+            if multiverse_by_default || @multi_db_format == 'multiverse'
+              @databases&.each { |database| @dbconfig[database] = content[database] }
+            end
+          end
         end
       rescue
       end
@@ -140,7 +189,6 @@ module Squasher
 
     def set_app_path(path)
       @app_path = path
-      @schema_file = File.join(path, 'db', 'schema.rb')
       @dbconfig_file = File.join(path, 'config', 'database.yml')
     end
   end

data/lib/squasher/render.rb

@@ -8,17 +8,22 @@ module Squasher
 
     attr_reader :name, :config
 
-    def initialize(name, config)
+    def initialize(name, config, database = nil)
       @name = name
       @config = config
+      @database = database
     end
 
     def render
-      ERB.new(template("#{ name }.rb"), nil, '-').result(binding)
+      if RUBY_VERSION < '2.6'
+        ERB.new(template("#{ name }.rb"), nil, '-').result(binding)
+      else
+        ERB.new(template("#{ name }.rb"), trim_mode: '-').result(binding)
+      end
     end
 
     def each_schema_line(&block)
-      File.open(config.schema_file, 'r') do |stream|
+      File.open(config.schema_file(@database), 'r') do |stream|
         if @config.set?(:sql)
           stream_structure(stream, &block)
         else

data/lib/squasher/version.rb

@@ -1,3 +1,3 @@
 module Squasher
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/squasher/worker.rb

@@ -20,9 +20,13 @@ module Squasher
           Squasher.tell(:dry_mode_finished)
           Squasher.print(Render.render(:init_schema, config))
         else
-          path = config.migration_file(finish_timestamp, :init_schema)
-          File.open(path, 'wb') { |io| io << Render.render(:init_schema, config) }
-          migrations.each { |file| FileUtils.rm(file) }
+          if config.multi_db_format == 'rails'
+            config.databases.each do |database|
+              clean_migrations(database)
+            end
+          else
+            clean_migrations
+          end
         end
 
         Squasher.rake("db:drop") unless Squasher.ask(:keep_database)
@@ -38,30 +42,48 @@ module Squasher
     end
 
     def check!
-      Squasher.error(:migration_folder_missing) unless config.migrations_folder?
+      Squasher.error(:migration_folder_missing) unless config.migrations_folders?
       Squasher.error(:dbconfig_invalid) unless config.dbconfig?
-      if migrations.empty?
+
+      if config.multi_db_format == 'rails'
+        config.databases.each do |database|
+          check_migrations_exist(database)
+        end
+      else
+        check_migrations_exist
+      end
+    end
+
+    def check_migrations_exist(database = nil)
+      if migrations(database).empty?
         print_date = date.strftime("%Y/%m/%d")
-        Squasher.error(:no_migrations, :date => print_date)
+
+        Squasher.error(:no_migrations, :date => date.strftime("%Y/%m/%d"))
       end
     end
 
-    def migrations
-      @migrations ||= config.migration_files.select { |file| before_date?(get_timestamp(file)) }.sort
+    def migrations(database = nil)
+      config.migration_files(database).select { |file| before_date?(get_timestamp(file)) }.sort
     end
 
     def get_timestamp(file)
       File.basename(file)[/\A\d+/]
     end
 
+    def clean_migrations(database = nil)
+      path = config.migration_file(finish_timestamp(database), :init_schema, database)
+      migrations(database).each { |file| FileUtils.rm(file) } # Remove all migrations before creating the new one
+      File.open(path, 'wb') { |io| io << Render.render(:init_schema, config, database) }
+    end
+
     def before_date?(timestamp)
       @point ||= date.strftime("%Y%m%d").to_i
       return unless timestamp
       timestamp[0...8].to_i < @point
     end
 
-    def finish_timestamp
-      @finish_timestamp ||= get_timestamp(migrations.last)
+    def finish_timestamp(database = nil)
+      get_timestamp(migrations(database).last)
     end
 
     def under_squash_env
@@ -72,7 +94,13 @@ module Squasher
           return unless Squasher.rake("db:drop db:create", :db_create)
         end
 
-        return unless Squasher.rake("db:migrate VERSION=#{ finish_timestamp }", :db_migrate)
+        if config.multi_db_format == 'rails'
+          config.databases.each do |database|
+            return unless Squasher.rake("db:migrate:#{ database } VERSION=#{ finish_timestamp(database) }", :db_migrate)
+          end
+        else
+          return unless Squasher.rake("db:migrate VERSION=#{ finish_timestamp }", :db_migrate)
+        end
 
         yield
 

data/spec/lib/worker_spec.rb

@@ -6,7 +6,7 @@ describe Squasher::Worker do
     let(:worker) { described_class.new(Time.new(2012, 6, 20)) }
 
     specify 'command was run not in application root' do
-      allow_any_instance_of(Squasher::Config).to receive(:migrations_folder?).and_return(false)
+      allow_any_instance_of(Squasher::Config).to receive(:migrations_folders?).and_return(false)
 
       expect_exit_with(:migration_folder_missing)
     end
@@ -31,7 +31,7 @@ describe Squasher::Worker do
     worker = described_class.new(Time.new(2014))
     allow(worker).to receive(:under_squash_env).and_yield.and_return(true)
     new_migration_path = File.join(Dir.tmpdir, 'init_schema.rb')
-    allow_any_instance_of(Squasher::Config).to receive(:migration_file).with('20131213090719', :init_schema).and_return(new_migration_path)
+    allow_any_instance_of(Squasher::Config).to receive(:migration_file).with('20131213090719', :init_schema, nil).and_return(new_migration_path)
 
     expect(FileUtils).to receive(:rm).with(File.join(fake_root, 'db', 'migrate', '20131205160936_first_migration.rb'))
     expect(FileUtils).to receive(:rm).with(File.join(fake_root, 'db', 'migrate', '20131213090719_second_migration.rb'))
@@ -60,7 +60,7 @@ describe Squasher::Worker do
       worker = described_class.new(Time.new(2014))
       allow(worker).to receive(:under_squash_env).and_yield.and_return(true)
       new_migration_path = File.join(Dir.tmpdir, 'init_schema.rb')
-      allow_any_instance_of(Squasher::Config).to receive(:migration_file).with('20131213090719', :init_schema).and_return(new_migration_path)
+      allow_any_instance_of(Squasher::Config).to receive(:migration_file).with('20131213090719', :init_schema, nil).and_return(new_migration_path)
       expect(FileUtils).to receive(:rm).with(File.join(fake_root, 'db', 'migrate', '20131205160936_first_migration.rb'))
       expect(FileUtils).to receive(:rm).with(File.join(fake_root, 'db', 'migrate', '20131213090719_second_migration.rb'))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Sergey Pchelintsev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,8 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Squash your old migrations

data/.travis.yml

@@ -1,13 +0,0 @@
-before_install:
-  - gem update bundler
-cache: bundler
-language: ruby
-rvm:
-  - ruby-head
-  - 3.1
-  - 3.0
-  - 2.7
-  - 2.6
-  - 2.5
-notifications:
-  email: false