ridgepole 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2356f9b779b9119757eb4ef1a164b64e7c300bb3
-  data.tar.gz: ba5282a5f09799f4c69ab8cf39d810f5731098c0
+  metadata.gz: 5cedd9f4e2b3aea9219a4d1af456767e3f5711c1
+  data.tar.gz: 23174d2ebecd2aa64c402222557a791b32016eb7
 SHA512:
-  metadata.gz: ca299b961a46df66acf0e446f3171efe6f41a8fdf0143f9e3261dac694333721aa7869e3bf4656a2134aad006001ba5d4ad88e0e3e41e9d57c418cd2fa136d14
-  data.tar.gz: 14fab8ed7d0962d4f3f67a5e2d5363035a2913faed67de36bc86d1592c82905d60e25d0ba47b313ca0b0f736b3faf17ea7dfd29d94293f78d3990ceea7d5e2d3
+  metadata.gz: d953e35d399c6ecf1b8df3df9a6c559569826f3eabe58d9909b2a287bbeaef28e1f24c19204c613f45c76f741788243078d64b7115e4f85d9dc0b9ad29f57240
+  data.tar.gz: f7200deace1bfc4f5cc293f68c61c1463e2aeb77d40128ae9059a3950c51dd5cdb7ee69c7d5920e51d52fcf5c9d6016a359e0ac66d1119ddd381fbe05ce35caf

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+script:
+  - bundle install
+  - bundle exec rake

data/README.md

@@ -6,7 +6,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.png)](http://badge.fury.io/rb/ridgepole)
-[![Build Status](https://drone.io/github.com/winebarrel/ridgepole/status.png)](https://drone.io/github.com/winebarrel/ridgepole/latest)
+[![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=master)](https://travis-ci.org/winebarrel/ridgepole)
 
 ## Installation
 
@@ -100,6 +100,25 @@ Apply `Schemafile`
    -> 0.0202s
 ```
 
+## Rename
+```sh
+create_table "articles", force: true do |t|
+  t.string   "title"
+  t.text     "desc", renamed_from: "text"
+  t.text     "author"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+
+create_table "user_comments", force: true, renamed_from: "comments" do |t|
+  t.string   "commenter"
+  t.text     "body"
+  t.integer  "article_id"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+```
+
 ## Diff
 ```sh
 $ ridgepole --diff file1.schema file2.schema
@@ -117,25 +136,6 @@ $ 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
@@ -149,7 +149,7 @@ end
 $ cat file2.schema
 create_table "articles", force: true do |t|
   t.string   "title"
-  t.text     "desc", rename_from: "text"
+  t.text     "desc", renamed_from: "text"
   t.text     "author"
   t.datetime "created_at"
   t.datetime "updated_at"

data/lib/ridgepole.rb

@@ -14,5 +14,4 @@ require 'ridgepole/dumper'
 require 'ridgepole/logger'
 require 'ridgepole/migration_ext'
 require 'ridgepole/schema_dumper_ext'
-require 'ridgepole/string_ext'
 require 'ridgepole/version'

data/lib/ridgepole/diff.rb

@@ -45,7 +45,7 @@ class Ridgepole::Diff
     to.dup.each do |table_name, to_attrs|
       next unless target?(table_name)
 
-      if (from_table_name = (to_attrs[:options] || {}).delete(:rename_from))
+      if (from_table_name = (to_attrs[:options] || {}).delete(:renamed_from))
         # Already renamed
         next if from[table_name]
 
@@ -140,7 +140,7 @@ class Ridgepole::Diff
 
   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))
+      if (from_column_name = (to_attrs[:options] || {}).delete(:renamed_from))
         # Already renamed
         next if from[column_name]
 

data/lib/ridgepole/dumper.rb

@@ -34,7 +34,7 @@ class Ridgepole::Dumper
       line !~ /\A#/ &&
       line !~ /\AActiveRecord::Schema\.define/ &&
       line !~ /\Aend/
-    }.join.undent.strip
+    }.join.strip_heredoc.strip
 
     definitions = []
 

data/lib/ridgepole/version.rb

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

data/spec/0_diff/dump_disable_unsigned_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client#dump' do
     subject { client(disable_mysql_unsigned: true) }
 
     it {
-      expect(subject.dump).to eq (<<-RUBY).undent.strip
+      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
         create_table "clubs", force: true do |t|
           t.string "name", default: "", null: false
         end

data/spec/diff/diff_spec.rb

@@ -143,7 +143,7 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq (<<-RUBY).undent.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.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})

data/spec/dump/dump_class_method_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client.dump' do
     subject { Ridgepole::Client }
 
     it {
-      expect(subject.dump(conn_spec)).to eq (<<-RUBY).undent.strip
+      expect(subject.dump(conn_spec)).to eq <<-RUBY.strip_heredoc.strip
         create_table "clubs", force: true do |t|
           t.string "name", default: "", null: false
         end

data/spec/dump/dump_some_tables_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client#dump' do
     subject { client(tables: ['employees', 'salaries']) }
 
     it {
-      expect(subject.dump).to eq (<<-RUBY).undent.strip
+      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
         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
@@ -39,7 +39,7 @@ describe 'Ridgepole::Client#dump' do
     }
 
     it {
-      expect(subject.dump).to eq (<<-RUBY).undent.strip
+      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
         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

data/spec/dump/dump_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client#dump' do
     subject { client }
 
     it {
-      expect(subject.dump).to eq (<<-RUBY).undent.strip
+      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
         create_table "clubs", force: true do |t|
           t.string "name", default: "", null: false
         end

data/spec/migrate/migrate_add_column_spec.rb

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

data/spec/migrate/migrate_change_column_spec.rb

@@ -144,15 +144,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.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_truthy
-      expect(delta.script).to eq (<<-RUBY).undent.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>true, :null=>false})
 
         change_column("employees", "last_name", :string, {:limit=>16, :null=>false, :unsigned=>false})

data/spec/migrate/migrate_change_table_option_spec.rb

@@ -32,9 +32,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       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_falsey
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
     }
 
     it {

data/spec/migrate/migrate_create_index_spec.rb

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

data/spec/migrate/migrate_create_table_spec.rb

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

data/spec/migrate/migrate_drop_column_spec.rb

@@ -137,15 +137,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq (<<-RUBY).undent.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.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

@@ -83,15 +83,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.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
+      expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.strip_heredoc.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_truthy
-      expect(delta.script).to eq (<<-RUBY).undent.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.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})

data/spec/migrate/migrate_drop_table_spec.rb

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

data/spec/migrate/migrate_empty_spec.rb

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

data/spec/migrate/migrate_merge_mode_spec.rb

@@ -148,10 +148,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl.delete_create_table('clubs'))
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
       # `clubs` table is not deleted
-      expect(subject.dump).to eq expected_dsl.undent.strip
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
     }
 
     it {

data/spec/migrate/migrate_rename_column_spec.rb

@@ -86,7 +86,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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    "from_date2",           null: false, renamed_from: 'from_date'
           t.date    "to_date",              null: false
         end
 
@@ -97,7 +97,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           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'
+          t.date    "to_date2",            null: false, renamed_from: 'to_date'
         end
 
         add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
@@ -114,7 +114,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 "gender2",    limit: 1,  null: false, rename_from: 'gender'
+          t.string "gender2",    limit: 1,  null: false, renamed_from: 'gender'
           t.date   "hire_date",             null: false
         end
 
@@ -144,15 +144,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*rename_from:.*$/, '')
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq (<<-RUBY).undent.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
        rename_column("dept_emp", "from_date2", "from_date")
 
        rename_column("dept_manager", "to_date2", "to_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 "gender2",    limit: 1,  null: false, rename_from: 'age'
+          t.string "gender2",    limit: 1,  null: false, renamed_from: 'age'
           t.date   "hire_date",             null: false
         end
       RUBY

data/spec/migrate/migrate_rename_table_spec.rb

@@ -110,7 +110,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         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|
+        create_table "employees2", primary_key: "emp_no", force: true, renamed_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
@@ -144,15 +144,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/, rename_from: 'employees'/, '')
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/, renamed_from: 'employees'/, '')
     }
 
     it {
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq (<<-RUBY).undent.strip
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         rename_table("employees2", "employees")
       RUBY
     }
@@ -164,7 +164,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:dsl) {
       <<-RUBY
-        create_table "employees2", primary_key: "emp_no", force: true, rename_from: 'not_employees' do |t|
+        create_table "employees2", primary_key: "emp_no", force: true, renamed_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

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

data/spec/migrate/migrate_same_default_unsigned_spec.rb

@@ -24,9 +24,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip.gsub('unsigned: false,', '                ')
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub('unsigned: false,', '                ')
     }
   end
 
@@ -55,9 +55,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.undent.strip.gsub('unsigned: false,', '                ')
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip.gsub('unsigned: false,', '                ')
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
     }
   end
 end

data/spec/migrate/migrate_same_spec.rb

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

data/spec/migrate/migrate_skip_rename_column_spec.rb

@@ -86,7 +86,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         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    "from_date2",           null: false, renamed_from: 'from_date'
           t.date    "to_date",              null: false
         end
 
@@ -97,7 +97,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           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'
+          t.date    "to_date2",            null: false, renamed_from: 'to_date'
         end
 
         add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
@@ -114,7 +114,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 "gender2",    limit: 1,  null: false, rename_from: 'gender'
+          t.string "gender2",    limit: 1,  null: false, renamed_from: 'gender'
           t.date   "hire_date",             null: false
         end
 
@@ -144,9 +144,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*rename_from:.*$/, '')
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
     it {

data/spec/migrate/migrate_skip_rename_table_spec.rb

@@ -110,7 +110,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         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|
+        create_table "employees2", primary_key: "emp_no", force: true, renamed_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
@@ -144,9 +144,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.undent.strip
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/, rename_from: 'employees'/, '')
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/, renamed_from: 'employees'/, '')
     }
 
     it {

data/spec/migrate/migrate_with_ignore_tables_spec.rb

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

data/spec/migrate/migrate_with_tables_spec.rb

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

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $: << File.expand_path('..', __FILE__)
 require 'ridgepole'
+require 'active_support/core_ext/string/strip'
 require 'string_ext'
 
 ActiveRecord::Migration.verbose = false

data/spec/string_ext.rb

@@ -1,14 +1,4 @@
 class String
-  def undent
-    min_space_num = self.split("\n").delete_if {|s| s =~ /^\s*$/ }.map {|s| (s[/^\s+/] || '').length }.min
-
-    if min_space_num and min_space_num > 0
-      gsub(/^[ \t]{,#{min_space_num}}/, '')
-    else
-      self
-    end
-  end
-
   def delete_create_table(name)
     new_def = []
     in_block = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,6 +105,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,7 +120,6 @@ files:
 - lib/ridgepole/logger.rb
 - lib/ridgepole/migration_ext.rb
 - lib/ridgepole/schema_dumper_ext.rb
-- lib/ridgepole/string_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
 - spec/0_diff/dump_disable_unsigned_spec.rb

data/lib/ridgepole/string_ext.rb

@@ -1,11 +0,0 @@
-class String
-  def undent
-    min_space_num = self.split("\n").delete_if {|s| s =~ /^\s*$/ }.map {|s| (s[/^\s+/] || '').length }.min
-
-    if min_space_num and min_space_num > 0
-      gsub(/^[ \t]{,#{min_space_num}}/, '')
-    else
-      self
-    end
-  end
-end