ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/diff/diff2_spec.rb

@@ -2,9 +2,9 @@ describe 'Ridgepole::Client.diff' do
   context 'when change column' do
     let(:tmpdir) { Dir.mktmpdir }
 
-    let(:actual_dsl) {
-      open("#{tmpdir}/file1.required", 'w') do |f|
-        f.puts <<-EOS
+    let(:actual_dsl) do
+      File.open("#{tmpdir}/file1.required", 'w') do |f|
+        f.puts <<-RUBY
           create_table "clubs", force: :cascade do |t|
             t.string "name", default: "", null: false
           end
@@ -36,12 +36,12 @@ describe 'Ridgepole::Client.diff' do
 
           add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
           add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
-        EOS
+        RUBY
       end
 
-      f = open("#{tmpdir}/file1", 'w+')
+      f = File.open("#{tmpdir}/file1", 'w+')
 
-      f.puts <<-EOS
+      f.puts <<-RUBY
         require "file1.required"
 
         create_table "employee_clubs", force: :cascade do |t|
@@ -76,16 +76,16 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
+      RUBY
 
       f.flush
       f.rewind
       f
-    }
+    end
 
-    let(:expected_dsl) {
-      open("#{tmpdir}/file2.required", 'w') do |f|
-        f.puts <<-EOS
+    let(:expected_dsl) do
+      File.open("#{tmpdir}/file2.required", 'w') do |f|
+        f.puts <<-RUBY
           create_table "clubs", force: :cascade do |t|
             t.string "name", default: "", null: false
           end
@@ -117,12 +117,12 @@ describe 'Ridgepole::Client.diff' do
 
           add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
           add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
-        EOS
+        RUBY
       end
 
-      f = open("#{tmpdir}/file2", 'w+')
+      f = File.open("#{tmpdir}/file2", 'w+')
 
-      f.puts <<-EOS
+      f.puts <<-RUBY
         require "file2.required"
 
         create_table "employee_clubs", force: :cascade do |t|
@@ -157,12 +157,12 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
+      RUBY
 
       f.flush
       f.rewind
       f
-    }
+    end
 
     subject { Ridgepole::Client }
 
@@ -172,12 +172,12 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_ruby erbh(<<-EOS)
+      expect(delta.script).to match_ruby erbh(<<-ERB)
         change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
 
         change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
         change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-      EOS
+      ERB
     }
 
     after do

data/spec/mysql/diff/diff_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client.diff' do
   context 'when change column' do
-    let(:actual_dsl) {
-      <<-EOS
+    let(:actual_dsl) do
+      <<-RUBY
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -66,11 +66,11 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -135,8 +135,8 @@ describe 'Ridgepole::Client.diff' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
     subject { Ridgepole::Client }
 
@@ -146,12 +146,12 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_ruby erbh(<<-EOS)
+      expect(delta.script).to match_ruby erbh(<<-ERB)
         change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
 
         change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
         change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-      EOS
+      ERB
     }
   end
 
@@ -160,7 +160,7 @@ describe 'Ridgepole::Client.diff' do
 
     it {
       expect(Ridgepole::Logger.instance).to receive(:warn).with(/definition is not found/)
-      subject.diff('', '', :tables => %w(some_table_name))
+      subject.diff('', '', tables: %w[some_table_name])
     }
   end
 end

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client.dump' do
     subject { Ridgepole::Client }
 
     it {
-      expect(subject.dump(conn_spec, dump_without_table_options: true)).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump(conn_spec, dump_without_table_options: true)).to match_fuzzy 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) %>
@@ -62,7 +62,7 @@ describe 'Ridgepole::Client.dump' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
+      ERB
     }
   end
 end

data/spec/mysql/dump/dump_some_tables_spec.rb

@@ -1,10 +1,10 @@
 describe 'Ridgepole::Client#dump' do
   context 'when there is a tables (dump some tables)' do
     before { restore_tables }
-    subject { client(tables: ['employees', 'salaries']) }
+    subject { client(tables: %w[employees salaries]) }
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump).to match_fuzzy erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1', default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -20,25 +20,25 @@ describe 'Ridgepole::Client#dump' do
           t.date    "to_date", null: false
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
+      ERB
     }
   end
 
   context 'when there is a tables (use ignore table)' do
     before { restore_tables }
-    subject {
+    subject do
       client(ignore_tables: [
-        /^clubs$/,
-        /^departments$/,
-        /^dept_emp$/,
-        /^dept_manager$/,
-        /^employee_clubs$/,
-        /^titles$/,
-      ])
-    }
+               /^clubs$/,
+               /^departments$/,
+               /^dept_emp$/,
+               /^dept_manager$/,
+               /^employee_clubs$/,
+               /^titles$/
+             ])
+    end
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump).to match_fuzzy erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1', default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -54,7 +54,7 @@ describe 'Ridgepole::Client#dump' do
           t.date    "to_date", null: false
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
+      ERB
     }
   end
 end

data/spec/mysql/dump/dump_spec.rb

@@ -4,7 +4,7 @@ describe 'Ridgepole::Client#dump' do
     subject { client }
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump).to match_fuzzy 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) %>
@@ -62,7 +62,7 @@ describe 'Ridgepole::Client#dump' do
           t.date    "to_date"
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
+      ERB
     }
   end
 end

data/spec/mysql/dump/dump_unknown_column_type_spec.rb

@@ -4,12 +4,12 @@ describe 'Ridgepole::Client#dump' do
     subject { client }
 
     it {
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump).to match_fuzzy 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) %>
         end
-      EOS
+      ERB
     }
 
     it {
@@ -18,7 +18,7 @@ describe 'Ridgepole::Client#dump' do
     }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] Could not dump table \"places\" because of following StandardError")
+      expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Could not dump table "places" because of following StandardError')
       expect(Ridgepole::Logger.instance).to receive(:warn).with("   Unknown type 'geometry' for column 'location'")
       subject.dump
     }

data/spec/mysql/dump/dump_without_table_options_spec.rb

@@ -1,26 +1,26 @@
 describe 'Ridgepole::Client#dump' do
-  let(:actual_dsl) {
-    erbh(<<-'EOS')
+  let(:actual_dsl) do
+    erbh(<<-'ERB')
       create_table "books", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
         t.string   "title", null: false
         t.integer  "author_id", null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    EOS
-  }
+    ERB
+  end
 
   context 'when without table options' do
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "books", <%= i cond('>= 5.1',id: :bigint) %>, unsigned: true, force: :cascade, comment: "\\"london\\" bridge \\"is\\" falling \\"down\\"" do |t|
           t.string   "title", null: false
           t.integer  "author_id", null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
@@ -11,11 +11,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_actual_dsl) {
-      erbh(<<-EOS)
+    let(:sorted_actual_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -25,11 +25,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -39,8 +39,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
 
@@ -56,8 +56,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when change fk without name' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
         end
 
@@ -67,11 +67,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", on_delete: :cascade
-      EOS
-    }
+      ERB
+    end
 
-    let(:sorted_actual_dsl) {
-      erbh(<<-EOS)
+    let(:sorted_actual_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -81,11 +81,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", on_delete: :cascade
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -95,8 +95,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
 
@@ -112,8 +112,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when drop/add fk with parent table' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -123,11 +123,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent2_id"
           t.index ["parent2_id"], name: "par2_id", <%= i cond(5.0, using: :btree) %>
@@ -137,8 +137,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent2", name: "child_ibfk_2"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -153,8 +153,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when drop/add fk with parent table without name' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
           t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
@@ -164,11 +164,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent"
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent2_id"
           t.index ["parent2_id"], name: "par2_id", <%= i cond(5.0, using: :btree) %>
@@ -178,8 +178,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_foreign_key "child", "parent2"
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }