ridgepole 0.6.4 → 0.6.5.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c53abe50208291f89c751bb47e3b9db9b524c45
-  data.tar.gz: 85babaf19329e4ccfe3ec9131b6a17cc548540c1
+  metadata.gz: 1afe38c33e11fab6506b3b4803488aec6058ddfb
+  data.tar.gz: 84819c79b7e1d2756f84682f2749ee9c51f09181
 SHA512:
-  metadata.gz: 6913c4d2e9b388486f4ca9ec3eb1ccac6d86e5ac62d573c3fea97ed921415085fd1191347c55da44baeb7d1fa1ad936907e41e8707462c2f93c8edaf44c67f45
-  data.tar.gz: cca33607a613f756c5d0d596a83bbdc6b63e2371e2ebf08951fdb9b03749de9dfc928f1d8fe9bc5e41b7139e60a25ec93adf07b844b3f7015f2ed2243e2b9381
+  metadata.gz: a1c834a74ee2b5f861f0a29fccb41b5411dfb9013aeebc9823ae5232a5994ee6b1b14075a1a74b85af005df6f9c4f799f375b7ac3ffd39ba8e1d1a9448404db5
+  data.tar.gz: 7153c5acdb81e28810c40049490a321ade6bd2f986b0d4a64435cb227ee1d73dd63480e5c8be0af2691af7333775d5664f4852f7281cd24c7091e2bd70fea99d

data/.gitignore

@@ -21,3 +21,4 @@ Schemafile
 *.schema
 _site/
 config.yml
+/gemfiles/*.lock

data/.travis.yml

@@ -1,26 +1,36 @@
 dist: trusty
 sudo: required
 language: ruby
-cache: bundler
+cache:
+  - bundler
+  - apt
 rvm:
-  - 2.0.0
-  - 2.1.8
   - 2.2.4
   - 2.3.0
 before_install:
   - gem install bundler
+  - sudo service postgresql stop
+before_script:
+  - docker-compose up -d
+  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
+  - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 > /dev/null 2> /dev/null; }
+  - for i in {1..60}; do mysql_ping && break; sleep 1; done
+  - for i in {1..60}; do pg_ping && break; sleep 1; done
 script:
-  - bundle install
   - bundle exec rake
+gemfile:
+  - gemfiles/activerecord_4.2.gemfile
+  #- gemfiles/activerecord_5.0.gemfile
 env:
   matrix:
     - ENABLE_MYSQL_AWESOME=0
     - ENABLE_MYSQL_AWESOME=1
     - POSTGRESQL=1
+services:
+  - docker
 addons:
-  postgresql: "9.4"
   apt:
     packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+      - mysql-client-core-5.6
+      - mysql-client-5.6
+      - postgresql-client-9.4

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "activerecord-4.2" do
+  gem 'activerecord', '~> 4.2.0'
+  gem 'activerecord-mysql-awesome', '>= 0.0.7'
+end
+
+appraise 'activerecord-5.0' do
+  gem 'activerecord', '>= 5.0.0.beta3'
+end

data/README.md

@@ -50,6 +50,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support `t.index` ([pull#64](https://github.com/winebarrel/ridgepole/pull/64))
   * Remove migration_comments
   * Fix foreign key apply order
+* `>= 0.6.5`
+  * Fix rails version '>= 4.2', '< 6'
 
 ## Installation
 
@@ -307,13 +309,35 @@ $ ridgepole -a -c database.yml --mysql-use-alter --debug
 Apply `Schemafile`
 ...
 -- remove_index("dept_manager", {:name=>"emp_no"})
-   (19.2ms)  ALTER TABLE `dept_manager` DROP INDEX `emp_no`,LOCK=NONE
+   (19.2ms)  ALTER TABLE `dept_manager` DROP INDEX `emp_no`
    -> 0.0200s
 -- add_index("dept_manager", ["emp_no"], {:name=>"emp_no2", :using=>:btree})
-   (23.4ms)  ALTER TABLE `dept_manager` ADD  INDEX `emp_no2` USING btree (`emp_no`),LOCK=NONE
+   (23.4ms)  ALTER TABLE `dept_manager` ADD  INDEX `emp_no2` USING btree (`emp_no`)
    -> 0.0243s
 ```
 
+## Running tests
+
+```sh
+docker-compose up -d
+bundle install
+bundle exec appraisal install
+bundle exec appraisal activerecord-4.2 rake
+# ENABLE_MYSQL_AWESOME=1 bundle exec appraisal activerecord-4.2 rake
+# POSTGRESQL=1 bundle exec appraisal activerecord-4.2 rake
+```
+
+**Notice:** mysql-client/postgresql-client is required.
+
+### on OS X (docker-machine & VirtualBox)
+
+Port forwarding is required.
+
+```sh
+VBoxManage controlvm default natpf1 "mysql,tcp,127.0.0.1,3306,,3306"
+VBoxManage controlvm default natpf1 "psql,tcp,127.0.0.1,5432,,5432"
+```
+
 ## Demo
 
 * [asciinema.org/a/9349](https://asciinema.org/a/9349)

data/docker-compose.yml

@@ -0,0 +1,12 @@
+mysql:
+  image: "mysql:5.6"
+  ports:
+    - "3306:3306"
+  environment:
+    MYSQL_ROOT_PASSWORD: password
+postgres:
+  image: "postgres:9.4"
+  ports:
+    - "5432:5432"
+  environment:
+    POSTGRES_PASSWORD: password

data/gemfiles/activerecord_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0"
+gem "activerecord-mysql-awesome", ">= 0.0.7"
+
+gemspec :path => "../"

data/gemfiles/activerecord_5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 5.0.0.beta3"
+
+gemspec :path => "../"

data/lib/ridgepole/diff.rb

@@ -88,7 +88,9 @@ class Ridgepole::Diff
 
   def scan_options_change(table_name, from, to, table_delta)
     unless from == to
-      Ridgepole::Logger.instance.warn("[WARNING] No difference of schema configuration for table `#{table_name}`. (if you changed some options, please reconfirm your Schemafile)")
+      Ridgepole::Logger.instance.warn("[WARNING] No difference of schema configuration for table `#{table_name}` but table options differ.")
+      Ridgepole::Logger.instance.warn("  from: #{from}")
+      Ridgepole::Logger.instance.warn("    to: #{to}")
     end
   end
 

data/lib/ridgepole/version.rb

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

data/ridgepole.gemspec

@@ -18,12 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '~> 4.2.1'
+  spec.add_dependency 'activerecord', '>= 4.2', '< 6'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'mysql2', '~> 0.3.20'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'activerecord-mysql-awesome', '>= 0.0.7'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.2'
+  spec.add_development_dependency 'erbh'
+  spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
+  spec.add_development_dependency 'hash_order_helper', '>= 0.1.1'
 end

data/spec/cli_helper.rb

@@ -0,0 +1,63 @@
+module CLIHelper
+  def default_cli_hook
+    <<-RUBY.strip_heredoc
+      require 'ridgepole'
+
+      class Ridgepole::Delta
+        def initialize(*args);
+        end
+        def migrate(*args)
+          puts "Ridgepole::Delta#migrate"
+          [#{differ}, "create_table :table do\\nend"]
+        end
+        def script
+          puts "Ridgepole::Delta#script"
+
+          "create_table :table do\\nend"
+        end
+        def differ?
+          puts "Ridgepole::Delta#differ?"
+          #{differ}
+        end
+      end
+
+      class Ridgepole::Client
+        def initialize(*args)
+          puts "Ridgepole::Client#initialize([\#{args.map {|i| i.kind_of?(File) ? i.path : i.inspect}.join(', ')}])"
+        end
+        def dump
+          puts "Ridgepole::Client#dump"
+        end
+        def diff(*args)
+          puts "Ridgepole::Client#diff"
+          Ridgepole::Delta.new
+        end
+        class << self
+          def diff(*args)
+            puts "Ridgepole::Client.diff([\#{args.map {|i| i.kind_of?(File) ? i.path : i.inspect}.join(', ')}])"
+            Ridgepole::Delta.new
+          end
+          def dump(args)
+            puts "Ridgepole::Client.dump"
+          end
+        end
+      end
+    RUBY
+  end
+
+  def run_cli(options = {})
+    args = options[:args] || []
+    hook = options[:hook] || default_cli_hook
+    path = File.expand_path('../../bin/ridgepole', __FILE__)
+
+    Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.rb']) do |f|
+      f.puts(hook)
+      f.puts(File.read(path))
+      f.flush
+
+      cmd = ([:ruby, f.path] + args).join(' ')
+      Open3.capture2e(cmd)
+    end
+  end
+end
+include CLIHelper

data/spec/mysql/bigint_pk/bigint_pk_spec.rb

@@ -0,0 +1,45 @@
+describe 'Ridgepole::Client (with bigint pk)', condition: [:mysql_awesome_enabled] do
+  let(:dsl1) {
+    <<-RUBY
+      create_table "books", id: :primary_key, limit: 8, force: :cascade do |t|
+        t.string   "title",      limit: 255, null: false
+        t.integer  "author_id",  limit: 4,   null: false
+        t.datetime "created_at"
+        t.datetime "updated_at"
+      end
+    RUBY
+  }
+
+  let(:dsl2) {
+    <<-RUBY
+      create_table "books", id: :bigint, force: :cascade do |t|
+        t.string   "title",      limit: 255, null: false
+        t.integer  "author_id",  limit: 4,   null: false
+        t.datetime "created_at"
+        t.datetime "updated_at"
+      end
+    RUBY
+  }
+
+  context 'when with limit:8' do
+    subject { client }
+
+    before { subject.diff(dsl1).migrate }
+
+    it {
+      expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
+      expect(subject.dump).to match_fuzzy dsl2
+    }
+  end
+
+  context 'when with id:bigint' do
+    subject { client }
+
+    before { subject.diff(dsl2).migrate }
+
+    it {
+      expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
+      expect(subject.dump).to match_fuzzy dsl2
+    }
+  end
+end

data/spec/mysql/cli/config_spec.rb

@@ -1,4 +1,3 @@
-unless postgresql?
 describe Ridgepole::Config do
   subject { Ridgepole::Config.load(config, env) }
 
@@ -86,4 +85,3 @@ describe Ridgepole::Config do
     }
   end
 end
-end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -1,15 +1,18 @@
-unless postgresql?
 describe 'ridgepole' do
   let(:differ) { false }
   let(:conf) { "'" + JSON.dump(conn_spec) + "'" }
 
+  def conn_spec_str(database)
+    ActiveSupport::HashWithIndifferentAccess.new(conn_spec(database: database)).inspect
+  end
+
   context 'when help' do
     it do
       out, status = run_cli(:args => ['-h'])
-      out = out.gsub(/Usage: .*\n/, '').strip_heredoc
+      out = out.gsub(/Usage: .*\n/, '')
 
       expect(status.success?).to be_truthy
-      expect(out).to eq <<-EOS.strip_heredoc
+      expect(out).to match_fuzzy <<-EOS
         -c, --config CONF_OR_FILE
         -E, --env ENVIRONMENT
         -a, --apply
@@ -56,8 +59,8 @@ describe 'ridgepole' do
       out, status = run_cli(:args => ['-c', conf, '-e', conf, conf])
 
       expect(status.success?).to be_truthy
-      expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-        Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+      expect(out).to match_fuzzy <<-EOS
+        Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
         # Export Schema
         Ridgepole::Client#dump
       EOS
@@ -68,8 +71,8 @@ describe 'ridgepole' do
         out, status = run_cli(:args => ['-c', conf, '-e', '-o', f.path])
 
         expect(status.success?).to be_truthy
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-          Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+        expect(out).to match_fuzzy <<-EOS
+          Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
           Export Schema to `#{f.path}`
           Ridgepole::Client#dump
         EOS
@@ -80,8 +83,8 @@ describe 'ridgepole' do
       out, status = run_cli(:args => ['-c', conf, '-e', '-o', '-'])
 
       expect(status.success?).to be_truthy
-      expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-        Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+      expect(out).to match_fuzzy <<-EOS
+        Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
         # Export Schema
         Ridgepole::Client#dump
       EOS
@@ -91,8 +94,8 @@ describe 'ridgepole' do
       out, status = run_cli(:args => ['-c', conf, '-e', '--split'])
 
       expect(status.success?).to be_truthy
-      expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-        Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+      expect(out).to match_fuzzy <<-EOS
+        Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
         Export Schema
         Ridgepole::Client#dump
           write `Schemafile`
@@ -104,8 +107,8 @@ describe 'ridgepole' do
         out, status = run_cli(:args => ['-c', conf, '-e', '--split', '-o', f.path, conf, conf])
 
         expect(status.success?).to be_truthy
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-          Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+        expect(out).to match_fuzzy <<-EOS
+          Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
           Export Schema
           Ridgepole::Client#dump
             write `#{f.path}`
@@ -119,8 +122,8 @@ describe 'ridgepole' do
       out, status = run_cli(:args => ['-c', conf, '-a'])
 
       expect(status.success?).to be_truthy
-      expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-        Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+      expect(out).to match_fuzzy <<-EOS
+        Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
         Apply `Schemafile`
         Ridgepole::Client#diff
         Ridgepole::Delta#differ?
@@ -131,7 +134,7 @@ describe 'ridgepole' do
 
     it 'apply with conf file' do
       Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yml']) do |conf_file|
-        conf_file.puts <<-EOS.strip_heredoc
+        conf_file.puts <<-EOS
           adapter: mysql2
           database: ridgepole_test_for_conf_file
         EOS
@@ -140,7 +143,7 @@ describe 'ridgepole' do
         out, status = run_cli(:args => ['-c', conf_file.path, '-a', '--debug'])
 
         expect(status.success?).to be_truthy
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
+        expect(out).to match_fuzzy <<-EOS
           Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, {:dry_run=>false, :debug=>true}])
           Apply `Schemafile`
           Ridgepole::Client#diff
@@ -153,7 +156,7 @@ describe 'ridgepole' do
 
     it 'apply with conf file (production)' do
       Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yml']) do |conf_file|
-        conf_file.puts <<-EOS.strip_heredoc
+        conf_file.puts <<-EOS
           development:
             adapter: mysql2
             database: ridgepole_development
@@ -166,7 +169,7 @@ describe 'ridgepole' do
         out, status = run_cli(:args => ['-c', conf_file.path, '-a', '--debug'])
 
         expect(status.success?).to be_truthy
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
+        expect(out).to match_fuzzy <<-EOS
           Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_development"}, {:dry_run=>false, :debug=>true}])
           Apply `Schemafile`
           Ridgepole::Client#diff
@@ -181,8 +184,8 @@ describe 'ridgepole' do
       out, status = run_cli(:args => ['-c', conf, '-a', '--dry-run'])
 
       expect(status.success?).to be_truthy
-      expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-        Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>true, :debug=>false}])
+      expect(out).to match_fuzzy <<-EOS
+        Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>true, :debug=>false}])
         Apply `Schemafile` (dry-run)
         Ridgepole::Client#diff
         Ridgepole::Delta#differ?
@@ -197,8 +200,8 @@ describe 'ridgepole' do
         out, status = run_cli(:args => ['-c', conf, '-a'])
 
         expect(status.success?).to be_truthy
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-          Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+        expect(out).to match_fuzzy <<-EOS
+          Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
           Apply `Schemafile`
           Ridgepole::Client#diff
           Ridgepole::Delta#differ?
@@ -210,8 +213,8 @@ describe 'ridgepole' do
         out, status = run_cli(:args => ['-c', conf, '-a', '--dry-run'])
 
         expect(status.success?).to be_truthy
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-          Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>true, :debug=>false}])
+        expect(out).to match_fuzzy <<-EOS
+          Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>true, :debug=>false}])
           Apply `Schemafile` (dry-run)
           Ridgepole::Client#diff
           Ridgepole::Delta#differ?
@@ -233,9 +236,9 @@ describe 'ridgepole' do
       out, status = run_cli(:args => ['-c', conf, '-d', conf, conf])
 
       expect(status.success?).to be_truthy
-      expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-        Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-        Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+      expect(out).to match_fuzzy <<-EOS
+        Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+        Ridgepole::Client.diff([#{conn_spec_str("ridgepole_test")}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
         Ridgepole::Delta#differ?
       EOS
     end
@@ -249,9 +252,9 @@ describe 'ridgepole' do
         # Exit code 1 if there is a difference
         expect(status.success?).to be_falsey
 
-        expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-          Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-          Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+        expect(out).to match_fuzzy <<-EOS
+          Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+          Ridgepole::Client.diff([#{conn_spec_str("ridgepole_test")}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
           Ridgepole::Delta#differ?
           Ridgepole::Delta#script
           Ridgepole::Delta#script
@@ -268,7 +271,7 @@ describe 'ridgepole' do
     context 'when config file' do
       it '.yml' do
         Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yml']) do |conf_file|
-          conf_file.puts <<-EOS.strip_heredoc
+          conf_file.puts <<-EOS
             adapter: mysql2
             database: ridgepole_test_for_conf_file
           EOS
@@ -278,9 +281,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-            Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+          expect(out).to match_fuzzy <<-EOS
+            Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end
@@ -288,7 +291,7 @@ describe 'ridgepole' do
 
       it '.yml (file2)' do
         Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yml']) do |conf_file|
-          conf_file.puts <<-EOS.strip_heredoc
+          conf_file.puts <<-EOS
             adapter: mysql2
             database: ridgepole_test_for_conf_file
           EOS
@@ -298,9 +301,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-            Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, {:dry_run=>false, :debug=>false}])
+          expect(out).to match_fuzzy <<-EOS
+            Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([#{conn_spec_str("ridgepole_test")}, {"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end
@@ -308,7 +311,7 @@ describe 'ridgepole' do
 
       it '.yml (development)' do
         Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yml']) do |conf_file|
-          conf_file.puts <<-EOS.strip_heredoc
+          conf_file.puts <<-EOS
             development:
               adapter: mysql2
               database: ridgepole_development
@@ -322,9 +325,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-            Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_development"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+          expect(out).to match_fuzzy <<-EOS
+            Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_development"}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end
@@ -332,7 +335,7 @@ describe 'ridgepole' do
 
       it '.yml (production)' do
         Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yml']) do |conf_file|
-          conf_file.puts <<-EOS.strip_heredoc
+          conf_file.puts <<-EOS
             development:
               adapter: mysql2
               database: ridgepole_development
@@ -346,9 +349,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-            Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_production"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+          expect(out).to match_fuzzy <<-EOS
+            Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_production"}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end
@@ -356,7 +359,7 @@ describe 'ridgepole' do
 
       it '.yaml' do
         Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.yaml']) do |conf_file|
-          conf_file.puts <<-EOS.strip_heredoc
+          conf_file.puts <<-EOS
             adapter: mysql2
             database: ridgepole_test_for_conf_file
           EOS
@@ -366,9 +369,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-            Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+          expect(out).to match_fuzzy <<-EOS
+            Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([{"adapter"=>"mysql2", "database"=>"ridgepole_test_for_conf_file"}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end
@@ -376,7 +379,7 @@ describe 'ridgepole' do
 
       it '.rb' do
         Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.rb']) do |conf_file|
-          conf_file.puts <<-EOS.strip_heredoc
+          conf_file.puts <<-EOS
             create_table :table do
             end
           EOS
@@ -386,9 +389,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
-            Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff([#{conf_file.path}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+          expect(out).to match_fuzzy <<-EOS
+            Ridgepole::Client#initialize([#{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([#{conf_file.path}, #{conn_spec_str("ridgepole_test")}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end
@@ -396,4 +399,3 @@ describe 'ridgepole' do
     end
   end
 end
-end