ridgepole 0.6.5.beta14 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184fc31f23a763530f7e09525823088ffe64862d
-  data.tar.gz: f518e59e9ddfd309825af2715ef5210a6b3741d4
+  metadata.gz: c0b8970049df58ea142eb1bc723846cb5099eb5b
+  data.tar.gz: 886ba18f1c6b97e60756241ec8d4d6bc7e2e5c94
 SHA512:
-  metadata.gz: b8e70c39e3c216266d9be688c91e2514f4fe634e86cac7072cc8774ef5d38567d95b57336e2068d782ec7ab8ec85280ddd6c9a485277197d227119045a8de6c0
-  data.tar.gz: a266ae1c90b63f139760b9ac34b3e5e741114d330afaeed42c1432b3b815b48f033537eb80f2bc455fe641c33aa9012b1a49898306eeca6071231e8bb774f351
+  metadata.gz: 9806a409967575629a43d02b7cf9bf1ee42345a89fd7d004ab41b9c853bbc340434e5c4aa8b92db6ed707a5f26c612d3cda8c1d63ecb937ff6f1b612b1a1e110
+  data.tar.gz: d2491149f7e4d0f73747832c65e7b69b77232f6f6995a5845b90146e98fc94d5d058013242c2598282b12ba3d5cb3ccf2ccaac3741fe8cafe442808a0d08e557

data/.travis.yml

@@ -5,12 +5,13 @@ cache:
   - bundler
   - apt
 rvm:
-  - 2.2.4
-  - 2.3.1
+  - 2.2.5
+  - 2.3.3
 before_install:
   - gem install bundler
-  - sudo service postgresql stop
 before_script:
+  - sudo service mysql stop
+  - sudo service postgresql stop
   - docker-compose up -d
   - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
   - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 > /dev/null 2> /dev/null; }

data/README.md

@@ -9,6 +9,18 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=master)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/winebarrel/ridgepole/badge.svg?branch=master)](https://coveralls.io/r/winebarrel/ridgepole?branch=master)
 
+**Important**
+
+Please don't use the following nameless fk:
+
+```ruby 
+add_foreign_key :articles, :authors # without `name:`
+```
+
+**It is highly recommended to give a name to the fk explicitly.**
+
+![](https://cdn.pbrd.co/images/8Ymz6nU5x.gif)
+
 **Notice**
 
 * `>= 0.4.8`
@@ -205,7 +217,7 @@ add_index "child", ["parent_id"], name: "par_ind", using: :btree
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 ```
 
-**Notice:** It is recommended to give a name to the index explicitly.
+**Notice:** **It is highly recommended to give a name to the fk explicitly.**
 
 Please pass `--dump-with-default-fk-name` option if you want to use the nameless index.
 

data/bin/ridgepole

@@ -112,7 +112,7 @@ ARGV.options do |opt|
     opt.on('',   '--enable-mysql-awesome')        {    options[:enable_mysql_awesome] = true                }
     opt.on('',   '--mysql-use-alter')             {    options[:mysql_use_alter] = true                     }
     opt.on('',   '--dump-without-table-options')  {    options[:dump_without_table_options] = true          }
-    opt.on('',   '--dump-with-default-fk-name')   {    options[:dumb_with_default_fk_name] = 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('-r', '--require LIBS', Array)         {|v| v.each {|i| require i }                              }
     opt.on(''  , '--log-file LOG_FILE')           {|v| options[:log_file] = v                               }

data/lib/ridgepole/client.rb

@@ -22,7 +22,7 @@ class Ridgepole::Client
       require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index'
     end
 
-    if @options[:dumb_with_default_fk_name]
+    if @options[:dump_with_default_fk_name]
       require 'ridgepole/ext/schema_dumper'
     end
 
@@ -43,7 +43,7 @@ class Ridgepole::Client
     logger.verbose_info('# Parse DSL')
     expected_definition, expected_execute = @parser.parse(dsl, opts)
     logger.verbose_info('# Load tables')
-    current_definition, current_execute = @parser.parse(@dumper.dump, opts)
+    current_definition, _current_execute = @parser.parse(@dumper.dump, opts)
     logger.verbose_info('# Compare definitions')
     @diff.diff(current_definition, expected_definition, :execute => expected_execute)
   end
@@ -53,9 +53,9 @@ class Ridgepole::Client
       logger = Ridgepole::Logger.instance
 
       logger.verbose_info('# Parse DSL1')
-      definition1, execute1 = load_definition(dsl_or_config1, options)
+      definition1, _execute1 = load_definition(dsl_or_config1, options)
       logger.verbose_info('# Parse DSL2')
-      definition2, execute2 = load_definition(dsl_or_config2, options)
+      definition2, _execute2 = load_definition(dsl_or_config2, options)
 
       logger.verbose_info('# Compare definitions')
       diff = Ridgepole::Diff.new(options)

data/lib/ridgepole/dsl_parser.rb

@@ -195,6 +195,11 @@ class Ridgepole::DSLParser
         column_name.each do |col|
           options[:length][col] = index_length
         end
+
+        # XXX: fix for https://github.com/rails/rails/commit/5025fd3a99c68f95bdd6fd43f382c62e9653236b
+        if ActiveRecord::VERSION::MAJOR >= 6 or (ActiveRecord::VERSION::MAJOR == 5 and (ActiveRecord::VERSION::MINOR >= 1 or ActiveRecord::VERSION::TINY >= 1))
+          options[:length] = options[:length].symbolize_keys
+        end
       end
 
       @__definition[table_name][:indices][idx] = {

data/lib/ridgepole/dumper.rb

@@ -30,17 +30,24 @@ class Ridgepole::Dumper
       ActiveRecord::SchemaDumper.ignore_tables.clear
     end
 
-    dsl = stream.string.lines.select {|line|
+    dsl = stream.string.lines.select do |line|
       line !~ /\A#/ &&
       line !~ /\AActiveRecord::Schema\.define/ &&
       line !~ /\Aend/
-    }.map {|line|
-      if @options[:dump_without_table_options] and line =~ /\A  create_table /
-        line.gsub(/, options: ("(?:[^"]|\")*")/, '')
-      else
-        line
+    end
+
+    # XXX: for activerecord-mysql-awesome
+    if ActiveRecord::VERSION::MAJOR < 5
+      dsl = dsl.map do |line|
+        if @options[:dump_without_table_options] and line =~ /\A  create_table /
+          line.gsub(/, options: ("(?:[^"]|\")*")/, '')
+        else
+          line
+        end
       end
-    }.join.strip_heredoc
+    end
+
+    dsl = dsl.join.strip_heredoc
 
     definitions = []
 

data/lib/ridgepole/execute_expander.rb

@@ -16,7 +16,7 @@ class Ridgepole::ExecuteExpander
         if sql =~ /\A(SELECT|SHOW)\b/i
           begin
             super(sql, name)
-          rescue => e
+          rescue
             Stub.new
           end
         else

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

@@ -5,7 +5,9 @@ module Ridgepole
     module AbstractMysqlAdapter
       module DisableTableOptions
         def table_options(table_name)
-          nil
+          options = super
+          options.delete(:options)
+          options
         end
       end
     end

data/lib/ridgepole/external_sql_executer.rb

@@ -31,7 +31,7 @@ class Ridgepole::ExternalSqlExecuter
                 else
                   @logger.info("#{script_basename}: #{data}")
                 end
-              rescue EOFError => e
+              rescue EOFError
                 files.delete f
               end
             end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta14'
+  VERSION = '0.6.5'
 end

data/spec/erb_helper.rb

@@ -11,6 +11,10 @@ end
 
 ERBh.define_method(:add_index) do |table_name, column_name, options|
   if condition(:activerecord_5)
+    if options[:length].is_a?(Hash)
+      options[:length] = options[:length].symbolize_keys
+    end
+
     @_erbout.sub!(/\bend\s*\z/, '')
 
     <<-EOS

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -54,12 +54,6 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-
-      # XXX:
-      if condition(:activerecord_5)
-        ActiveRecord::Base.connection.send(:create_table_info_cache).clear
-      end
-
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end

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

@@ -47,19 +47,13 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
     before { subject.diff(actual_dsl).migrate }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-
-      # XXX:
-      if condition(:activerecord_5)
-        ActiveRecord::Base.connection.send(:create_table_info_cache).clear
-      end
-
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end

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

@@ -21,7 +21,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(expected_dsl)
@@ -32,7 +32,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dumb_with_default_fk_name: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
         remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
@@ -40,7 +40,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     it {
-      delta = client(bulk_change: true, dumb_with_default_fk_name: true).diff(expected_dsl)
+      delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
@@ -84,7 +84,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(dsl)
@@ -114,7 +114,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       expect {
@@ -140,7 +140,7 @@ add_foreign_key "child", "parent"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       expect {
@@ -160,7 +160,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       expect {

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

@@ -36,7 +36,7 @@ end
     }
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(expected_dsl)
@@ -47,7 +47,7 @@ end
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dumb_with_default_fk_name: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
         add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
@@ -55,7 +55,7 @@ end
     }
 
     it {
-      delta = client(bulk_change: true, dumb_with_default_fk_name: true).diff(expected_dsl)
+      delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
@@ -99,7 +99,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     before { subject.diff(dsl).migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff('')

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

@@ -47,7 +47,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
 
     before { subject.diff(actual_dsl).migrate }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(expected_dsl)

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

@@ -21,7 +21,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(expected_dsl)
@@ -32,7 +32,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dumb_with_default_fk_name: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
         remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
@@ -40,7 +40,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     it {
-      delta = client(bulk_change: true, dumb_with_default_fk_name: true).diff(expected_dsl)
+      delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
@@ -84,7 +84,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     before { client.diff('').migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(dsl)
@@ -114,7 +114,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       expect {
@@ -140,7 +140,7 @@ add_foreign_key "child", "parent"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       expect {
@@ -160,7 +160,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       expect {

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

@@ -36,7 +36,7 @@ end
     }
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff(expected_dsl)
@@ -47,7 +47,7 @@ end
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dumb_with_default_fk_name: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4, dump_with_default_fk_name: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
         add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
@@ -55,7 +55,7 @@ end
     }
 
     it {
-      delta = client(bulk_change: true, dumb_with_default_fk_name: true).diff(expected_dsl)
+      delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
@@ -99,7 +99,7 @@ add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
     }
 
     before { subject.diff(dsl).migrate }
-    subject { client(dumb_with_default_fk_name: true) }
+    subject { client(dump_with_default_fk_name: true) }
 
     it {
       delta = subject.diff('')

data/spec/spec_const.rb

@@ -3,7 +3,7 @@ TEST_MYSQL_PORT = 3306
 TEST_MYSQL_USER = 'root'
 TEST_MYSQL_PASS = 'password'
 
-MYSQL_CLI = "MYSQL_PWD=#{TEST_MYSQL_PASS} mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER}"
+MYSQL_CLI = "mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER} -p#{TEST_MYSQL_PASS} 2>/dev/null"
 
 TEST_PG_HOST = '127.0.0.1'
 TEST_PG_PORT = 5432

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta14
+  version: 0.6.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -360,9 +360,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1