ridgepole 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212f7ac739d81f903fa7df88232f8e17e28b953628d03f9cd9a7c59baa037162
-  data.tar.gz: d61273f751c642076ee08849439b0505f97de16c86426a8f5c8e950a1a661f17
+  metadata.gz: 5d65bef68e3d3fa568e43156be30e15f30535fb86e011b67170421d0e70c5724
+  data.tar.gz: a3ad7daa1a22b20f2c129f596b0fdc6d97e7ad37eb636e70538467101921d4d4
 SHA512:
-  metadata.gz: e4c098c3eb46ba9d00147ec8dc4f2d494ae5a306e30dbce9cb38bc519d5726b1fe514846e7253b3870ed7b7ad4cb23a0e3e338f3755ad98dc6918f1faf25d88b
-  data.tar.gz: 7b18857bdc397b49a31e136032ac38160c369da235af669a442d93d5685ba5aade0fc549a711da3e0654503b669d6d1c70be1789152bbabf4e67ecf9b16974da
+  metadata.gz: cecb8da2a635ed1ef07957b3cff60d5589a949ec0744b7322335f09e1dc52ed40e1deaca86866608644421e628b4dba0c724370018f79616d4c4878f649ed07e
+  data.tar.gz: 259fbf99721f371c98cb485eea834f862a69d67d405bfb7c637c3a6247bce3ddb8c672f9204785e5fec102f53168f0a73c1cf72f4da315bdcfe170903a75ffb4

data/Appraisals

@@ -11,3 +11,7 @@ end
 appraise 'activerecord-7.1' do
   gem 'activerecord', '~> 7.1.0'
 end
+
+appraise 'activerecord-7.2' do
+  gem 'activerecord', '~> 7.2.0'
+end

data/CHANGELOG.md

@@ -2,13 +2,17 @@
 
 ## 2.0
 
-### 2.0.2 (2024/02/25)
+### 2.1.0 (2024/08/11)
 
-- Fix bug that cannot include single quote in table comment [pull#467](https://github.com/ridgepole/ridgepole/pull/467)
+- Support Rails 7.2 [pull#490](https://github.com/ridgepole/ridgepole/pull/490)
 
-### 2.0.1 (2023/11/22)
+### 2.0.3 (2024/04/21)
 
-- Fix renamed_from bug [pull#453](https://github.com/ridgepole/ridgepole/pull/453)
+- 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)
 
 ### 2.0.1 (2023/11/22)
 
@@ -41,7 +45,7 @@
 
 - Updated supported column types [pull#399](https://github.com/ridgepole/ridgepole/pull/399) [pull#400](https://github.com/ridgepole/ridgepole/pull/400)
 - Support check constraint [pull#393](https://github.com/ridgepole/ridgepole/pull/393) [pull#397](https://github.com/ridgepole/ridgepole/pull/397)
-- Drop suport Rails 5.x [pull#395](https://github.com/ridgepole/ridgepole/pull/395)
+- Drop support Rails 5.x [pull#395](https://github.com/ridgepole/ridgepole/pull/395)
 
 ## 1.1
 

data/README.md

@@ -40,7 +40,7 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -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/gemfiles/activerecord_7.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.2.0"
+
+gemspec path: "../"

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/dumper.rb

@@ -92,7 +92,11 @@ module Ridgepole
       stream = StringIO.new
       conn.without_table_options(@options[:dump_without_table_options]) do
         ActiveRecord::SchemaDumper.with_default_fk_name(@options[:dump_with_default_fk_name]) do
-          ActiveRecord::SchemaDumper.dump(conn, stream)
+          if ActiveRecord.gem_version < Gem::Version.new('7.2.0')
+            ActiveRecord::SchemaDumper.dump(conn, stream)
+          else
+            ActiveRecord::SchemaDumper.dump(conn.pool, stream)
+          end
         end
       end
       stream

data/lib/ridgepole/version.rb

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

data/ridgepole.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.7')
 
-  spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 8.0'
   spec.add_dependency 'diffy'
 
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
@@ -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.65.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.1.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-25 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: 1.65.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: 1.65.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +319,7 @@ files:
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_7.0.gemfile
 - gemfiles/activerecord_7.1.gemfile
+- gemfiles/activerecord_7.2.gemfile
 - lib/ridgepole.rb
 - lib/ridgepole/cli/config.rb
 - lib/ridgepole/client.rb