ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/migrate/migrate_same_default_null_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same (default null / nothing -> null:true)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date"
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: true
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -37,8 +37,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when database and definition are same (default null / null:true -> nothing)' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -46,11 +46,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: true
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -58,8 +58,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date"
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_same_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "clubs", <%= i cond('>= 5.1',{id: :integer}) + {unsigned: true, force: :cascade} %> do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,8 +59,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { restore_tables }
     subject { client }

data/spec/mysql/migrate/migrate_script_error_spec.rb

@@ -1,8 +1,8 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when there is an error in the script' do
     let(:actual_dsl) { '' }
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -67,8 +67,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
     subject { client }
 
@@ -77,13 +77,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
 
-      errmsg = Regexp.new(Regexp.escape <<-EOS.strip)
+      errmsg = Regexp.new(Regexp.escape(<<-MSG.strip))
         33: add_index("employee_clubs", ["emp_no", "Xclub_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
-      EOS
+      MSG
 
-      expect {
+      expect do
         delta.migrate
-      }.to raise_error(RuntimeError, errmsg)
+      end.to raise_error(RuntimeError, errmsg)
     }
   end
 end

data/spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column ignore comment' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false, comment: "my comment"
           t.string "first_name", limit: 14, null: false
@@ -10,11 +10,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date", null: false
           t.index ["gender"], name: "gender", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table :employees, primary_key: :emp_no, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false, comment: "my comment2"
@@ -23,8 +23,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   :hire_date, null: false
           t.index :gender, name: :gender, <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(skip_column_comment_change: true) }

data/spec/mysql/migrate/migrate_skip_drop_table_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when skil drop table' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -125,14 +125,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(skip_drop_table: true) }
 
     it {
-      delta = subject.diff(expected_dsl.gsub(/create_table "clubs".+\n\s*t\..+\n\s*end/, ""))
+      delta = subject.diff(expected_dsl.gsub(/create_table "clubs".+\n\s*t\..+\n\s*end/, ''))
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate

data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when rename column' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -121,8 +121,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when rename table' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -59,11 +59,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -121,14 +121,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] The table `employees` has already been renamed to the table `employees2`.")
+      expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] The table `employees` has already been renamed to the table `employees2`.')
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
       expect(subject.dump).to match_ruby actual_dsl

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when with ignore tables option (same)' do
-    let(:current_schema) {
-      <<-EOS
+    let(:current_schema) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -18,11 +18,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:dsl) {
-      <<-EOS
+    let(:dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -39,11 +39,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -51,11 +51,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(current_schema).migrate }
-    subject { client(ignore_tables: [/^salaries$/] ) }
+    subject { client(ignore_tables: [/^salaries$/]) }
 
     it {
       delta = subject.diff(dsl)
@@ -67,8 +67,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when with ignore tables option (differ)' do
-    let(:current_schema) {
-      <<-EOS
+    let(:current_schema) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -85,11 +85,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:dsl) {
-      <<-EOS
+    let(:dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 15, null: false
@@ -106,11 +106,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:before_dsl) {
-      <<-EOS
+    let(:before_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -118,11 +118,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:after_dsl) {
-      <<-EOS
+    let(:after_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 15, null: false
@@ -130,11 +130,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(current_schema).migrate }
-    subject { client(ignore_tables: [/^salaries$/] ) }
+    subject { client(ignore_tables: [/^salaries$/]) }
 
     it {
       delta = subject.diff(dsl)
@@ -146,8 +146,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when with ignore tables option (target and ignore)' do
-    let(:current_schema) {
-      <<-EOS
+    let(:current_schema) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -164,11 +164,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:dsl) {
-      <<-EOS
+    let(:dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 15, null: false
@@ -185,11 +185,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:before_dsl) {
-      <<-EOS
+    let(:before_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -197,11 +197,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:after_dsl) {
-      <<-EOS
+    let(:after_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 15, null: false
@@ -209,11 +209,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(current_schema).migrate }
-    subject { client(tables: ["employees"], ignore_tables: [/^.+$/] ) }
+    subject { client(tables: ['employees'], ignore_tables: [/^.+$/]) }
 
     it {
       delta = subject.diff(dsl)
@@ -225,8 +225,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when with ignore tables option (target)' do
-    let(:current_schema) {
-      <<-EOS
+    let(:current_schema) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -243,11 +243,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:dsl) {
-      <<-EOS
+    let(:dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 15, null: false
@@ -264,11 +264,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:before_dsl) {
-      <<-EOS
+    let(:before_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -276,11 +276,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
-    let(:after_dsl) {
-      <<-EOS
+    let(:after_dsl) do
+      <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 15, null: false
@@ -288,11 +288,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     before { subject.diff(current_schema).migrate }
-    subject { client(tables: ["employees"]) }
+    subject { client(tables: ['employees']) }
 
     it {
       delta = subject.diff(dsl)