ghost_adapter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4891b0bd885cf5afcedef2b98f14bffb64c5391871189530cc9075091ea1ead
-  data.tar.gz: 0fc0fd7ab33fbde0ea6a62238e26ee52444dacc961bc4624834401e60053a6dc
+  metadata.gz: 1e41455fa006b4b041b93b335e52648d1a73fc70414833e9da5e8aa2d08a7f33
+  data.tar.gz: 83bb7a22b33489522b4877f7bb09d3e8011527cb30a6410f402d6124e8673483
 SHA512:
-  metadata.gz: 8a7d0685cdb9b491df138c6a731cfed2e3b9f1e278ad51a860f2ba6cbf2ca7582509815e5629e76836fa09d0ec5d069426d83f693bbc01c9cb4025241cbf0cb3
-  data.tar.gz: 5e2a07d6a66f2e66570f7c14b4764fad6d52b18653d8be9f2af1e970fd6b984ebf7d0fb30fcfc30ee116ee3873689a3896cee71078184d3984cc71bb18016bd1
+  metadata.gz: 9a44d227afa21a6b94303c73419b6d56ebc5971d681ce7cc8b6384b7e802556e9e782467aa1c6695bc4461dc411560f02040bea4ba1ebf713ad098f58a670369
+  data.tar.gz: 5a8a939e4cc7ea44d135273c32c921ca4f79d35aac568c1160d32daae0b41d587180968772f13047a4fbb1ca93edbba68372fad89e46ff96b4db9d0df0852b33

data/.gitignore

@@ -1,3 +1,5 @@
+.rspec_status
+.DS_Store
 /.bundle/
 /.yardoc
 /_yardoc/

data/.rubocop.yml

@@ -9,7 +9,7 @@ Style/RescueModifier:
 
 Metrics/BlockLength:
   Exclude:
-    - test/**/*_test.rb
+    - spec/**/*_spec.rb
 
 Metrics/MethodLength:
   IgnoredMethods:

data/.travis.yml

@@ -20,6 +20,6 @@ jobs:
       script:
         - bundle exec rake rubocop
     - stage: Tests
-      name: Run minitest
+      name: Run specs
       script:
-        - bundle exec rake test
+        - bundle exec rake spec

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG
 
+## 0.1.3
+- Fix bug [#26](https://github.com/WeTransfer/ghost_adapter/issues/26) causing environment configuration to be overwritten by some other configuration methods.
+
 ## 0.1.2
 - Fix bug [#28](https://github.com/WeTransfer/ghost_adapter/issues/28) that resulted in add_index and remove_index calls to not run through `gh-ost`

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ghost_adapter (0.1.2)
+    ghost_adapter (0.1.3)
       activerecord (>= 5)
+      mysql2 (>= 0.4.0, < 0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -22,9 +23,11 @@ GEM
     bump (0.10.0)
     byebug (11.1.3)
     concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     minitest (5.14.3)
+    mysql2 (0.5.2)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -32,6 +35,19 @@ GEM
     rake (13.0.3)
     regexp_parser (2.0.3)
     rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (1.8.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -58,8 +74,8 @@ DEPENDENCIES
   bundler (~> 2)
   byebug (~> 11.1)
   ghost_adapter!
-  minitest (~> 5.14)
   rake (~> 13.0)
+  rspec (~> 3)
   rubocop (~> 1)
 
 BUNDLED WITH

data/Rakefile

@@ -1,14 +1,8 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
+require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
+RSpec::Core::RakeTask.new(:spec)
 
-task default: %i[test rubocop]
+task default: %i[spec rubocop]

data/ghost_adapter.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '>= 5'
+  spec.add_dependency 'mysql2', '>= 0.4.0', '< 0.6.0'
 
   spec.add_development_dependency 'bump', '~> 0'
   spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'byebug', '~> 11.1'
-  spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'rubocop', '~> 1'
 end

data/lib/active_record/connection_adapters/mysql2_ghost_adapter.rb

@@ -1,8 +1,6 @@
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'ghost_adapter/migrator'
 require 'ghost_adapter/version_checker'
-
-gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 require 'mysql2'
 
 module ActiveRecord

data/lib/ghost_adapter.rb

@@ -1,3 +1,8 @@
+require 'active_record'
+require 'active_support/all'
+
+require 'active_record/connection_adapters/mysql2_ghost_adapter'
+
 require 'ghost_adapter/config'
 
 require 'ghost_adapter/railtie' if defined? ::Rails::Railtie

data/lib/ghost_adapter/config.rb

@@ -78,32 +78,35 @@ module GhostAdapter
                    user
                    verbose].freeze
   Config = Struct.new(*CONFIG_KEYS, keyword_init: true) do
-    def initialize(options = {})
-      env_config = EnvParser.new(ENV).config
-      config_options = options.merge(env_config)
-      super(config_options)
-    end
-
     def merge!(other_config)
       other_config.compact.each { |k, v| self[k] = v }
       self
     end
 
+    def with_env
+      env_config = EnvParser.new(ENV).config
+      compact.merge(env_config)
+    end
+
     def compact
       to_h.compact
     end
 
     def as_args
-      compact.map do |key, value|
-        next unless value  # Skip both false and null values
+      with_env.map { |key, value| arg(key, value) }.compact
+    end
+
+    private
+
+    def arg(key, value)
+      return unless value
 
-        hyphenated_key = key.to_s.gsub('_', '-')
-        if value == true
-          "--#{hyphenated_key}"
-        else
-          "--#{hyphenated_key}=#{value}"
-        end
-      end.compact
+      hyphenated_key = key.to_s.gsub('_', '-')
+      if value == true
+        "--#{hyphenated_key}"
+      else
+        "--#{hyphenated_key}=#{value}"
+      end
     end
   end
 end

data/lib/ghost_adapter/env_parser.rb

@@ -7,6 +7,9 @@ module GhostAdapter
         next unless ghost_key?(key)
 
         config_key = convert_env_key(key)
+
+        next unless GhostAdapter::CONFIG_KEYS.include?(config_key)
+
         config_value = convert_env_value(value)
 
         [config_key, config_value]
@@ -20,7 +23,7 @@ module GhostAdapter
     end
 
     def convert_env_key(key)
-      key.gsub('GHOST_', '').downcase
+      key.gsub('GHOST_', '').downcase.to_sym
     end
 
     def convert_env_value(value)

data/lib/ghost_adapter/version.rb

@@ -1,3 +1,3 @@
 module GhostAdapter
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghost_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Austin C Roos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +87,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement