ridgepole 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d54e938bc4e2bf95598645ed4a431726393ec0
-  data.tar.gz: 4a51aeaa8a9f1b9786c77ec09607b7be67227c81
+  metadata.gz: 2356f9b779b9119757eb4ef1a164b64e7c300bb3
+  data.tar.gz: ba5282a5f09799f4c69ab8cf39d810f5731098c0
 SHA512:
-  metadata.gz: 93a822f7d5188da00068bad5b309b76adac1e6ee8992550eeccff464672c54ac77f88fadd0817404f7b44115662bbaecb5fa782d6dceb41c03c15a522c1ee52a
-  data.tar.gz: 8073144c850abfff1970664fc861d241f7676cfc98e9e26afb0e5d6be0d8aac2b6ce42517ac4827bcf8b6b2d6bebad8fb13f79b511deef5539e4e615974e78a6
+  metadata.gz: ca299b961a46df66acf0e446f3171efe6f41a8fdf0143f9e3261dac694333721aa7869e3bf4656a2134aad006001ba5d4ad88e0e3e41e9d57c418cd2fa136d14
+  data.tar.gz: 14fab8ed7d0962d4f3f67a5e2d5363035a2913faed67de36bc86d1592c82905d60e25d0ba47b313ca0b0f736b3faf17ea7dfd29d94293f78d3990ceea7d5e2d3

data/README.md

@@ -22,6 +22,29 @@ Or install it yourself as:
 
     $ gem install ridgepole
 
+## Help
+```
+Usage: ridgepole [options]
+    -c, --config CONF_OR_FILE
+    -a, --apply
+    -m, --merge
+    -f, --file FILE
+        --dry-run
+    -e, --export
+        --split
+        --split-with-dir
+    -d, --diff DSL1 DSL2
+        --reverse
+        --with-apply
+    -o, --output FILE
+    -t, --tables TABLES
+        --ignore-tables TABLES
+        --disable-mysql-unsigned
+        --log-file LOG_FILE
+        --verbose
+        --debug
+```
+
 ## Usage
 
 ```sh
@@ -94,6 +117,25 @@ $ ridgepole --diff config.yml file1.schema
 remove_column("articles", "author")
 ```
 
+### Rename
+```sh
+create_table "articles", force: true do |t|
+  t.string   "title"
+  t.text     "desc", rename_from: "text"
+  t.text     "author"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+
+create_table "user_comments", force: true, rename_from: "comments" do |t|
+  t.string   "commenter"
+  t.text     "body"
+  t.integer  "article_id"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+```
+
 ### Reverse diff
 ```sh
 $ cat file1.schema

data/lib/ridgepole/diff.rb

@@ -12,39 +12,9 @@ class Ridgepole::Diff
     end
 
     delta = {}
-
-    to.dup.each do |table_name, to_attrs|
-      next unless target?(table_name)
-
-      if (from_table_name = (to_attrs[:options] || {}).delete(:rename_from))
-        unless from.has_key?(from_table_name)
-          raise "Table `#{from_table_name}` not found"
-        end
-
-        delta[:rename] ||= {}
-        delta[:rename][table_name] = from_table_name
-        from.delete(from_table_name)
-        to.delete(table_name)
-      end
-    end
-
-
+    scan_table_rename(from, to, delta)
     # for reverse option
-    from.dup.each do |table_name, from_attrs|
-      if (to_table_name = (from_attrs[:options] || {}).delete(:rename_from))
-        unless to.has_key?(to_table_name)
-          raise "Table `#{from_table_name}` not found"
-        end
-
-        # XXX: Correct?
-        next unless target?(to_table_name)
-
-        delta[:rename] ||= {}
-        delta[:rename][to_table_name] = table_name
-        from.delete(table_name)
-        to.delete(to_table_name)
-      end
-    end
+    scan_table_rename(to, from, delta)
 
     to.each do |table_name, to_attrs|
       next unless target?(table_name)
@@ -71,6 +41,32 @@ class Ridgepole::Diff
 
   private
 
+  def scan_table_rename(from, to, delta, options = {})
+    to.dup.each do |table_name, to_attrs|
+      next unless target?(table_name)
+
+      if (from_table_name = (to_attrs[:options] || {}).delete(:rename_from))
+        # Already renamed
+        next if from[table_name]
+
+        unless from.has_key?(from_table_name)
+          raise "Table `#{from_table_name}` not found"
+        end
+
+        delta[:rename] ||= {}
+
+        if @options[:reverse]
+          delta[:rename][from_table_name] = table_name
+        else
+          delta[:rename][table_name] = from_table_name
+        end
+
+        from.delete(from_table_name)
+        to.delete(table_name)
+      end
+    end
+  end
+
   def scan_change(table_name, from, to, delta)
     from = (from || {}).dup
     to = (to || {}).dup
@@ -97,32 +93,9 @@ class Ridgepole::Diff
     to = (to || {}).dup
     definition_delta = {}
 
-    to.dup.each do |column_name, to_attrs|
-      if (from_column_name = (to_attrs[:options] || {}).delete(:rename_from))
-        unless from.has_key?(from_column_name)
-          raise "Column `#{from_column_name}` not found"
-        end
-
-        definition_delta[:rename] ||= {}
-        definition_delta[:rename][column_name] = from_column_name
-        from.delete(from_column_name)
-        to.delete(column_name)
-      end
-    end
-
+    scan_column_rename(from, to, definition_delta)
     # for reverse option
-    from.dup.each do |column_name, from_attrs|
-      if (to_column_name = (from_attrs[:options] || {}).delete(:rename_from))
-        unless to.has_key?(to_column_name)
-          raise "Column `#{to_column_name}` not found"
-        end
-
-        definition_delta[:rename] ||= {}
-        definition_delta[:rename][to_column_name] = column_name
-        from.delete(column_name)
-        to.delete(to_column_name)
-      end
-    end
+    scan_column_rename(to, from, definition_delta)
 
     priv_column_name = nil
 
@@ -165,6 +138,30 @@ class Ridgepole::Diff
     end
   end
 
+  def scan_column_rename(from, to, definition_delta)
+    to.dup.each do |column_name, to_attrs|
+      if (from_column_name = (to_attrs[:options] || {}).delete(:rename_from))
+        # Already renamed
+        next if from[column_name]
+
+        unless from.has_key?(from_column_name)
+          raise "Column `#{from_column_name}` not found"
+        end
+
+        definition_delta[:rename] ||= {}
+
+        if @options[:reverse]
+          definition_delta[:rename][from_column_name] = column_name
+        else
+          definition_delta[:rename][column_name] = from_column_name
+        end
+
+        from.delete(from_column_name)
+        to.delete(column_name)
+      end
+    end
+  end
+
   def scan_indices_change(from, to, table_delta)
     from = (from || {}).dup
     to = (to || {}).dup

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/ridgepole.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord-mysql-unsigned', '>= 0.1.3'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.14.1'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'mysql2'
 end

data/spec/diff/diff_spec.rb

@@ -142,7 +142,7 @@ describe 'Ridgepole::Client.diff' do
 
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true})
 

data/spec/migrate/migrate_add_column_spec.rb

@@ -146,7 +146,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
@@ -154,7 +154,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         remove_column("employee_clubs", "any_col")
 

data/spec/migrate/migrate_change_column_spec.rb

@@ -143,7 +143,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
@@ -151,7 +151,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>true, :null=>false})
 

data/spec/migrate/migrate_change_table_option_spec.rb

@@ -31,7 +31,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Table `employees` options cannot be changed')
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq actual_dsl.undent.strip
@@ -40,7 +40,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Table `employees` options cannot be changed')
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
     }
   end
 end

data/spec/migrate/migrate_create_index_spec.rb

@@ -82,7 +82,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump.delete_empty_lines).to eq actual_dsl.undent.strip.delete_empty_lines
       delta.migrate
       expect(subject.dump.delete_empty_lines).to eq expected_dsl.undent.strip.delete_empty_lines
@@ -90,7 +90,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
        remove_index("clubs", {:name=>"idx_name"})
 

data/spec/migrate/migrate_create_table_spec.rb

@@ -82,7 +82,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump.delete_empty_lines).to eq actual_dsl.undent.strip.delete_empty_lines
       delta.migrate
       expect(subject.dump.delete_empty_lines).to eq expected_dsl.undent.strip.delete_empty_lines
@@ -90,7 +90,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         drop_table("clubs")
 

data/spec/migrate/migrate_drop_column_spec.rb

@@ -136,7 +136,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
@@ -144,7 +144,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         add_column("dept_emp", "from_date", :date, {:null=>false, :after=>"dept_no"})
         add_column("dept_emp", "to_date", :date, {:null=>false, :after=>"from_date"})

data/spec/migrate/migrate_drop_index_spec.rb

@@ -82,7 +82,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.undent.strip.each_line.select {|i| i !~ /\A\Z/ }.join
@@ -90,7 +90,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
 

data/spec/migrate/migrate_drop_table_spec.rb

@@ -82,7 +82,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.undent.strip.each_line.select {|i| i !~ /\A\Z/ }.join
@@ -90,7 +90,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         create_table("clubs", {}) do |t|
           t.string("name", {:default=>"", :null=>false})

data/spec/migrate/migrate_empty_spec.rb

@@ -74,7 +74,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
@@ -82,7 +82,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         drop_table("clubs")
 

data/spec/migrate/migrate_merge_mode_spec.rb

@@ -147,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl.delete_create_table('clubs'))
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       # `clubs` table is not deleted
@@ -156,7 +156,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, merge: true, reverse: true)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
     }
   end
 end

data/spec/migrate/migrate_rename_column_spec.rb

@@ -143,7 +143,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*rename_from:.*$/, '')
@@ -151,7 +151,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
        rename_column("dept_emp", "from_date2", "from_date")
 
@@ -172,7 +172,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
-          t.string "gender",     limit: 1,  null: false, rename_from: 'age'
+          t.string "gender2",    limit: 1,  null: false, rename_from: 'age'
           t.date   "hire_date",             null: false
         end
       RUBY

data/spec/migrate/migrate_rename_table_spec.rb

@@ -143,7 +143,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/, rename_from: 'employees'/, '')
@@ -151,7 +151,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         rename_table("employees2", "employees")
       RUBY
@@ -164,7 +164,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:dsl) {
       <<-RUBY
-        create_table "employees", primary_key: "emp_no", force: true, rename_from: 'not_employees' do |t|
+        create_table "employees2", primary_key: "emp_no", force: true, rename_from: 'not_employees' do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false

data/spec/migrate/migrate_same_default_null_spec.rb

@@ -29,7 +29,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*null: true/, '')
@@ -66,7 +66,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq actual_dsl.undent.strip.gsub(/\s*,\s*null: true/, '')
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip

data/spec/migrate/migrate_same_default_unsigned_spec.rb

@@ -23,7 +23,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub('unsigned: false,', '                ')
@@ -54,7 +54,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq actual_dsl.undent.strip.gsub('unsigned: false,', '                ')
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip

data/spec/migrate/migrate_same_spec.rb

@@ -74,7 +74,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq dsl.undent.strip

data/spec/migrate/migrate_skip_rename_column_spec.rb

@@ -0,0 +1,157 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when rename column' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "dept_no",    limit: 4, null: false
+          t.date    "from_date2",           null: false
+          t.date    "to_date",              null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date2",            null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender2",    limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "dept_no",    limit: 4, null: false
+          t.date    "from_date2",           null: false, rename_from: 'from_date'
+          t.date    "to_date",              null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date2",            null: false, rename_from: 'to_date'
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender2",    limit: 1,  null: false, rename_from: 'gender'
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+      expect(subject.dump).to eq actual_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*rename_from:.*$/, '')
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

data/spec/migrate/migrate_skip_rename_table_spec.rb

@@ -0,0 +1,157 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when rename table' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees2", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees2", primary_key: "emp_no", force: true, rename_from: 'employees' do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+      expect(subject.dump).to eq actual_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/, rename_from: 'employees'/, '')
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

data/spec/migrate/migrate_with_ignore_tables_spec.rb

@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq expected_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
@@ -138,7 +138,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq before_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq after_dsl.undent.strip
@@ -146,7 +146,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})
       RUBY

data/spec/migrate/migrate_with_tables_spec.rb

@@ -59,7 +59,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(dsl)
-      expect(delta.differ?).to be_false
+      expect(delta.differ?).to be_falsey
       expect(subject.dump).to eq expected_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
@@ -138,7 +138,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(dsl)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq before_dsl.undent.strip
       delta.migrate
       expect(subject.dump).to eq after_dsl.undent.strip
@@ -146,7 +146,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = Ridgepole::Client.diff(current_schema, dsl, tables: ['employees'], reverse: true)
-      expect(delta.differ?).to be_true
+      expect(delta.differ?).to be_truthy
       expect(delta.script).to eq (<<-RUBY).undent.strip
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})
       RUBY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,8 @@ files:
 - spec/migrate/migrate_same_default_null_spec.rb
 - spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
+- spec/migrate/migrate_skip_rename_column_spec.rb
+- spec/migrate/migrate_skip_rename_table_spec.rb
 - spec/migrate/migrate_with_ignore_tables_spec.rb
 - spec/migrate/migrate_with_tables_spec.rb
 - spec/ridgepole_test_database.sql
@@ -197,6 +199,8 @@ test_files:
 - spec/migrate/migrate_same_default_null_spec.rb
 - spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
+- spec/migrate/migrate_skip_rename_column_spec.rb
+- spec/migrate/migrate_skip_rename_table_spec.rb
 - spec/migrate/migrate_with_ignore_tables_spec.rb
 - spec/migrate/migrate_with_tables_spec.rb
 - spec/ridgepole_test_database.sql