ridgepole 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2271671a770bf65b2503ba193108875f5892f697e37853097a0eb105024276c4
-  data.tar.gz: fb6b7f6eb304dabff71858c5029cfe92ce565c7e28612be4319b53bca669c706
+  metadata.gz: ccc0e3aba24f15cbe231cda77afbb12ee6b76578a569add69dc59597a0bdfeda
+  data.tar.gz: a24d8667ffcef19f3b520479df779795781a6fbf6d49926abf4396af21f1cfd4
 SHA512:
-  metadata.gz: 1f46efedeb45729023425090ee220c2c18ffd447ef34450d17b7f70b5c374cdaf830a9996034d1104be0f5cb8ac14aaf943edc8e0d1a936c8e9ac62fb28222b8
-  data.tar.gz: d4c338561c39f60407db3e82984f021aefe40b728bd168de046e4cd56020dfa95a97ef0a2a9d3949c2fc6cb6d2af03e10dd41b97e291b9c6e1dc397e10db9051
+  metadata.gz: 6f90360bac6042f0715dae4ba8292461d708c0155bfa200125dea16a945908247d99db8031f20ef88499924678b4e55762609522e0a62e44e7ddd26ee327be12
+  data.tar.gz: 4f29137ad9cc8a81f6ccb456d9137567080cb7a1dcc5ef1ffdad911a66bf82deb3c0c116408d317d93ba1e1ad4c235e3320d11cff420c348fe9635579bb074cd

data/README.md

@@ -97,6 +97,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 * `>= 0.7.6`
   * Fix database url check ([pull#266](https://github.com/winebarrel/ridgepole/pull/266))
   * Add ignore option ([pull#267](https://github.com/winebarrel/ridgepole/pull/267))
+* `>= 0.7.7`
+  * Support URI query string ([pull#273](https://github.com/winebarrel/ridgepole/pull/273))
 </details>
 
 ## Installation
@@ -117,7 +119,7 @@ Or install it yourself as:
 
 see https://github.com/winebarrel/ridgepole/releases.
 
-### Install from rpm
+### Install from deb
 
 ```sh
 sudo dpkg -i ridgepole_x.x.x+xxx-x_amd64.deb

data/lib/ridgepole/cli/config.rb

@@ -60,14 +60,21 @@ module Ridgepole
           end
         end
 
-        {
+        query_hash =
+          if uri.query
+            uri.query.split('&').map { |pair| pair.split('=') }.to_h
+          else
+            {}
+          end
+
+        query_hash.merge(
           'adapter' => uri.scheme,
           'username' => CGI.unescape(uri.user),
           'password' => uri.password ? CGI.unescape(uri.password) : nil,
           'host' => uri.host,
           'port' => uri.port,
-          'database' => CGI.unescape(uri.path.sub(%r{\A/}, '')),
-        }
+          'database' => CGI.unescape(uri.path.sub(%r{\A/}, ''))
+        )
       end
     end
   end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.6'.freeze
+  VERSION = '0.7.7'.freeze
 end

data/spec/mysql/cli/config_spec.rb

@@ -109,7 +109,7 @@ describe Ridgepole::Config do
   end
 
   context 'when passed DATABASE_URL' do
-    let(:config) { 'mysql2://root:pass@127.0.0.1:3307/blog' }
+    let(:config) { 'mysql2://root:pass@127.0.0.1:3307/blog?pool=5&reaping_frequency=2' }
     let(:env) { 'development' }
 
     it {
@@ -118,6 +118,8 @@ describe Ridgepole::Config do
       expect(subject['username']).to eq 'root'
       expect(subject['password']).to eq 'pass'
       expect(subject['port']).to eq 3307
+      expect(subject['pool']).to eq '5'
+      expect(subject['reaping_frequency']).to eq '2'
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord