ridgepole 0.6.5.beta7 → 0.6.5.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bfdbdbe18ee81346ff1898576d11df4ab60a503
-  data.tar.gz: 9b02af4d28f9c6ff7197c14f9a65bc895ec09e7e
+  metadata.gz: 8adb357a8559da5ebe42cc89f6e8916c2c387c39
+  data.tar.gz: f03ec0b86a0289241ebb64c42fa9eb0d3bdbdd6c
 SHA512:
-  metadata.gz: 41c250fe64085736fb1358234bc6a62cfa13bed0c141b13628ed75d3fdd2aa2243d28e6661d3ba1807635f0d333f129456c13ad5c1f7dfb9a9afd019d4764bd2
-  data.tar.gz: 3fd83db98c3e39b9a2e15b301da56fd38699a970dc79361975146d998e8bf050ccf3caf8cf279b9adf5c105025296a5e5fccf0c2432c4e2017c6e3e0c2d82f75
+  metadata.gz: ab0dd2cc1ad788f6728407421f9b77ea81f641f8d8ea7d665a6fef4e6123c2dbb59db72bcdb01192d12c338622db356f0b82edeaf24df0be3a6b922606e65b3b
+  data.tar.gz: 8fa5ba2e3478b9e83c3da2bb332452e717b57da509b54385de35c2ef6c6a4efe41d7de25b86155c15ed74ead0cc0be958f52bed291a635f8ce2c4c47c4a8fbaf

data/README.md

@@ -55,6 +55,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support new types ([pull#84](https://github.com/winebarrel/ridgepole/pull/84))
   * Support `default: -> { ... }` ([pull#85](https://github.com/winebarrel/ridgepole/pull/85))
   * Support DDL Comment (Rails5 only)
+  * Output schema diff when `--version`
 
 ## Installation
 

data/lib/ridgepole.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'open3'
+require 'pp'
 require 'shellwords'
 require 'singleton'
 require 'stringio'
@@ -8,6 +9,8 @@ require 'active_record'
 require 'active_support'
 require 'active_support/core_ext'
 
+require 'diffy'
+
 module Ridgepole; end
 
 require 'ridgepole/client'

data/lib/ridgepole/diff.rb

@@ -1,6 +1,7 @@
 class Ridgepole::Diff
   def initialize(options = {})
     @options = options
+    @logger = Ridgepole::Logger.instance
   end
 
   def diff(from, to, options = {})
@@ -20,6 +21,12 @@ class Ridgepole::Diff
       next unless target?(table_name)
 
       if (from_attrs = from.delete(table_name))
+        @logger.verbose_info("#   #{table_name}")
+
+        unless (attrs_delta = diff_inspect(from_attrs, to_attrs)).empty?
+          @logger.verbose_info(attrs_delta)
+        end
+
         scan_change(table_name, from_attrs, to_attrs, delta)
       else
         delta[:add] ||= {}
@@ -358,4 +365,14 @@ class Ridgepole::Diff
 
     attrs1 == attrs2
   end
+
+  def diff_inspect(obj1, obj2, options = {})
+    diffy = Diffy::Diff.new(
+      obj1.pretty_inspect,
+      obj2.pretty_inspect,
+      :diff => '-u'
+    )
+
+    diffy.to_s(:text).gsub(/\s+\z/m, '')
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta7'
+  VERSION = '0.6.5.beta8'
 end

data/ridgepole.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '>= 4.2', '< 6'
+  spec.add_dependency 'diffy'
   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

@@ -0,0 +1,64 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'with verbose log' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {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
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", <%= i unsigned(true) + {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
+          t.string "gender2",    limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      verbose_infos = []
+      allow(Ridgepole::Logger.instance).to receive(:verbose_info) {|m| verbose_infos << m }
+
+      Ridgepole::Logger.verbose = true
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+      Ridgepole::Logger.verbose = false
+
+      expected_verbose_infos = [
+        "# Parse DSL",
+        "# Load tables",
+        "#   employees",
+        "# Compare definitions",
+        "#   employees",
+        "# Load tables",
+        "#   employees",
+        "# Load tables",
+        "#   employees",
+      ]
+
+
+      if condition(:mysql_awesome_enabled)
+        expected_verbose_infos << "   {\"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\", :unsigned=>true}}"
+      else
+        expected_verbose_infos << "   {\"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\"}}"
+      end
+
+      expect(verbose_infos).to match_array expected_verbose_infos
+    }
+  end
+end

data/spec/postgresql/migrate/migrate_bigint_spec.rb

@@ -0,0 +1,67 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when add bigint column' do
+    let(:actual_dsl) { '' }
+
+    let(:expected_dsl) {
+      if condition(:activerecord_5)
+        erbh(<<-EOS)
+          create_table "bigint_test", id: false, force: :cascade do |t|
+            t.bigint "b"
+          end
+        EOS
+      else
+        erbh(<<-EOS)
+          create_table "bigint_test", id: false, force: :cascade do |t|
+            t.integer "b", limit: 8
+          end
+        EOS
+      end
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'when no change' do
+    let(:dsl) {
+      erbh(<<-EOS)
+        create_table "bigint_test", id: false, force: :cascade do |t|
+          t.bigint "b"
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      if condition(:activerecord_5)
+        erbh(<<-EOS)
+          create_table "bigint_test", id: false, force: :cascade do |t|
+            t.bigint "b"
+          end
+        EOS
+      else
+        erbh(<<-EOS)
+          create_table "bigint_test", id: false, force: :cascade do |t|
+            t.integer "b", limit: 8
+          end
+        EOS
+      end
+    }
+
+    before { subject.diff(dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta7
+  version: 0.6.5.beta8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  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
@@ -289,6 +303,7 @@ files:
 - spec/mysql/migrate/migrate_with_ignore_tables_spec.rb
 - spec/mysql/migrate/migrate_with_pre_post_query_spec.rb
 - spec/mysql/migrate/migrate_with_tables_spec.rb
+- spec/mysql/migrate/migrate_with_verbose_log_spec.rb
 - spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb
 - spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb
 - spec/mysql/ridgepole_test_database.sql
@@ -303,6 +318,7 @@ files:
 - spec/postgresql/fk/migrate_create_fk_spec.rb
 - spec/postgresql/fk/migrate_drop_fk_spec.rb
 - spec/postgresql/migrate/migrate_add_column_spec.rb
+- spec/postgresql/migrate/migrate_bigint_spec.rb
 - spec/postgresql/migrate/migrate_change_column_default_spec.rb
 - spec/postgresql/migrate/migrate_change_column_spec.rb
 - spec/postgresql/migrate/migrate_change_index_spec.rb
@@ -415,6 +431,7 @@ test_files:
 - spec/mysql/migrate/migrate_with_ignore_tables_spec.rb
 - spec/mysql/migrate/migrate_with_pre_post_query_spec.rb
 - spec/mysql/migrate/migrate_with_tables_spec.rb
+- spec/mysql/migrate/migrate_with_verbose_log_spec.rb
 - spec/mysql/migrate_/migrate_create_index_with_alter_spec.rb
 - spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb
 - spec/mysql/ridgepole_test_database.sql
@@ -429,6 +446,7 @@ test_files:
 - spec/postgresql/fk/migrate_create_fk_spec.rb
 - spec/postgresql/fk/migrate_drop_fk_spec.rb
 - spec/postgresql/migrate/migrate_add_column_spec.rb
+- spec/postgresql/migrate/migrate_bigint_spec.rb
 - spec/postgresql/migrate/migrate_change_column_default_spec.rb
 - spec/postgresql/migrate/migrate_change_column_spec.rb
 - spec/postgresql/migrate/migrate_change_index_spec.rb