ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/mysql/migrate/migrate_log_file_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,15 +102,15 @@ 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 }
 
     before { client.diff(actual_dsl).migrate }
 
     it {
-      tempfile("#{File.basename __FILE__}.#{$$}") do |path|
+      tempfile("#{File.basename __FILE__}.#{$PROCESS_ID}") do |path|
         delta = client(log_file: path).diff(expected_dsl)
         expect(delta.differ?).to be_truthy
         expect(client.dump).to match_ruby actual_dsl

data/spec/mysql/migrate/migrate_merge_mode_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when marge 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(merge: 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_noop_spec.rb

@@ -1,8 +1,8 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when no operation' 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,19 +67,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
     subject { client }
 
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      migrated, sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(noop: true)
       expect(migrated).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
 
-      expect(sql).to match_fuzzy erbh(<<-EOS)
+      expect(sql).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
         CREATE TABLE `departments` (`dept_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
@@ -97,18 +97,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`emp_no`)
         CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `emp_no` USING btree ON `titles` (`emp_no`)
-      EOS
+      ERB
     }
 
     it {
-      delta = client(:bulk_change => true).diff(expected_dsl)
+      delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      migrated, sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(noop: true)
       expect(migrated).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
 
       # XXX:
-      expect(sql.gsub('`', '')).to match_fuzzy erbh(<<-EOS).gsub('`', '')
+      expect(sql.delete('`')).to match_fuzzy erbh(<<-ERB).delete('`')
         CREATE TABLE `clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `clubs` ADD UNIQUE INDEX `idx_name` USING btree (`name`)
         CREATE TABLE `departments` (`dept_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
@@ -124,14 +124,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
         ALTER TABLE `salaries` ADD  INDEX `emp_no` USING btree (`emp_no`)
         CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         ALTER TABLE `titles` ADD  INDEX `emp_no` USING btree (`emp_no`)
-      EOS
+      ERB
     }
   end
 
   context 'when no operation' 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
@@ -196,19 +196,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      EOS
-    }
+      RUBY
+    end
 
-    subject { client(:default_int_limit => 11) }
+    subject { client(default_int_limit: 11) }
 
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      migrated, sql = delta.migrate(:noop => true)
+      migrated, sql = delta.migrate(noop: true)
       expect(migrated).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
 
-      expect(sql).to match_fuzzy erbh(<<-EOS)
+      expect(sql).to match_fuzzy erbh(<<-ERB)
         CREATE TABLE `clubs` (`id` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `name` varchar(255) DEFAULT '' NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE UNIQUE INDEX `idx_name` USING btree ON `clubs` (`name`)
         CREATE TABLE `departments` (`dept_no` <%= cond('>= 5.1','bigint NOT NULL', 'int') %> AUTO_INCREMENT PRIMARY KEY, `dept_name` varchar(40) NOT NULL) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
@@ -226,7 +226,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         CREATE  INDEX `emp_no` USING btree ON `salaries` (`emp_no`)
         CREATE TABLE `titles` (`emp_no` int NOT NULL, `title` varchar(50) NOT NULL, `from_date` date NOT NULL, `to_date` date) <%= cond('< 5.2.0.beta2', 'ENGINE=InnoDB') %>
         CREATE  INDEX `emp_no` USING btree ON `titles` (`emp_no`)
-      EOS
+      ERB
     }
   end
 end

data/spec/mysql/migrate/migrate_primary_key_spec.rb

@@ -1,10 +1,10 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:actual_dsl) {
-    erbh(<<-EOS)
+  let(:actual_dsl) do
+    erbh(<<-ERB)
       create_table "employees", id: :integer, unsigned: true, force: :cascade do |t|
       end
-    EOS
-  }
+    ERB
+  end
 
   before { subject.diff(actual_dsl).migrate }
   subject { client(allow_pk_change: allow_pk_change) }
@@ -13,19 +13,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:allow_pk_change) { false }
 
     context 'with difference' do
-      let(:expected_dsl) {
-        erbh(<<-EOS)
+      let(:expected_dsl) do
+        erbh(<<-ERB)
           create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
           end
-        EOS
-      }
+        ERB
+      end
 
       it {
-        expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
 [WARNING] Primary key definition of `employees` differ but `allow_pk_change` option is false
   from: {:id=>:integer, :unsigned=>true}
     to: {:id=>:bigint, :unsigned=>true}
-        EOS
+        MSG
 
         delta = subject.diff(expected_dsl)
         expect(delta.differ?).to be_falsey
@@ -35,12 +35,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     end
 
     context 'with no difference' do
-      let(:actual_dsl) {
-        erbh(<<-EOS)
+      let(:actual_dsl) do
+        erbh(<<-ERB)
           create_table "employees", unsigned: true, force: :cascade do |t|
           end
-        EOS
-      }
+        ERB
+      end
       let(:expected_dsl) { actual_dsl }
 
       it {
@@ -54,8 +54,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when allow_pk_change option is true' do
     let(:allow_pk_change) { true }
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
         end
 
@@ -64,8 +64,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["employee_id"], name: "fk_salaries_employees", <%= i cond(5.0, using: :btree) %>
         end
         add_foreign_key "salaries", "employees", name: "fk_salaries_employees"
-      EOS
-    }
+      ERB
+    end
 
     it {
       delta = subject.diff(expected_dsl)

data/spec/mysql/migrate/migrate_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 }
@@ -136,10 +136,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 <<-EOS
+      expect(delta.script).to match_fuzzy <<-RUBY
         change_table("dept_emp", {:bulk => true}) do |t|
           t.rename("from_date", "from_date2")
         end
@@ -151,7 +151,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         change_table("employees", {:bulk => true}) do |t|
           t.rename("gender", "gender2")
         end
-      EOS
+      RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
@@ -161,8 +161,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     before { restore_tables }
     subject { client }
 
-    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
@@ -170,13 +170,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender2", limit: 1, null: false, renamed_from: 'age'
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      RUBY
+    end
 
     it {
-      expect {
+      expect do
         subject.diff(dsl)
-      }.to raise_error('Column `age` not found')
+      end.to raise_error('Column `age` not found')
     }
   end
 end

data/spec/mysql/migrate/migrate_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,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 }
@@ -137,8 +137,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
   end
 
   context 'when rename table (dry-run)' 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
@@ -156,11 +156,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date",             null: false
           t.index ["first_name"], name: "first_name", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees2", primary_key: "emp_no", force: :cascade, renamed_from: 'employees' do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -178,8 +178,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.date   "hire_date",             null: false
           t.index ["first_name"], name: "first_name", <%= i cond(5.0, using: :btree) %>
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client }
@@ -197,8 +197,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     before { restore_tables }
     subject { client }
 
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "employees2", primary_key: "emp_no", force: :cascade, renamed_from: 'not_employees' do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -206,11 +206,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] The table `not_employees` to be renamed does not exist.")
+      expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] The table `not_employees` to be renamed does not exist.')
       subject.diff(dsl)
     }
   end
@@ -219,8 +219,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     before { subject.diff(dsl).migrate }
     subject { client }
 
-    let(:dsl) {
-      erbh(<<-EOS)
+    let(:dsl) do
+      erbh(<<-ERB)
         create_table "employees2", primary_key: "emp_no", force: :cascade, renamed_from: 'employees' do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -228,11 +228,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     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`.')
       subject.diff(dsl)
     }
   end