ridgepole 0.7.0.beta4 → 0.7.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c969f9221316f89684fa4fd05a7b85476796bfa5
-  data.tar.gz: 0c0a78110650aaa73229e392938a836a647a606f
+  metadata.gz: d63e13051bdf5f02a615adabd88bd5f3d74a87f8
+  data.tar.gz: ebe4a70a6df6bb7df7169ac0bc3756c723aedf17
 SHA512:
-  metadata.gz: 647362e0b261bcb4e452b5633a4bcaed77cd626409b70717c4bacf6e1bb5d5c7c9abb7868467d184711a5a1cf4f7badfcddb25bae3c2648019e0572b8d8f13d9
-  data.tar.gz: e514c6f90fe30e49d03153ba6e7d87824c86bee9448f0163a7fcca3a814a0c5fc03d5691d5ea86098d7b176f6bb5a386472e9929fab65616d81977b2fb4b3658
+  metadata.gz: 8bc21046e4ada603467911d1a906b20145c9c4c6269194521d4f9a0c0832f6a236df822a78fbac0efc108522f83236ffbd253d10d93e009255e1596f0dc40302
+  data.tar.gz: f873f574b65d746a9bc7e043dee9087e235266778f4af81cf91b7f329e529c23cdbacf24fd61f6b03528eb43bf3d9d6c72ec9a8bab24e06d1bb2c80099ca35f7

data/README.md

@@ -9,7 +9,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 [![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)
 
-[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta4-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta4)
+[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta5-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta5)
 [![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)
 

data/lib/ridgepole.rb

@@ -10,10 +10,10 @@ require 'active_support'
 require 'active_support/core_ext'
 
 require 'diffy'
-require 'pp_sort_hash'
 
 module Ridgepole; end
 
+require 'ridgepole/ext/pp_sort_hash'
 require 'ridgepole/client'
 require 'ridgepole/connection_adapters'
 require 'ridgepole/default_limit'

data/lib/ridgepole/diff.rb

@@ -407,6 +407,9 @@ class Ridgepole::Diff
   end
 
   def diff_inspect(obj1, obj2, options = {})
+    obj1 = Ridgepole::Ext::PpSortHash.extend_if_hash(obj1)
+    obj2 = Ridgepole::Ext::PpSortHash.extend_if_hash(obj2)
+
     diffy = Diffy::Diff.new(
       obj1.pretty_inspect,
       obj2.pretty_inspect,

data/lib/ridgepole/ext/pp_sort_hash.rb

@@ -0,0 +1,29 @@
+module Ridgepole
+  module Ext
+    module PpSortHash
+      def pretty_print(q)
+        q.group(1, '{', '}') {
+          q.seplist(self.sort_by {|k, _| k.to_s } , nil, :each) {|k, v|
+            q.group {
+              q.pp k
+              q.text '=>'
+              q.group(1) {
+                q.breakable ''
+                q.pp v
+              }
+            }
+          }
+        }
+      end
+
+      def self.extend_if_hash(obj)
+        if obj.kind_of?(Hash)
+          obj = obj.dup
+          obj.extend(self)
+        end
+
+        obj
+      end
+    end
+  end
+end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.beta4'
+  VERSION = '0.7.0.beta5'
 end

data/ridgepole.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 5.0.1', '< 6'
   spec.add_dependency 'diffy'
-  spec.add_dependency 'pp_sort_hash'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

data/spec/mysql/migrate/migrate_with_verbose_log_spec.rb

@@ -45,7 +45,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         "#   employees",
         "# Compare definitions",
         "#   employees",
-        " {:definition=>\n   {\"birth_date\"=>{:options=>{:null=>false}, :type=>:date},\n    \"first_name\"=>{:options=>{:limit=>14, :null=>false}, :type=>:string},\n-   \"gender\"=>{:options=>{:limit=>1, :null=>false}, :type=>:string},\n+   \"gender2\"=>{:options=>{:limit=>1, :null=>false}, :type=>:string},\n    \"hire_date\"=>{:options=>{:null=>false}, :type=>:date},\n    \"last_name\"=>{:options=>{:limit=>16, :null=>false}, :type=>:string}},\n  :options=>{:primary_key=>\"emp_no\"}}",
+        "   {\"birth_date\"=>{:type=>:date, :options=>{:null=>false}},\n    \"first_name\"=>{:type=>:string, :options=>{:limit=>14, :null=>false}},\n    \"last_name\"=>{:type=>:string, :options=>{:limit=>16, :null=>false}},\n-   \"gender\"=>{:type=>:string, :options=>{:limit=>1, :null=>false}},\n+   \"gender2\"=>{:type=>:string, :options=>{:limit=>1, :null=>false}},\n    \"hire_date\"=>{:type=>:date, :options=>{:null=>false}}},\n  :options=>{:primary_key=>\"emp_no\"}}",
         "# Load tables",
         "#   employees",
         "# Load tables",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta4
+  version: 0.7.0.beta5
 platform: ruby
 authors:
 - Genki Sugawara
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pp_sort_hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +233,7 @@ files:
 - lib/ridgepole/execute_expander.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/disable_table_options.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb
+- lib/ridgepole/ext/pp_sort_hash.rb
 - lib/ridgepole/ext/schema_dumper.rb
 - lib/ridgepole/external_sql_executer.rb
 - lib/ridgepole/logger.rb