ridgepole 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e09733c0324e6f1e7aac45b4b27b1dbf8492114
-  data.tar.gz: ee817aee1eabf4f66821585b4e114daad6b1a41b
+  metadata.gz: f5d54e938bc4e2bf95598645ed4a431726393ec0
+  data.tar.gz: 4a51aeaa8a9f1b9786c77ec09607b7be67227c81
 SHA512:
-  metadata.gz: 12cb083697c48bcd3b799f6686a32f91bdd62852d69fa235e9afabc790bf1b10e72b13357debd2a8d6b04d38fdaa1c850b407c04a7f622d75d3f282a747059a3
-  data.tar.gz: be9c09c97c28b2ee4614230c37e81cb63f5323e1f9f50d68ab0e3d6f2806df15287432ebe4e05d458f8a0a40047e6116ca17029716d26f73ac66cdf9e21943cd
+  metadata.gz: 93a822f7d5188da00068bad5b309b76adac1e6ee8992550eeccff464672c54ac77f88fadd0817404f7b44115662bbaecb5fa782d6dceb41c03c15a522c1ee52a
+  data.tar.gz: 8073144c850abfff1970664fc861d241f7676cfc98e9e26afb0e5d6be0d8aac2b6ce42517ac4827bcf8b6b2d6bebad8fb13f79b511deef5539e4e615974e78a6

data/README.md

@@ -25,10 +25,101 @@ Or install it yourself as:
 ## Usage
 
 ```sh
-ridgepole --export -o Schemafile
-vi Schemafile
-ridgepole --apply --dry-run
-ridgepole --apply
+$ git init
+Initialized empty Git repository in ...
+
+$ cat config.yml
+adapter: mysql2
+encoding: utf8
+database: blog
+username: root
+
+$ ridgepole -c config.yml --export -o Schemafile # or `ridgepole -c '{adapter: mysql2, database: blog}' ...`
+Export Schema to `Schemafile`
+
+$ cat Schemafile
+create_table "articles", force: true do |t|
+  t.string   "title"
+  t.text     "text"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+
+$ git add .
+$ git commit -m 'first commit'  -a
+[master (root-commit) a6c2d31] first commit
+ 2 files changed, 10 insertions(+)
+ create mode 100644 Schemafile
+ create mode 100644 config.yml
+
+$ vi Schemafile
+$ git diff
+diff --git a/Schemafile b/Schemafile
+index f5848b9..c266fed 100644
+--- a/Schemafile
++++ b/Schemafile
+@@ -1,6 +1,7 @@
+ create_table "articles", force: true do |t|
+   t.string   "title"
+   t.text     "text"
++  t.text     "author"
+   t.datetime "created_at"
+   t.datetime "updated_at"
+ end
+
+$ ridgepole -c config.yml --apply --dry-run
+Apply `Schemafile` (dry-run)
+add_column("articles", "author", :text, {:after=>"text"})
+
+$ ridgepole -c config.yml --apply
+Apply `Schemafile`
+-- add_column("articles", "author", :text, {:after=>"text"})
+   -> 0.0202s
+```
+
+## Diff
+```sh
+$ ridgepole --diff file1.schema file2.schema
+add_column("articles", "author", :text, {:after=>"title"})
+rename_column("articles", "text", "desc")
+
+# You can apply to the database the difference:
+# $ ridgepole -c config.yml --diff file1.schema file2.schema --with-apply
+```
+
+You can also compare databases and files.
+
+```sh
+$ ridgepole --diff config.yml file1.schema
+remove_column("articles", "author")
+```
+
+### Reverse diff
+```sh
+$ cat file1.schema
+create_table "articles", force: true do |t|
+  t.string   "title"
+  t.text     "text"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+
+$ cat file2.schema
+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
+
+$ ridgepole --diff file1.schema file2.schema
+add_column("articles", "author", :text, {:after=>"title"})
+rename_column("articles", "text", "desc")
+
+$ ridgepole --diff file1.schema file2.schema --reverse
+rename_column("articles", "desc", "text")
+remove_column("articles", "author")
 ```
 
 ## Demo

data/bin/ridgepole

@@ -17,6 +17,9 @@ mode = nil
 file = DEFAULT_FILENAME
 output_file = '-'
 split = false
+diff_files = nil
+diff_with_apply = false
+exit_code = 0
 
 options = {
   :dry_run => false,
@@ -38,6 +41,20 @@ ARGV.options do |opt|
     opt.on('-e', '--export')                      {    set_mode[:export]                                    }
     opt.on('',   '--split')                       {|v| split = true                                         }
     opt.on('',   '--split-with-dir')              {|v| split = :with_dir                                    }
+    opt.on('-d', '--diff DSL1 DSL2') {|diff_arg1|
+      set_mode[:diff]
+      diff_arg2 = ARGV.first
+
+      if [diff_arg1, diff_arg2].any? {|i| i.nil? or i =~ /\A-/ }
+        puts opt.help
+        exit 1
+      end
+
+      ARGV.shift
+      diff_files = [diff_arg1, diff_arg2]
+    }
+    opt.on('',   '--reverse')                     {    options[:reverse] = true                             }
+    opt.on('',   '--with-apply')                  {    diff_with_apply = true                               }
     opt.on('-o', '--output FILE')                 {|v| output_file = v                                      }
     opt.on('-t', '--tables TABLES', Array)        {|v| options[:tables] = v                                 }
     opt.on('',   '--ignore-tables TABLES', Array) {|v| options[:ignore_tables] = v.map {|i| Regexp.new(i) } }
@@ -47,7 +64,7 @@ ARGV.options do |opt|
     opt.on(''  , '--debug')                       {    options[:debug] = true                               }
     opt.parse!
 
-    unless config and mode
+    if not mode or ([:apply, :export].include?(mode) and not config) or  (options[:with_apply] and not config)
       puts opt.help
       exit 1
     end
@@ -61,9 +78,11 @@ begin
   logger = Ridgepole::Logger.instance
   logger.set_debug(options[:debug])
 
-  config = open(config) {|f| f.read } if File.exist?(config)
-  config = YAML.load(config)
-  client = Ridgepole::Client.new(config, options)
+  if config
+    config = File.read(config) if File.exist?(config)
+    config = YAML.load(config)
+    client = Ridgepole::Client.new(config, options)
+  end
 
   case mode
   when :export
@@ -115,7 +134,7 @@ begin
     msg << ' (dry-run)' if options[:dry_run]
     logger.info(msg)
 
-    dsl = open(file) {|f| f.read }
+    dsl = File.read(file)
     delta = client.diff(dsl, :path => file)
 
     if options[:dry_run]
@@ -128,6 +147,30 @@ begin
     unless delta.differ?
       logger.info('No change')
     end
+  when :diff
+    diff_files = diff_files.map do |file|
+      if File.exist?(file)
+        file_ext = File.extname(file)
+        %w(.yml .yaml).include?(file_ext) ? YAML.load_file(file) : File.read(file)
+      else
+        YAML.load(file)
+      end
+    end
+
+    delta = Ridgepole::Client.diff(*diff_files, options)
+
+    if diff_with_apply
+      logger.verbose_info('# Update schema')
+
+      if delta.differ?
+        delta.migrate
+      else
+        logger.info('No change')
+      end
+    elsif delta.differ?
+      puts delta.script
+      exit_code = 1
+    end
   end
 rescue => e
   if options[:debug]
@@ -137,3 +180,5 @@ rescue => e
     exit 1
   end
 end
+
+exit exit_code

data/lib/ridgepole/client.rb

@@ -28,4 +28,32 @@ class Ridgepole::Client
     logger.verbose_info('# Compare definitions')
     @diff.diff(current_definition, expected_definition)
   end
+
+  class << self
+    def diff(dsl_or_config1, dsl_or_config2, options = {})
+      logger = Ridgepole::Logger.instance
+
+      logger.verbose_info('# Parse DSL1')
+      definition1 = load_definition(dsl_or_config1)
+      logger.verbose_info('# Parse DSL2')
+      definition2 = load_definition(dsl_or_config2)
+
+      logger.verbose_info('# Compare definitions')
+      diff = Ridgepole::Diff.new(options)
+      diff.diff(definition1, definition2)
+    end
+
+    def dump(conn_spec, options = {}, &block)
+      client = self.new(conn_spec, options)
+      client.dump(&block)
+    end
+
+    private
+
+    def load_definition(dsl_or_config, options = {})
+      dsl_or_config = dump(dsl_or_config, options) if dsl_or_config.kind_of?(Hash)
+      parser = Ridgepole::DSLParser.new(options)
+      parser.parse(dsl_or_config)
+    end
+  end # of class methods
 end

data/lib/ridgepole/diff.rb

@@ -6,6 +6,11 @@ class Ridgepole::Diff
   def diff(from, to)
     from = (from || {}).dup
     to = (to || {}).dup
+
+    if @options[:reverse]
+      from, to = to, from
+    end
+
     delta = {}
 
     to.dup.each do |table_name, to_attrs|
@@ -23,6 +28,24 @@ class Ridgepole::Diff
       end
     end
 
+
+    # 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
+
     to.each do |table_name, to_attrs|
       next unless target?(table_name)
 
@@ -87,6 +110,20 @@ class Ridgepole::Diff
       end
     end
 
+    # 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
+
     priv_column_name = nil
 
     to.each do |column_name, to_attrs|

data/lib/ridgepole/version.rb

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

data/spec/diff/diff_spec.rb

@@ -0,0 +1,154 @@
+describe 'Ridgepole::Client.diff' do
+  context 'when change 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_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 "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 "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: false, null: true
+        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: 20, default: "XXX", null: false
+          t.string "gender",     limit: 2,                  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
+    }
+
+    subject { Ridgepole::Client }
+
+    it {
+      delta = subject.diff(actual_dsl, expected_dsl)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true})
+
+        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX", :null=>false, :unsigned=>false})
+        change_column("employees", "gender", :string, {:limit=>2, :null=>false, :unsigned=>false})
+      RUBY
+    }
+  end
+end

data/spec/{migrate/migrate_drop_table.rb → dump/dump_class_method_spec.rb}

@@ -1,7 +1,10 @@
-describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when drop table' do
-    let(:dsl) {
-      <<-RUBY
+describe 'Ridgepole::Client.dump' do
+  context 'when there is a tables' do
+    before { restore_tables }
+    subject { Ridgepole::Client }
+
+    it {
+      expect(subject.dump(conn_spec)).to eq (<<-RUBY).undent.strip
         create_table "clubs", force: true do |t|
           t.string "name", default: "", null: false
         end
@@ -68,24 +71,5 @@ describe 'Ridgepole::Client#diff -> migrate' do
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
       RUBY
     }
-
-    let(:actual_dsl) { dsl }
-
-    let(:expected_dsl) {
-      dsl.delete_create_table('clubs')
-         .delete_create_table('employee_clubs')
-         .delete_create_table('employees')
-    }
-
-    before { subject.diff(actual_dsl).migrate }
-    subject { client }
-
-    it {
-      delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_true
-      expect(subject.dump).to eq actual_dsl.undent.strip
-      delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip
-    }
   end
 end

data/spec/migrate/migrate_add_column_spec.rb

@@ -151,5 +151,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
     }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        remove_column("employee_clubs", "any_col")
+
+        remove_column("employees", "age")
+        remove_column("employees", "updated_at")
+      RUBY
+    }
   end
 end

data/spec/migrate/migrate_change_column_spec.rb

@@ -148,5 +148,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
     }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        change_column("employee_clubs", "club_id", :integer, {:unsigned=>true, :null=>false})
+
+        change_column("employees", "last_name", :string, {:limit=>16, :null=>false, :unsigned=>false})
+        change_column("employees", "gender", :string, {:limit=>1, :null=>false, :unsigned=>false})
+      RUBY
+    }
   end
 end

data/spec/migrate/migrate_change_table_option_spec.rb

@@ -36,5 +36,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to eq actual_dsl.undent.strip
     }
+
+    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
+    }
   end
 end

data/spec/migrate/migrate_create_index_spec.rb

@@ -87,5 +87,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump.delete_empty_lines).to eq expected_dsl.undent.strip.delete_empty_lines
     }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+       remove_index("clubs", {:name=>"idx_name"})
+
+       remove_index("employee_clubs", {:name=>"idx_emp_no_club_id"})
+
+       remove_index("titles", {:name=>"emp_no"})
+      RUBY
+    }
   end
 end

data/spec/migrate/migrate_create_table_spec.rb

@@ -87,5 +87,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump.delete_empty_lines).to eq expected_dsl.undent.strip.delete_empty_lines
     }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        drop_table("clubs")
+
+        drop_table("employee_clubs")
+
+        drop_table("employees")
+      RUBY
+    }
   end
 end

data/spec/migrate/migrate_drop_column_spec.rb

@@ -141,5 +141,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
     }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      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"})
+
+        add_column("dept_manager", "from_date", :date, {:null=>false, :after=>"emp_no"})
+        add_column("dept_manager", "to_date", :date, {:null=>false, :after=>"from_date"})
+
+        add_column("employees", "last_name", :string, {:limit=>16, :null=>false, :after=>"first_name"})
+        add_column("employees", "gender", :string, {:limit=>1, :null=>false, :after=>"last_name"})
+        add_column("employees", "hire_date", :date, {:null=>false, :after=>"gender"})
+      RUBY
+    }
   end
 end

data/spec/migrate/{migrate_drop_index.rb → migrate_drop_index_spec.rb}

@@ -85,7 +85,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_true
       expect(subject.dump).to eq actual_dsl.undent.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip
+      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
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
+
+        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+
+        add_index("titles", ["emp_no"], {:name=>"emp_no", :using=>:btree})
+      RUBY
     }
   end
 end

data/spec/migrate/migrate_drop_table_spec.rb

@@ -0,0 +1,116 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when drop table' do
+    let(: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 "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 "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(:actual_dsl) { dsl }
+
+    let(:expected_dsl) {
+      dsl.delete_create_table('clubs')
+         .delete_create_table('employee_clubs')
+         .delete_create_table('employees')
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_true
+      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
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        create_table("clubs", {}) do |t|
+          t.string("name", {:default=>"", :null=>false})
+        end
+        add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
+
+        create_table("employee_clubs", {}) 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"}) 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
+      RUBY
+    }
+  end
+end

data/spec/migrate/migrate_empty_spec.rb

@@ -79,5 +79,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta.migrate
       expect(subject.dump).to eq expected_dsl.undent.strip
     }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        drop_table("clubs")
+
+        drop_table("departments")
+
+        drop_table("dept_emp")
+
+        drop_table("dept_manager")
+
+        drop_table("employee_clubs")
+
+        drop_table("employees")
+
+        drop_table("salaries")
+
+        drop_table("titles")
+      RUBY
+    }
   end
 end

data/spec/migrate/migrate_merge_mode_spec.rb

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

data/spec/migrate/migrate_rename_column_spec.rb

@@ -148,6 +148,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
       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_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+       rename_column("dept_emp", "from_date2", "from_date")
+
+       rename_column("dept_manager", "to_date2", "to_date")
+
+       rename_column("employees", "gender2", "gender")
+      RUBY
+    }
   end
 
   context 'when rename column (not found)' do

data/spec/migrate/migrate_rename_table_spec.rb

@@ -148,6 +148,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
       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_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        rename_table("employees2", "employees")
+      RUBY
+    }
   end
 
   context 'when rename table (not found)' do

data/spec/migrate/migrate_with_ignore_tables_spec.rb

@@ -0,0 +1,155 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when with ignore tables option (same)' do
+    let(:current_schema) {
+      <<-RUBY
+        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 "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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        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 "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
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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 "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(current_schema).migrate }
+    subject { client(ignore_tables: [/^salaries$/] ) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_false
+      expect(subject.dump).to eq expected_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip
+    }
+  end
+
+  context 'when with ignore tables option (differ)' do
+    let(:current_schema) {
+      <<-RUBY
+        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 "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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, 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
+      RUBY
+    }
+
+    let(:before_dsl) {
+      <<-RUBY
+        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 "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    let(:after_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(current_schema).migrate }
+    subject { client(ignore_tables: [/^salaries$/] ) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_true
+      expect(subject.dump).to eq before_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq after_dsl.undent.strip
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})
+      RUBY
+    }
+  end
+end

data/spec/migrate/migrate_with_tables_spec.rb

@@ -0,0 +1,155 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when with tables option (same)' do
+    let(:current_schema) {
+      <<-RUBY
+        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 "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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        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 "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
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        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 "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(current_schema).migrate }
+    subject { client(tables: ['employees'] ) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_false
+      expect(subject.dump).to eq expected_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip
+    }
+  end
+
+  context 'when with tables option (differ)' do
+    let(:current_schema) {
+      <<-RUBY
+        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 "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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, 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
+      RUBY
+    }
+
+    let(:before_dsl) {
+      <<-RUBY
+        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 "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    let(:after_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(current_schema).migrate }
+    subject { client(tables: ['employees']) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_true
+      expect(subject.dump).to eq before_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq after_dsl.undent.strip
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(current_schema, dsl, tables: ['employees'], reverse: true)
+      expect(delta.differ?).to be_true
+      expect(delta.script).to eq (<<-RUBY).undent.strip
+        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})
+      RUBY
+    }
+  end
+end

data/spec/spec_helper.rb

@@ -22,13 +22,17 @@ def restore_tables
 end
 
 def client(options = {}, config = {})
-  config = {
-    adapter: 'mysql2',
-    database: 'ridgepole_test',
-  }.merge(config)
+  config = conn_spec(config)
 
   options = {
   }.merge(options)
 
   Ridgepole::Client.new(config, options)
-end
+end
+
+def conn_spec(config = {})
+  {
+    adapter: 'mysql2',
+    database: 'ridgepole_test',
+  }.merge(config)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,7 +122,9 @@ files:
 - lib/ridgepole/string_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
-- spec/dump/dump_disable_unsigned_spec.rb
+- spec/0_diff/dump_disable_unsigned_spec.rb
+- spec/diff/diff_spec.rb
+- spec/dump/dump_class_method_spec.rb
 - spec/dump/dump_some_tables_spec.rb
 - spec/dump/dump_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
@@ -131,8 +133,8 @@ files:
 - spec/migrate/migrate_create_index_spec.rb
 - spec/migrate/migrate_create_table_spec.rb
 - spec/migrate/migrate_drop_column_spec.rb
-- spec/migrate/migrate_drop_index.rb
-- spec/migrate/migrate_drop_table.rb
+- spec/migrate/migrate_drop_index_spec.rb
+- spec/migrate/migrate_drop_table_spec.rb
 - spec/migrate/migrate_duplicate_index_spec.rb
 - spec/migrate/migrate_duplicate_table_spec.rb
 - spec/migrate/migrate_empty_spec.rb
@@ -142,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_with_ignore_tables_spec.rb
+- spec/migrate/migrate_with_tables_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql
 - spec/spec_helper.rb
@@ -171,7 +175,9 @@ signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to DB schema.
 test_files:
-- spec/dump/dump_disable_unsigned_spec.rb
+- spec/0_diff/dump_disable_unsigned_spec.rb
+- spec/diff/diff_spec.rb
+- spec/dump/dump_class_method_spec.rb
 - spec/dump/dump_some_tables_spec.rb
 - spec/dump/dump_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
@@ -180,8 +186,8 @@ test_files:
 - spec/migrate/migrate_create_index_spec.rb
 - spec/migrate/migrate_create_table_spec.rb
 - spec/migrate/migrate_drop_column_spec.rb
-- spec/migrate/migrate_drop_index.rb
-- spec/migrate/migrate_drop_table.rb
+- spec/migrate/migrate_drop_index_spec.rb
+- spec/migrate/migrate_drop_table_spec.rb
 - spec/migrate/migrate_duplicate_index_spec.rb
 - spec/migrate/migrate_duplicate_table_spec.rb
 - spec/migrate/migrate_empty_spec.rb
@@ -191,6 +197,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_with_ignore_tables_spec.rb
+- spec/migrate/migrate_with_tables_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql
 - spec/spec_helper.rb