ridgepole 0.7.2.beta → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7319dc643a56f2417a20536a52d64d6b83abb83b
-  data.tar.gz: '088ee747f3c078b55b1c9ce32bc0ace3969502c5'
+  metadata.gz: 40108f2b75644df8ce23f3d8a1aa0ee2107aa25c
+  data.tar.gz: fa253124674f5d34a96b0db3ba0e7594cbf42fdb
 SHA512:
-  metadata.gz: 60e566a779bd9e5beb702b950ad738946c7b3df77b0d0249ee1dfd0b11b395f25b44470dde0f40848cb9dbc4715b2e09da3abe160ea88ffbc7c9f3f6924dfc10
-  data.tar.gz: 56bddabd3f673ab2e803891fe298732b33c28b23e529104647e9f43e56e57fc2c0ed36e2d487fb49ca723da3d79fb5fe8d76890a24c0876345330770173bde9e
+  metadata.gz: 5a12b6e017baf87cca9aae8b817c503efa4dfffbcffc7b2ffc5ab9e96278bbbebe0d7f06d8af034da55a2dd20fae70d35a8d4ba4b70f327ae95f9690f564aff3
+  data.tar.gz: ac5e4ef666a799b883f87238a4b35cd48d47b8e04d67152205c3ce19392f425d98126de95274ee660cb474097421f85fcfe29f0df05c7b5c40f0e15448f1ba21

data/.travis.yml

@@ -9,7 +9,9 @@ rvm:
   - 2.2.9
   - 2.3.6
   - 2.4.3
+  - 2.5.0
 before_install:
+  - gem update --system
   - gem install bundler
 before_script:
   - sudo service mysql stop

data/Appraisals

@@ -1,5 +1,6 @@
 appraise 'activerecord-5.0' do
   gem 'activerecord', '~> 5.0.1'
+  gem "pg", "< 1.0.0"
 end
 
 appraise 'activerecord-5.1' do
@@ -8,8 +9,5 @@ end
 
 appraise 'activerecord-5.2' do
   gem 'mysql2', '~> 0.4.4'
-
-  git 'https://github.com/rails/rails.git' do
-    gem 'activerecord', '>= 5.2.0.beta2', '< 6'
-  end
+  gem 'activerecord', '~> 5.2.0'
 end

data/README.md

@@ -5,10 +5,6 @@ Ridgepole is a tool to manage DB schema.
 It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps), and updates DB schema according to DSL.
 (like Chef/Puppet)
 
-[![Prev Version](https://img.shields.io/badge/prev_version-0.6.6-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.rc1)
-[![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.6)](https://travis-ci.org/winebarrel/ridgepole)
-[![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.6)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.6)
-
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.7)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7)
@@ -277,7 +273,11 @@ add_index "books", ["author_id"], name: "idx_author_id", using: :btree
 
 execute("ALTER TABLE books ADD CONSTRAINT fk_author FOREIGN KEY (author_id) REFERENCES authors (id)") do |c|
   # Execute SQL only if there is no foreign key
-  c.raw_connection.query("SELECT 1 FROM information_schema.key_column_usage WHERE TABLE_SCHEMA = 'bookshelf' AND CONSTRAINT_NAME = 'fk_author' LIMIT 1").each.length.zero?
+  c.raw_connection.query(<<-SQL).each.length.zero?
+    SELECT 1 FROM information_schema.key_column_usage
+     WHERE TABLE_SCHEMA = 'bookshelf'
+       AND CONSTRAINT_NAME = 'fk_author' LIMIT 1
+  SQL
 end
 ```
 

data/gemfiles/activerecord_5.0.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.1"
+gem "pg", "< 1.0.0"
 
 gemspec path: "../"

data/gemfiles/activerecord_5.2.gemfile

@@ -2,10 +2,7 @@
 
 source "https://rubygems.org"
 
-git "https://github.com/rails/rails.git" do
-  gem "activerecord", ">= 5.2.0.beta2", "< 6"
-end
-
 gem "mysql2", "~> 0.4.4"
+gem "activerecord", "~> 5.2.0"
 
 gemspec path: "../"

data/lib/ridgepole/diff.rb

@@ -139,9 +139,9 @@ class Ridgepole::Diff
     to: #{to.slice(*PRIMARY_KEY_OPTIONS)}
         EOS
       end
-      from = from.except(*PRIMARY_KEY_OPTIONS)
-      to = to.except(*PRIMARY_KEY_OPTIONS)
     end
+    from = from.except(*PRIMARY_KEY_OPTIONS)
+    to = to.except(*PRIMARY_KEY_OPTIONS)
 
     unless from == to
       @logger.warn(<<-EOS)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.2.beta'
+  VERSION = '0.7.2'
 end

data/spec/mysql/migrate/migrate_primary_key_spec.rb

@@ -11,28 +11,48 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
   context 'when allow_pk_change option is false' do
     let(:allow_pk_change) { false }
-    let(:expected_dsl) {
-      erbh(<<-EOS)
-        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
-        end
-      EOS
-    }
 
-    it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+    context 'with difference' do
+      let(:expected_dsl) {
+        erbh(<<-EOS)
+          create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+          end
+        EOS
+      }
+
+      it {
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
 [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
+        EOS
 
-      delta = subject.diff(expected_dsl)
-      expect(delta.differ?).to be_falsey
-      delta.migrate
-      expect(subject.dump).to match_ruby actual_dsl
-    }
+        delta = subject.diff(expected_dsl)
+        expect(delta.differ?).to be_falsey
+        delta.migrate
+        expect(subject.dump).to match_ruby actual_dsl
+      }
+    end
+
+    context 'with no difference' do
+      let(:actual_dsl) {
+        erbh(<<-EOS)
+          create_table "employees", unsigned: true, force: :cascade do |t|
+          end
+        EOS
+      }
+      let(:expected_dsl) { actual_dsl }
+
+      it {
+        expect(Ridgepole::Logger.instance).to_not receive(:warn)
+
+        delta = subject.diff(expected_dsl)
+        expect(delta.differ?).to be_falsey
+      }
+    end
   end
 
-  context 'when allow_pk_change option is false' do
+  context 'when allow_pk_change option is true' do
     let(:allow_pk_change) { true }
     let(:expected_dsl) {
       erbh(<<-EOS)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.2.beta
+  version: 0.7.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -402,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13