ridgepole 0.9.4 → 1.0.1

data/bin/ridgepole

@@ -74,106 +74,104 @@ def noop_migrate(delta, options)
 end
 
 ARGV.options do |opt|
-  begin
-    opt.on('-c', '--config CONF_OR_FILE') { |v| config = v }
-    opt.on('-E', '--env ENVIRONMENT') { |v| env = v }
-    opt.on('-s', '--spec-name SPEC_NAME') { |v| spec_name = v }
-    opt.on('-a', '--apply') { set_mode[:apply] }
-    opt.on('-m', '--merge') do
-      set_mode[:apply]
-      options[:merge] = true
+  opt.on('-c', '--config CONF_OR_FILE') { |v| config = v }
+  opt.on('-E', '--env ENVIRONMENT') { |v| env = v }
+  opt.on('-s', '--spec-name SPEC_NAME') { |v| spec_name = v }
+  opt.on('-a', '--apply') { set_mode[:apply] }
+  opt.on('-m', '--merge') do
+    set_mode[:apply]
+    options[:merge] = true
+  end
+  opt.on('-f', '--file SCHEMAFILE') { |v| file = v }
+  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
+
+    case hash[:id]
+    when String
+      hash[:id] = hash[:id].to_sym
+    when Hash
+      hash[:id][:type] = hash[:id][:type].to_sym if hash[:id][:type]
     end
-    opt.on('-f', '--file SCHEMAFILE') { |v| file = v }
-    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
-
-      case hash[:id]
-      when String
-        hash[:id] = hash[:id].to_sym
-      when Hash
-        hash[:id][:type] = hash[:id][:type].to_sym if hash[:id][:type]
-      end
 
-      options[:table_hash_options] = hash
-    end
-    opt.on('',   '--alter-extra ALTER_SPEC') { |v| options[:alter_extra] = v }
-    opt.on('',   '--external-script SCRIPT') { |v| options[:external_script] = v }
-    opt.on('',   '--bulk-change') do
-      raise OptionParser::InvalidOption, 'Cannot use `bulk-change` in `merge`' if options[:merge]
+    options[:table_hash_options] = hash
+  end
+  opt.on('',   '--alter-extra ALTER_SPEC') { |v| options[:alter_extra] = v }
+  opt.on('',   '--external-script SCRIPT') { |v| options[:external_script] = v }
+  opt.on('',   '--bulk-change') do
+    raise OptionParser::InvalidOption, 'Cannot use `bulk-change` in `merge`' if options[:merge]
 
-      options[:bulk_change] = true
-    end
+    options[:bulk_change] = true
+  end
 
-    COLUMN_TYPES.each do |column_type, column_type_alias|
-      opt.on('', "--default-#{column_type_alias}-limit LIMIT", Integer) do |v|
-        options[:"default_#{column_type}_limit"] = v
-      end
+  COLUMN_TYPES.each do |column_type, column_type_alias|
+    opt.on('', "--default-#{column_type_alias}-limit LIMIT", Integer) do |v|
+      options[:"default_#{column_type}_limit"] = v
     end
+  end
 
-    opt.on('',   '--pre-query QUERY') { |v| options[:pre_query] = v }
-    opt.on('',   '--post-query QUERY') { |v| options[:post_query] = v }
-    opt.on('-e', '--export') { set_mode[:export] }
-    opt.on('',   '--split') { split = true }
-    opt.on('',   '--split-with-dir') { split = :with_dir }
-    opt.on('-d', '--diff DSL1 DSL2') do |diff_arg1|
-      set_mode[:diff]
-      diff_arg2 = ARGV.first
-
-      if [diff_arg1, diff_arg2].any? { |i| i.nil? || i.start_with?('-') }
-        puts opt.help
-        exit 1
-      end
+  opt.on('',   '--pre-query QUERY') { |v| options[:pre_query] = v }
+  opt.on('',   '--post-query QUERY') { |v| options[:post_query] = v }
+  opt.on('-e', '--export') { set_mode[:export] }
+  opt.on('',   '--split') { split = true }
+  opt.on('',   '--split-with-dir') { split = :with_dir }
+  opt.on('-d', '--diff DSL1 DSL2') do |diff_arg1|
+    set_mode[:diff]
+    diff_arg2 = ARGV.first
 
-      ARGV.shift
-      diff_files = [diff_arg1, diff_arg2]
-    end
-    opt.on('',   '--with-apply') { diff_with_apply = true }
-    opt.on('-o', '--output SCHEMAFILE') { |v| output_file = v }
-    opt.on('-t', '--tables TABLES', Array) { |v| options[:tables] = v }
-    opt.on('',   '--ignore-tables REGEX_LIST', Array) { |v| options[:ignore_tables] = v.map { |i| Regexp.new(i) } }
-    opt.on('',   '--dump-without-table-options') { options[:dump_without_table_options] = true }
-    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('',   '--skip-drop-table') { options[:skip_drop_table] = 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 }
-    opt.on('',   '--ignore-table-comment') { options[:ignore_table_comment] = true }
-    opt.on('',   '--skip-column-comment-change') { options[:skip_column_comment_change] = true }
-    opt.on('',   '--allow-pk-change') { options[:allow_pk_change] = true }
-    opt.on('',   '--create-table-with-index') { options[:create_table_with_index] = true }
-
-    opt.on('',   '--mysql-dump-auto-increment') do
-      options[:mysql_dump_auto_increment] = true
+    if [diff_arg1, diff_arg2].any? { |i| i.nil? || i.start_with?('-') }
+      puts opt.help
+      exit 1
     end
 
-    opt.on('-r', '--require LIBS', Array) { |v| v.each { |i| require i } }
-    opt.on('', '--log-file LOG_FILE') { |v| options[:log_file] = v }
-    opt.on('', '--verbose') { Ridgepole::Logger.verbose = true }
-    opt.on('', '--debug') { options[:debug] = true }
-    opt.on('', '--[no-]color') { |v| options[:color] = v }
-
-    opt.on('-v', '--version') do
-      puts opt.ver
-      exit
-    end
+    ARGV.shift
+    diff_files = [diff_arg1, diff_arg2]
+  end
+  opt.on('',   '--with-apply') { diff_with_apply = true }
+  opt.on('-o', '--output SCHEMAFILE') { |v| output_file = v }
+  opt.on('-t', '--tables TABLES', Array) { |v| options[:tables] = v }
+  opt.on('',   '--ignore-tables REGEX_LIST', Array) { |v| options[:ignore_tables] = v.map { |i| Regexp.new(i) } }
+  opt.on('',   '--dump-without-table-options') { options[:dump_without_table_options] = true }
+  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('',   '--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 }
+  opt.on('',   '--ignore-table-comment') { options[:ignore_table_comment] = true }
+  opt.on('',   '--skip-column-comment-change') { options[:skip_column_comment_change] = true }
+  opt.on('',   '--allow-pk-change') { options[:allow_pk_change] = true }
+  opt.on('',   '--create-table-with-index') { options[:create_table_with_index] = true }
+
+  opt.on('',   '--mysql-dump-auto-increment') do
+    options[:mysql_dump_auto_increment] = true
+  end
 
-    opt.parse!
+  opt.on('-r', '--require LIBS', Array) { |v| v.each { |i| require i } }
+  opt.on('', '--log-file LOG_FILE') { |v| options[:log_file] = v }
+  opt.on('', '--verbose') { Ridgepole::Logger.verbose = true }
+  opt.on('', '--debug') { options[:debug] = true }
+  opt.on('', '--[no-]color') { |v| options[:color] = v }
 
-    if !mode || (%i[apply export].include?(mode) && !config) || (options[:with_apply] && !config)
-      puts opt.help
-      exit 1
-    end
-  rescue StandardError => e
-    warn("[ERROR] #{e.message}")
+  opt.on('-v', '--version') do
+    puts opt.ver
+    exit
+  end
 
-    puts "\t" + e.backtrace.join("\n\t") unless e.is_a?(OptionParser::ParseError)
+  opt.parse!
 
+  if !mode || (%i[apply export].include?(mode) && !config) || (options[:with_apply] && !config)
+    puts opt.help
     exit 1
   end
+rescue StandardError => e
+  warn("[ERROR] #{e.message}")
+
+  puts "\t" + e.backtrace.join("\n\t") unless e.is_a?(OptionParser::ParseError)
+
+  exit 1
 end
 
 begin

data/docker-compose.yml

@@ -1,18 +1,26 @@
-mysql:
-  image: "mysql:5.6.38"
-  ports:
-    - "13316:3306"
-  environment:
-    MYSQL_ROOT_PASSWORD: password
-mysql57:
-  image: "mysql:5.7.20"
-  ports:
-    - "13317:3306"
-  environment:
-    MYSQL_ROOT_PASSWORD: password
-postgres:
-  image: "postgres:9.5"
-  ports:
-    - "15442:5432"
-  environment:
-    POSTGRES_PASSWORD: password
+version: "3.8"
+services:
+  mysql:
+    image: "mysql:5.6"
+    ports:
+      - "13316:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+  mysql57:
+    image: "mysql:5.7"
+    ports:
+      - "13317:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+  mysql80:
+    image: "mysql:8.0"
+    ports:
+      - "13318:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+  postgres:
+    image: "postgres:14"
+    ports:
+      - "15442:5432"
+    environment:
+      POSTGRES_PASSWORD: password

data/gemfiles/activerecord_7.0.gemfile

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

data/lib/ridgepole/delta.rb

@@ -191,7 +191,7 @@ module Ridgepole
       errmsg = lines.with_index.map do |l, i|
         line_num = i + 1
         prefix = line_num == err_num ? '* ' : '  '
-        format("#{prefix}%<line_num>#{digit_number}d: #{l}", line_num: line_num)
+        format("#{prefix}%<line_num>#{digit_number}d: %<line>s", line_num: line_num, line: l)
       end
 
       if err_num > 0

data/lib/ridgepole/diff.rb

@@ -41,7 +41,7 @@ module Ridgepole
 
       scan_relation_info(relation_info)
 
-      unless @options[:merge] || @options[:skip_drop_table]
+      if !@options[:merge] && @options[:force_drop_table]
         from.each do |table_name, from_attrs|
           next unless target?(table_name)
 
@@ -419,6 +419,9 @@ module Ridgepole
             opts[:limit] = 4_294_967_295
           end
         end
+
+        # Workaround for Active Record 7.0
+        opts.delete(:precision) if attrs[:type] == :datetime && opts[:precision].nil?
       end
     end
 

data/lib/ridgepole/execute_expander.rb

@@ -13,7 +13,10 @@ module Ridgepole
     end
 
     module ConnectionAdapterExt
-      def execute(sql, name = nil)
+      def execute(*args)
+        sql = args.fetch(0)
+        name = args[1]
+
         if Ridgepole::ExecuteExpander.noop
           if (callback = Ridgepole::ExecuteExpander.callback)
             sql = append_alter_extra(sql)

data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb

@@ -36,6 +36,7 @@ module ActiveRecord
     class AbstractAdapter
       def self.inherited(subclass)
         subclass.prepend Ridgepole::Ext::AbstractAdapter::DisableTableOptions
+        super
       end
     end
   end

data/lib/ridgepole/external_sql_executer.rb

@@ -25,20 +25,18 @@ module Ridgepole
             readable = ready[0]
 
             readable.each do |f|
-              begin
-                data = f.read_nonblock(1024)
-                next if data.nil?
-
-                data.chomp!
-
-                if f == stderr
-                  @logger.warn("[WARNING] #{script_basename}: #{data}")
-                else
-                  @logger.info("#{script_basename}: #{data}")
-                end
-              rescue EOFError
-                files.delete f
+              data = f.read_nonblock(1024)
+              next if data.nil?
+
+              data.chomp!
+
+              if f == stderr
+                @logger.warn("[WARNING] #{script_basename}: #{data}")
+              else
+                @logger.info("#{script_basename}: #{data}")
               end
+            rescue EOFError
+              files.delete f
             end
           end
         rescue EOFError

data/lib/ridgepole/version.rb

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

data/ridgepole.gemspec

@@ -8,25 +8,28 @@ Gem::Specification.new do |spec|
   spec.name          = 'ridgepole'
   spec.version       = Ridgepole::VERSION
   spec.authors       = ['Genki Sugawara']
-  spec.email         = ['sugawara@cookpad.com']
+  spec.email         = ['sugawara@winebarrel.jp']
   spec.summary       = 'Ridgepole is a tool to manage DB schema.'
   spec.description   = 'Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.'
-  spec.homepage      = 'https://github.com/winebarrel/ridgepole'
+  spec.homepage      = 'https://github.com/ridgepole/ridgepole'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
 
-  spec.add_dependency 'activerecord', '>= 5.1', '< 6.2'
+  spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
   spec.add_dependency 'diffy'
 
   spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'erbh', '>= 0.1.2'
+  spec.add_development_dependency 'erbh', '>= 0.2.1'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
   spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
   spec.add_development_dependency 'mysql2'
@@ -35,9 +38,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '1.9.1'
+  spec.add_development_dependency 'rubocop', '1.24.1'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-lcov'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end