ridgepole 0.8.7 → 0.8.12

data/spec/mysql/migrate/migrate_script_error_spec.rb

@@ -80,7 +80,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby actual_dsl
 
       errmsg = Regexp.new(Regexp.escape(<<-MSG.strip))
-        33: add_index("employee_clubs", ["emp_no", "Xclub_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+        33: add_index("employee_clubs", ["emp_no", "Xclub_id"], **{:name=>"idx_emp_no_club_id", :using=>:btree})
       MSG
 
       expect do

data/spec/mysql/text_blob_types/text_blob_types_spec.rb

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
     subject { client }
 
     it do
-      delta = subject.diff(<<-RUBY)
+      table_def = <<-RUBY
         create_table :foos, id: :unsigned_integer do |t|
           t.blob             :blob
           t.tinyblob         :tiny_blob
@@ -20,6 +20,7 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.unsigned_integer :unsigned_integer
         end
       RUBY
+      delta = subject.diff(table_def)
 
       expect(delta.differ?).to be_truthy
       delta.migrate
@@ -39,6 +40,8 @@ describe 'Ridgepole::Client (with new text/blob types)' do
           t.integer "unsigned_integer", unsigned: true
         end
       ERB
+
+      expect(subject.diff(table_def).differ?).to be_falsey
     end
   end
 

data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
+        add_foreign_key("child", "parent", **{:name=>"fk_rails_e74ce85cbc"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
+        remove_foreign_key("child", name: "fk_rails_e74ce85cbc")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb

@@ -25,13 +25,13 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0'
       expect(delta.differ?).to be_truthy
 
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-        create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
-          t.column("emp_no", :"integer", {:null=>false, :limit=>4})
-          t.column("dept_no", :"integer", {:null=>false, :auto_increment=>true, :limit=>4})
-          t.column("from_date", :"date", {:null=>false})
-          t.column("to_date", :"date", {:null=>false})
-          t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
-          t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+        create_table("dept_emp", **{:primary_key=>["emp_no", "dept_no"]}) do |t|
+          t.column("emp_no", :"integer", **{:null=>false, :limit=>4})
+          t.column("dept_no", :"integer", **{:null=>false, :auto_increment=>true, :limit=>4})
+          t.column("from_date", :"date", **{:null=>false})
+          t.column("to_date", :"date", **{:null=>false})
+          t.index(["dept_no"], **<%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
+          t.index(["emp_no"], **<%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
       ERB
 

data/spec/postgresql/diff/diff_spec.rb

@@ -148,9 +148,9 @@ describe 'Ridgepole::Client.diff' do
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_column("employee_clubs", "club_id", :integer, {:null=>true, :default=>nil})
+        change_column("employee_clubs", "club_id", :integer, **{:null=>true, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
+        change_column("employees", "last_name", :string, **{:limit=>20, :default=>"XXX"})
       RUBY
     }
   end

data/spec/postgresql/fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
+        add_foreign_key("child", "parent", **{:name=>"child_ibfk_1"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
@@ -147,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {})
+        add_foreign_key("child", "parent", **{})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"child_ibfk_1"})
+        remove_foreign_key("child", name: "child_ibfk_1")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/migrate/migrate_add_column_spec.rb

@@ -141,13 +141,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.column("any_col", :string, {:limit=>255, :null=>false})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.column("any_col", :string, **{:limit=>255, :null=>false})
         end
 
-        change_table("employees", {:bulk => true}) do |t|
-          t.column("age", :integer, {:null=>false})
-          t.column("updated_at", :date, {})
+        change_table("employees", bulk: true) do |t|
+          t.column("age", :integer, **{:null=>false})
+          t.column("updated_at", :date, **{})
         end
       RUBY
       delta.migrate

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -138,12 +138,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.change("club_id", :integer, {:null=>true, :default=>nil})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.change("club_id", :integer, **{:null=>true, :default=>nil})
         end
 
-        change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, {:limit=>20, :default=>"XXX"})
+        change_table("employees", bulk: true) do |t|
+          t.change("last_name", :string, **{:limit=>20, :default=>"XXX"})
         end
       RUBY
       delta.migrate

data/spec/postgresql/migrate/migrate_change_index_spec.rb

@@ -140,19 +140,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_dept_emp_emp_no"})
-          t.index(["from_date"], {:name=>"idx_dept_emp_emp_no", :using=>:btree, :unique=>false})
+        change_table("dept_emp", bulk: true) do |t|
+          t.remove_index(name: "idx_dept_emp_emp_no")
+          t.index(["from_date"], **{:name=>"idx_dept_emp_emp_no", :using=>:btree, :unique=>false})
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_dept_manager_emp_no"})
-          t.index(["from_date"], {:name=>"idx_dept_manager_emp_no", :using=>:btree, :unique=>false})
+        change_table("dept_manager", bulk: true) do |t|
+          t.remove_index(name: "idx_dept_manager_emp_no")
+          t.index(["from_date"], **{:name=>"idx_dept_manager_emp_no", :using=>:btree, :unique=>false})
         end
 
-        change_table("salaries", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_salaries_emp_no"})
-          t.index(["from_date"], {:name=>"idx_salaries_emp_no", :using=>:btree, :unique=>false})
+        change_table("salaries", bulk: true) do |t|
+          t.remove_index(name: "idx_salaries_emp_no")
+          t.index(["from_date"], **{:name=>"idx_salaries_emp_no", :using=>:btree, :unique=>false})
         end
       RUBY
 

data/spec/postgresql/migrate/migrate_drop_column_spec.rb

@@ -134,17 +134,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
+        change_table("dept_emp", bulk: true) do |t|
           t.remove("from_date")
           t.remove("to_date")
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
+        change_table("dept_manager", bulk: true) do |t|
           t.remove("from_date")
           t.remove("to_date")
         end
 
-        change_table("employees", {:bulk => true}) do |t|
+        change_table("employees", bulk: true) do |t|
           t.remove("last_name")
           t.remove("hire_date")
         end

data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb

@@ -137,24 +137,24 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-change_table("dept_emp", {:bulk => true}) do |t|
+change_table("dept_emp", bulk: true) do |t|
   t.remove("emp_no")
   t.remove("from_date")
   t.remove("to_date")
 end
 
-change_table("dept_manager", {:bulk => true}) do |t|
+change_table("dept_manager", bulk: true) do |t|
   t.remove("emp_no")
   t.remove("from_date")
   t.remove("to_date")
 end
 
-change_table("employee_clubs", {:bulk => true}) do |t|
+change_table("employee_clubs", bulk: true) do |t|
   t.remove("club_id")
-  t.index(["emp_no"], <%= {:name=>"idx_employee_clubs_emp_no"} + cond(5.0, using: :btree) %>)
+  t.index(["emp_no"], **<%= {:name=>"idx_employee_clubs_emp_no"} + cond(5.0, using: :btree) %>)
 end
 
-change_table("employees", {:bulk => true}) do |t|
+change_table("employees", bulk: true) do |t|
   t.remove("last_name")
   t.remove("hire_date")
 end

data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     specify do
       delta = subject.diff(expected_dsl)
       expect(delta).to be_differ
-      expect(delta.script).to match_fuzzy('remove_index("users", {:name=>"index_users_on_lower_name"})')
+      expect(delta.script).to match_fuzzy('remove_index("users", name: "index_users_on_lower_name")')
       expect(subject.dump).to match_fuzzy(actual_dsl)
       delta.migrate
       expect(subject.dump).to match_fuzzy(expected_dsl)

data/spec/postgresql/migrate/migrate_drop_index_spec.rb

@@ -139,16 +139,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("clubs", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_name"})
+        change_table("clubs", bulk: true) do |t|
+          t.remove_index(name: "idx_name")
         end
 
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_employee_clubs_emp_no_club_id"})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.remove_index(name: "idx_employee_clubs_emp_no_club_id")
         end
 
-        change_table("titles", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_titles_emp_no"})
+        change_table("titles", bulk: true) do |t|
+          t.remove_index(name: "idx_titles_emp_no")
         end
       RUBY
       delta.migrate

data/spec/postgresql/migrate/migrate_rename_column_spec.rb

@@ -140,11 +140,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
+        change_table("dept_emp", bulk: true) do |t|
           t.rename("from_date", "from_date2")
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
+        change_table("dept_manager", bulk: true) do |t|
           t.rename("to_date", "to_date2")
         end
       RUBY

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
+        add_foreign_key("child", "parent", **{:name=>"fk_rails_e74ce85cbc"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
+        remove_foreign_key("child", name: "fk_rails_e74ce85cbc")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/spec_condition.rb

@@ -12,10 +12,6 @@ module SpecCondition
       ENV['MYSQL57'] == '1'
     end
 
-    def mysql_awesome_enabled?
-      ENV['ENABLE_MYSQL_AWESOME'] == '1'
-    end
-
     def activerecord_5?
       (ActiveRecord::VERSION::MAJOR >= 5) && (ActiveRecord::VERSION::MAJOR < 6)
     end
@@ -23,6 +19,10 @@ module SpecCondition
     def debug?
       ENV['DEBUG'] == '1'
     end
+
+    def verbose?
+      ENV['VERBOSE'] == '1'
+    end
   end
 
   def check_version_or_cond(version_or_cond)

data/spec/spec_helper.rb

@@ -25,10 +25,11 @@ require 'erb_helper'
 
 RSpec.configure do |config|
   config.before(:all) do
-    if condition(:debug)
+    if condition(:debug) || condition(:verbose)
       ActiveRecord::Migration.verbose = true
       logger = Ridgepole::Logger.instance
       logger.level = ::Logger::DEBUG
+      logger.verbose = condition(:verbose)
       ActiveRecord::Base.logger = logger
     else
       ActiveRecord::Migration.verbose = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.12
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -235,10 +235,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -429,7 +429,7 @@ homepage: https://github.com/winebarrel/ridgepole
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -444,8 +444,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:

data/.travis.yml

@@ -1,44 +0,0 @@
-dist: trusty
-sudo: required
-group: edge
-language: ruby
-cache:
-  - bundler
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-before_script:
-  - sudo service mysql stop
-  - sudo service postgresql stop
-  - for i in {1..60}; do docker-compose up -d && break; sleep 1; done
-  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -P 13316 -ppassword ping; }
-  - function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 13317  -ppassword ping; }
-  - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 -p 15442; }
-  - for i in {1..60}; do mysql_ping && break; sleep 1; done
-  - for i in {1..60}; do mysql57_ping && break; sleep 1; done
-  - for i in {1..60}; do pg_ping && break; sleep 1; done
-script:
-  - bundle exec rake
-gemfile:
-  - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_6.0.gemfile
-env:
-  matrix:
-    - MYSQL56=1
-    - MYSQL57=1
-    - POSTGRESQL=1
-services:
-  - docker
-addons:
-  apt:
-    packages:
-      - mysql-client-core-5.6
-      - mysql-client-5.6
-      - postgresql-client-9.4
-matrix:
-  exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/activerecord_6.0.gemfile