ridgepole 0.7.0.alpha → 0.7.0.alpha2

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

@@ -2,36 +2,33 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-create_table "parent", force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
+        add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
     let(:sorted_actual_dsl) {
       expected_dsl + (<<-EOS)
-
-add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
+        add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
-
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-create_table "parent", force: :cascade do |t|
-end
+        create_table "parent", force: :cascade do |t|
+        end
       EOS
     }
 
@@ -69,32 +66,29 @@ end
   context 'when drop fk when drop table' do
     let(:dsl) {
       erbh(<<-EOS)
-create_table "parent", force: :cascade do |t|
-end
-
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id", unsigned: true
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
+        add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 
     let(:sorted_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
-
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-create_table "parent", force: :cascade do |t|
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
+        add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
       EOS
     }
 

data/spec/spec_helper.rb

@@ -3,13 +3,13 @@ $: << File.expand_path('..', __FILE__)
 require 'spec_const'
 require 'spec_condition'
 require 'cli_helper'
+require 'hide_pending_formatter'
 
 require 'processing_for_travis'
 
 require 'ridgepole'
 require 'ridgepole/cli/config'
 require 'active_support/core_ext'
-require 'string_ext' # TODO: must be remove
 require 'open3'
 require 'tempfile'
 require 'json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha
+  version: 0.7.0.alpha2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-match_fuzzy
   requirement: !ruby/object:Gem::Requirement
@@ -241,9 +241,9 @@ files:
 - lib/ridgepole/schema_statements_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
-- ridgepole.iml
 - spec/cli_helper.rb
 - spec/erb_helper.rb
+- spec/hide_pending_formatter.rb
 - spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
@@ -304,6 +304,7 @@ files:
 - spec/mysql/migrate/migrate_same_default_null_spec.rb
 - spec/mysql/migrate/migrate_same_spec.rb
 - spec/mysql/migrate/migrate_script_error_spec.rb
+- spec/mysql/migrate/migrate_skip_drop_table_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_column_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_table_spec.rb
 - spec/mysql/migrate/migrate_with_ignore_tables_spec.rb
@@ -349,7 +350,6 @@ files:
 - spec/spec_condition.rb
 - spec/spec_const.rb
 - spec/spec_helper.rb
-- spec/string_ext.rb
 homepage: https://github.com/winebarrel/ridgepole
 licenses:
 - MIT
@@ -362,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -377,6 +377,7 @@ summary: Ridgepole is a tool to manage DB schema.
 test_files:
 - spec/cli_helper.rb
 - spec/erb_helper.rb
+- spec/hide_pending_formatter.rb
 - spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
@@ -437,6 +438,7 @@ test_files:
 - spec/mysql/migrate/migrate_same_default_null_spec.rb
 - spec/mysql/migrate/migrate_same_spec.rb
 - spec/mysql/migrate/migrate_script_error_spec.rb
+- spec/mysql/migrate/migrate_skip_drop_table_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_column_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_table_spec.rb
 - spec/mysql/migrate/migrate_with_ignore_tables_spec.rb
@@ -482,4 +484,3 @@ test_files:
 - spec/spec_condition.rb
 - spec/spec_const.rb
 - spec/spec_helper.rb
-- spec/string_ext.rb

data/ridgepole.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

data/spec/string_ext.rb

@@ -1,40 +0,0 @@
-class String
-  # TODO: must be remove
-  def delete_create_table(name)
-    new_def = []
-    in_block = false
-
-    self.each_line do |line|
-      if line =~ /\A\s*create_table\s+"#{name}"/
-        in_block = true
-      elsif in_block and line =~ /\A\s*end\s*\Z/
-        in_block = false
-      elsif not in_block
-        new_def << line
-      end
-    end
-
-    new_def = new_def.join
-    raise 'must not happen' if new_def =~ /^\s*create_table\s+"#{name}"/m
-    new_def.delete_add_index(name)
-  end
-
-  # TODO: must be remove
-  def delete_add_index(name, columns = nil)
-    new_def = []
-    in_block = false
-
-    args = name.inspect
-    args << ',\\s*\\[' + columns.map {|i| i.inspect }.join(',\\s*') + '\\]' if columns
-
-    self.each_line do |line|
-      if line !~ /\A\s*add_index\s+#{args}/
-        new_def << line
-      end
-    end
-
-    new_def = new_def.join
-    raise 'must not happen' if new_def =~ /^\s*add_index\s+#{args}/m
-    new_def
-  end
-end