ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb

@@ -1,7 +1,7 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
   context 'with warning' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -16,11 +16,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.integer "employee_id"
           t.string  "dept_no", limit: 4, null: false
@@ -36,18 +36,18 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(check_relation_type: 'bigint') }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
 [WARNING] Relation column type is different.
               employees.id: {:type=>:bigint}
   dept_manager.employee_id: {:type=>:integer}
-      EOS
+      MSG
 
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -58,8 +58,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
   end
 
   context 'with unsigned warning' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -74,11 +74,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.bigint "employee_id"
           t.string  "dept_no", limit: 4, null: false
@@ -94,18 +94,18 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(check_relation_type: 'bigint') }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
 [WARNING] Relation column type is different.
               employees.id: {:type=>:bigint, :unsigned=>true}
   dept_manager.employee_id: {:type=>:bigint}
-      EOS
+      MSG
 
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
@@ -116,8 +116,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
   end
 
   context 'without warning' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -132,11 +132,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.bigint "employee_id"
           t.string  "dept_no", limit: 4, null: false
@@ -152,8 +152,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(check_relation_type: 'bigint') }
@@ -169,8 +169,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
   end
 
   context 'with unsigned warning' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
@@ -185,11 +185,11 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_manager", force: :cascade do |t|
           t.bigint "employee_id", unsigned: true
           t.string  "dept_no", limit: 4, null: false
@@ -205,8 +205,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
           t.string  "gender", limit: 1, null: false
           t.date    "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(check_relation_type: 'bigint') }

data/spec/mysql/migrate/migrate_create_index2_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create index (use t.index)' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(: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(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -118,11 +118,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date", null: false
           t.date    "to_date"
         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", limit: 255, default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -184,8 +184,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_create_index_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create index' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(: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(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -118,8 +118,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date    "from_date", null: false
           t.date    "to_date"
         end
-      EOS
-    }
+      ERB
+    end
 
     let(:expected_dsl) { dsl }
 
@@ -135,10 +135,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      delta = client(:bulk_change => true).diff(expected_dsl)
+      delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+      expect(delta.script).to match_fuzzy erbh(<<-ERB)
         change_table("clubs", {:bulk => true}) do |t|
           t.index(["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
         end
@@ -150,7 +150,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         change_table("titles", {:bulk => true}) do |t|
           t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
-      EOS
+      ERB
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
     }

data/spec/mysql/migrate/migrate_create_table_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create table' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(: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(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "departments", primary_key: "dept_no", force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
           t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -102,8 +102,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
 
     let(:expected_dsl) { dsl }
 

data/spec/mysql/migrate/migrate_create_table_with_index_spec.rb

@@ -2,8 +2,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)' do
   context 'when create table' do
     let(:actual_dsl) { '' }
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
           t.integer "emp_no", null: false
           t.string  "dept_no", null: false
@@ -12,8 +12,8 @@ describe 'Ridgepole::Client#diff -> migrate (with index)' do
           t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
           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(create_table_with_index: true) }
@@ -22,7 +22,7 @@ describe 'Ridgepole::Client#diff -> migrate (with index)' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
 
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+      expect(delta.script).to match_fuzzy erbh(<<-ERB)
         create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
           t.column("emp_no", :"integer", {:null=>false, :limit=>4})
           t.column("dept_no", :"string", {:null=>false, :limit=>255})
@@ -31,7 +31,7 @@ describe 'Ridgepole::Client#diff -> migrate (with index)' do
           t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
           t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
-      EOS
+      ERB
 
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate

data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb

@@ -1,15 +1,15 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create table' do
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employee_clubs", force: :cascade do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
     subject { client(table_options: 'ENGINE=MyISAM CHARSET=utf8') }
 
@@ -17,27 +17,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
 
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         create_table("employee_clubs", {:options=>"ENGINE=MyISAM CHARSET=utf8"}) do |t|
           t.column("emp_no", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
           t.column("club_id", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
         end
         add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
-      EOS
+      RUBY
     }
   end
 
   context 'when create table (table definition options takes precedence)' do
-    let(:expected_dsl) {
-      <<-EOS
+    let(:expected_dsl) do
+      <<-RUBY
         create_table "employee_clubs", force: :cascade, options: "ENGINE=InnoDB CHARSET=utf8mb4" do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
     subject { client(table_options: 'ENGINE=MyISAM CHARSET=utf8') }
 
@@ -45,13 +45,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
 
-      expect(delta.script).to match_fuzzy <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         create_table("employee_clubs", {:options=>"ENGINE=InnoDB CHARSET=utf8mb4"}) do |t|
           t.column("emp_no", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
           t.column("club_id", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
         end
         add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
-      EOS
+      RUBY
     }
   end
 end

data/spec/mysql/migrate/migrate_create_table_with_script_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create table' do
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(: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(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "departments", primary_key: "dept_no", force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
           t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
@@ -102,8 +102,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
 
     let(:expected_dsl) { dsl }
 
@@ -115,12 +115,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
 
-      script = <<-EOS
+      script = <<-SHELL
         echo "$1" | #{MYSQL_CLI} #{TEST_SCHEMA}
-      EOS
+      SHELL
 
       tempfile(File.basename(__FILE__), script) do |path|
-        FileUtils.chmod(0755, path)
+        FileUtils.chmod(0o755, path)
         delta.migrate(external_script: path)
       end