ridgepole 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212f7ac739d81f903fa7df88232f8e17e28b953628d03f9cd9a7c59baa037162
-  data.tar.gz: d61273f751c642076ee08849439b0505f97de16c86426a8f5c8e950a1a661f17
+  metadata.gz: 2e28849a4ffd0e89057ec0aca0d8144a7c627f6947efe49a0c0ebcb3a5bf8d91
+  data.tar.gz: cff35f1be11654d25a0aa954d2d1af85ee8b7c5aa649ce2425227637ca340b10
 SHA512:
-  metadata.gz: e4c098c3eb46ba9d00147ec8dc4f2d494ae5a306e30dbce9cb38bc519d5726b1fe514846e7253b3870ed7b7ad4cb23a0e3e338f3755ad98dc6918f1faf25d88b
-  data.tar.gz: 7b18857bdc397b49a31e136032ac38160c369da235af669a442d93d5685ba5aade0fc549a711da3e0654503b669d6d1c70be1789152bbabf4e67ecf9b16974da
+  metadata.gz: 893204d453f9d96468e6a43e5843d5c1f8b2407f3b14bc4572836022ca240b4eaf3f8a39163ee2dcd753168640bce8b721fde35da5a713ce7941056c2e71a747
+  data.tar.gz: 33366d9df07035e062ad42a534292200076358c60242c17f14c05d6ba63c98443e35cf15ab21af097feb303e8257efc10f253c89c379daf0264a17a3b56d8bb8

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 2.0
 
+### 2.0.2 (2024/04/21)
+
+- Add `--drop-table-only` option [pull#477](https://github.com/ridgepole/ridgepole/pull/477)
+
 ### 2.0.2 (2024/02/25)
 
 - Fix bug that cannot include single quote in table comment [pull#467](https://github.com/ridgepole/ridgepole/pull/467)

data/README.md

@@ -82,13 +82,14 @@ Usage: ridgepole [options]
         --dump-with-default-fk-name
         --index-removed-drop-column
         --drop-table
+        --drop-table-only
         --mysql-change-table-options
         --mysql-change-table-comment
         --check-relation-type DEF_PK
         --ignore-table-comment
         --skip-column-comment-change
-        --create-table-with-index
         --allow-pk-change
+        --create-table-with-index
         --mysql-dump-auto-increment
     -r, --require LIBS
         --log-file LOG_FILE
@@ -338,7 +339,8 @@ bundle exec appraisal activerecord-7.0 rake
 # MYSQL80=1 bundle exec appraisal activerecord-7.0 rake
 ```
 
-**Notice:** Ruby 2.6 or above/mysql-client/postgresql-client is required.
+> [!note]
+> mysql-client/postgresql-client is required for testing.
 
 ## Demo
 

data/bin/ridgepole

@@ -86,8 +86,7 @@ ARGV.options do |opt|
   opt.on('',   '--dry-run') { options[:dry_run] = true }
   opt.on('',   '--table-options OPTIONS') { |v| options[:table_options] = v }
   opt.on('',   '--table-hash-options OPTIONS') do |v|
-    # NOTE: Ruby2.4 doesn't support `symbolize_names: true`
-    hash = YAML.safe_load(v).deep_symbolize_keys
+    hash = YAML.safe_load(v, symbolize_names: true)
 
     case hash[:id]
     when String
@@ -137,6 +136,7 @@ ARGV.options do |opt|
   opt.on('',   '--dump-with-default-fk-name') { options[:dump_with_default_fk_name] = true }
   opt.on('',   '--index-removed-drop-column') { options[:index_removed_drop_column] = true }
   opt.on('',   '--drop-table') { options[:force_drop_table] = true }
+  opt.on('',   '--drop-table-only') { options[:drop_table_only] = true }
   opt.on('',   '--mysql-change-table-options') { options[:mysql_change_table_options] = true }
   opt.on('',   '--mysql-change-table-comment') { options[:mysql_change_table_comment] = true }
   opt.on('',   '--check-relation-type DEF_PK') { |v| options[:check_relation_type] = v }
@@ -265,15 +265,13 @@ begin
         else
           File.open(diff_file)
         end
-      elsif Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
+      else
         YAML.safe_load(
           diff_file,
           permitted_classes: [],
           permitted_symbols: [],
           aliases: true
         )
-      else
-        YAML.safe_load(diff_file, [], [], true)
       end
     end
 

data/lib/ridgepole/cli/config.rb

@@ -13,15 +13,13 @@ module Ridgepole
                           parse_config_file(config)
                         elsif (expanded = File.expand_path(config)) && File.exist?(expanded)
                           parse_config_file(expanded)
-                        elsif Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
+                        else
                           YAML.safe_load(
                             ERB.new(config).result,
                             permitted_classes: [],
                             permitted_symbols: [],
                             aliases: true
                           )
-                        else
-                          YAML.safe_load(ERB.new(config).result, [], [], true)
                         end
 
         parsed_config = parse_database_url(config) unless parsed_config.is_a?(Hash)
@@ -39,17 +37,12 @@ module Ridgepole
 
       def parse_config_file(path)
         yaml = ERB.new(File.read(path)).result
-
-        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
-          YAML.safe_load(
-            yaml,
-            permitted_classes: [],
-            permitted_symbols: [],
-            aliases: true
-          )
-        else
-          YAML.safe_load(yaml, [], [], true)
-        end
+        YAML.safe_load(
+          yaml,
+          permitted_classes: [],
+          permitted_symbols: [],
+          aliases: true
+        )
       end
 
       def parse_database_url(config)

data/lib/ridgepole/diff.rb

@@ -28,12 +28,14 @@ module Ridgepole
         if (from_attrs = from.delete(table_name))
           @logger.verbose_info("#   #{table_name}")
 
-          unless (attrs_delta = diff_inspect(from_attrs, to_attrs)).empty?
-            @logger.verbose_info(attrs_delta)
-          end
+          unless @options[:drop_table_only]
+            unless (attrs_delta = diff_inspect(from_attrs, to_attrs)).empty?
+              @logger.verbose_info(attrs_delta)
+            end
 
-          scan_change(table_name, from_attrs, to_attrs, delta)
-        else
+            scan_change(table_name, from_attrs, to_attrs, delta)
+          end
+        elsif !@options[:drop_table_only]
           delta[:add] ||= {}
           delta[:add][table_name] = to_attrs
         end
@@ -41,7 +43,7 @@ module Ridgepole
 
       scan_relation_info(relation_info)
 
-      if !@options[:merge] && @options[:force_drop_table]
+      if !@options[:merge] && (@options[:force_drop_table] || @options[:drop_table_only])
         from.each do |table_name, from_attrs|
           next unless target?(table_name)
 

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/ridgepole.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.2.0'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '1.60.2'
+  spec.add_development_dependency 'rubocop', '1.63.1'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-25 00:00:00.000000000 Z
+date: 2024-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: 1.63.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: 1.63.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement