ridgepole 0.7.1 → 0.7.2.beta

data/spec/postgresql/migrate/migrate_ext_cols_spec.rb

@@ -54,9 +54,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/postgresql/migrate/migrate_references_spec.rb

@@ -3,8 +3,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.index "products_id"
           t.index "user_id"
         end
@@ -32,9 +32,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.string "products_type"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
           t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
@@ -63,8 +63,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.<%= cond(5.1, 'bigint', 'integer') %> "products_id"
-          t.<%= cond(5.1, 'bigint', 'integer') %> "user_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
         end
       EOS
     }

data/spec/postgresql/migrate/migrate_rename_column_spec.rb

@@ -128,15 +128,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
     it {
       delta = client(:bulk_change => true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
         change_table("dept_emp", {:bulk => true}) do |t|
           t.rename("from_date", "from_date2")
@@ -147,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
   end
 end

data/spec/postgresql/migrate/migrate_rename_table_spec.rb

@@ -128,9 +128,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: 'employees'/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(/, renamed_from: 'employees'/, '')
     }
   end
 
@@ -165,9 +165,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate(noop: true)
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
     }
   end
 end

data/spec/postgresql/migrate/migrate_same_spec.rb

@@ -2,7 +2,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same' do
     let(:dsl) {
       erbh(<<-EOS)
-        create_table "clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
+        create_table "clubs", <%= i cond('>= 5.1',id: :serial) + {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) %>
         end
@@ -30,13 +30,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
           t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employees", primary_key: "emp_no", <%= i({id: :integer} + cond(5.1, default: nil) + {force: :cascade}) %> do |t|
+        create_table "employees", primary_key: "emp_no", <%= i({id: :integer} + cond('>= 5.1',default: nil) + {force: :cascade}) %> do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
@@ -67,9 +67,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
     }
   end
 end

data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb

@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -24,20 +24,20 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
 
     it {
       delta = client(bulk_change: true, dump_with_default_fk_name: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
         add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -40,7 +40,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
 
     it {
@@ -51,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
       EOS
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 

data/spec/spec_condition.rb

@@ -29,6 +29,13 @@ module SpecCondition
       ActiveRecord::VERSION::STRING =~ version_or_cond
     when Float
       ActiveRecord::VERSION::STRING.start_with?(version_or_cond.to_s)
+    when /\s+/
+      ar_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+
+      version_or_cond.split(',').all? do |ope_version|
+        ope, version = ope_version.strip.split(/\s+/, 2)
+        ar_version.send(ope, Gem::Version.new(version))
+      end
     when String
       ActiveRecord::VERSION::STRING.start_with?(version_or_cond)
     else

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ require 'open3'
 require 'tempfile'
 require 'json'
 require 'rspec/match_fuzzy'
+require 'rspec/match_ruby'
 require 'erbh'
 require 'hash_modern_inspect'
 require 'hash_order_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -198,6 +198,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: rspec-match_ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email:
@@ -219,6 +233,7 @@ files:
 - docker-compose.yml
 - gemfiles/activerecord_5.0.gemfile
 - gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.2.gemfile
 - lib/ridgepole.rb
 - lib/ridgepole/cli/config.rb
 - lib/ridgepole/client.rb
@@ -387,9 +402,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13