ridgepole 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b49db08934182bd164f7910335dd04f3843e2e88c8593ab1d89f9bb4d0005d8
-  data.tar.gz: ff49a0ada6cac848407838596d23d93d75714079c0e95528015c4fcb9b2e4f56
+  metadata.gz: e81708c1fcd99a721354e49bdd8281e42657271da21acd80ecbf87e5a6b51890
+  data.tar.gz: d4d2321cfc763a9f23bd9e3d57e16ef5e07c852653e198286ef9d39ef16275b4
 SHA512:
-  metadata.gz: dc24b664af9f8dad9f6c6d21b6eeaa083ad915c42b63b58ce0b7b50386e11c3462b2f30f9819c80f03e5c2a682dadd5a980a355993e8c4e2c8f4a0dc06703242
-  data.tar.gz: c40af5068b9ccbc226d9375b8b7501584a161bdc81554d6612e2c1135346f9dcdbe4a1371657e23bc6d9f70df795e67c8addc6a8b5db538ce658e3588ad3867c
+  metadata.gz: 55bf02b0f28ea259810c140697def6312f937e14cfc023be4aa6da75699844fd654b6d519896691ee1ddf7d1e2c60a12630d3820ce7e5e3505f210f400b02726
+  data.tar.gz: cd121f6363ffb2136a124990c9f373f984a634302d0e8633cfe2f9fc164e0e244eaf0997d52bdd4c3aa618e28b02593f755b8e6485a87dc0b6aba023a3237d45

data/.rubocop.yml

@@ -6,7 +6,7 @@ AllCops:
 Bundler/OrderedGems:
   Include:
     - 'Appraisals'
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false
@@ -18,7 +18,7 @@ Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
+Style/LineLength:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false

data/.travis.yml

@@ -4,11 +4,10 @@ group: edge
 language: ruby
 cache:
   - bundler
-  - apt
 rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 before_script:
   - sudo service mysql stop
   - sudo service postgresql stop
@@ -41,7 +40,5 @@ addons:
       - postgresql-client-9.4
 matrix:
   exclude:
-    - rvm: 2.3.8
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.4.6
+    - rvm: 2.4.9
       gemfile: gemfiles/activerecord_6.0.gemfile

data/README.md

@@ -111,6 +111,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Display a warning if an InnoDB table doesn't have any indexes on a column where it has a foreign key ([pull#290](https://github.com/winebarrel/ridgepole/pull/290))
 * `>= 0.8.5`
   * Improve warning message on table options ([pull#291](https://github.com/winebarrel/ridgepole/pull/291))
+* `>= 0.8.6`
+  * Support multiple databases feature ([pull#297](https://github.com/winebarrel/ridgepole/pull/297))
 </details>
 
 ## Installation
@@ -152,6 +154,7 @@ sudo /opt/ridgepole/embedded/bin/gem install mysql2
 Usage: ridgepole [options]
     -c, --config CONF_OR_FILE
     -E, --env ENVIRONMENT
+    -s, --spec-name SPEC_NAME
     -a, --apply
     -m, --merge
     -f, --file SCHEMAFILE

data/bin/ridgepole

@@ -38,6 +38,7 @@ split = false
 diff_files = nil
 diff_with_apply = false
 exit_code = 0
+spec_name = ''
 
 options = {
   dry_run: false,
@@ -76,6 +77,7 @@ ARGV.options do |opt|
   begin
     opt.on('-c', '--config CONF_OR_FILE') { |v| config = v }
     opt.on('-E', '--env ENVIRONMENT') { |v| env = v }
+    opt.on('-s', '--spec-name SPEC_NAME') { |v| spec_name = v }
     opt.on('-a', '--apply') { set_mode[:apply] }
     opt.on('-m', '--merge') do
       set_mode[:apply]
@@ -168,7 +170,7 @@ begin
   logger = Ridgepole::Logger.instance
   logger.debug = options[:debug]
 
-  client = Ridgepole::Client.new(Ridgepole::Config.load(config, env), options) if config
+  client = Ridgepole::Client.new(Ridgepole::Config.load(config, env, spec_name), options) if config
 
   ActiveRecord::Base.logger = logger
   ActiveSupport::LogSubscriber.colorize_logging = options[:color]
@@ -247,7 +249,7 @@ begin
         file_ext = File.extname(diff_file)
 
         if %w[.yml .yaml].include?(file_ext)
-          Ridgepole::Config.load(diff_file, env)
+          Ridgepole::Config.load(diff_file, env, spec_name)
         else
           File.open(diff_file)
         end

data/lib/ridgepole/cli/config.rb

@@ -6,7 +6,7 @@ require 'yaml'
 module Ridgepole
   class Config
     class << self
-      def load(config, env = 'development')
+      def load(config, env = 'development', spec_name = '')
         config = ENV.fetch(Regexp.last_match(1)) if config =~ /\Aenv:(.+)\z/
 
         parsed_config = if File.exist?(config)
@@ -26,8 +26,10 @@ module Ridgepole
 
         parsed_config = parse_database_url(config) unless parsed_config.is_a?(Hash)
 
-        if parsed_config.key?(env.to_s)
-          parsed_config.fetch(env.to_s)
+        parsed_config = parsed_config.fetch(env.to_s) if parsed_config.key?(env.to_s)
+
+        if parsed_config.key?(spec_name.to_s)
+          parsed_config.fetch(spec_name.to_s)
         else
           parsed_config
         end

data/lib/ridgepole/external_sql_executer.rb

@@ -41,7 +41,7 @@ module Ridgepole
               end
             end
           end
-        rescue EOFError # rubocop:disable Lint/HandleExceptions
+        rescue EOFError # rubocop:disable Lint/SuppressedException
           # nothing to do
         end
 

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/spec/mysql/cli/config_spec.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 describe Ridgepole::Config do
-  subject { Ridgepole::Config.load(config, env) }
+  subject { Ridgepole::Config.load(config, env, spec_name) }
+
+  let(:spec_name) { '' }
 
   context 'when passed toplevel yaml' do
     let(:config) do
@@ -154,4 +156,55 @@ describe Ridgepole::Config do
       expect(subject['port']).to eq 3307
     }
   end
+
+  context 'when passed rails database.yml multiple databases style yaml' do
+    let(:config) do
+      <<-YAML.strip_heredoc
+        development:
+          primary:
+            adapter: sqlspecifye
+            database: db/sample.db
+        production:
+          primary:
+            adapter: mysql2
+            encoding: utf8
+            database: blog
+            username: root
+          primary_replica:
+            adapter: mysql2
+            encoding: utf8
+            database: blog
+            username: readonly
+      YAML
+    end
+
+    context 'in development env with primary spec name' do
+      let(:env) { 'development' }
+      let(:spec_name) { 'primary' }
+      specify do
+        expect(subject['adapter']).to eq 'sqlspecifye'
+        expect(subject['database']).to eq 'db/sample.db'
+        expect(subject['username']).to be_nil
+      end
+    end
+
+    context 'in production env with primary spec name' do
+      let(:env) { 'production' }
+      let(:spec_name) { 'primary' }
+      specify do
+        expect(subject['adapter']).to eq 'mysql2'
+        expect(subject['encoding']).to eq 'utf8'
+        expect(subject['database']).to eq 'blog'
+        expect(subject['username']).to eq 'root'
+      end
+    end
+
+    context 'in production env with primary_replica spec name' do
+      let(:env) { 'production' }
+      let(:spec_name) { 'primary_replica' }
+      specify do
+        expect(subject['username']).to eq 'readonly'
+      end
+    end
+  end
 end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -17,6 +17,7 @@ describe 'ridgepole' do
       expect(out).to match_fuzzy <<-MSG
         -c, --config CONF_OR_FILE
         -E, --env ENVIRONMENT
+        -s, --spec-name SPEC_NAME
         -a, --apply
         -m, --merge
         -f, --file SCHEMAFILE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord