lib/schema_dev/rspec/db.rb in schema_dev-4.0.0 vs lib/schema_dev/rspec/db.rb in schema_dev-4.1.0

@@ -1,89 +1,100 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'pathname'
 require_relative '../gemfile_selector'
 
 module SchemaDev
   module Rspec
     module Db
       extend self
 
       def setup
-        @db = GemfileSelector.infer_db
         set_logger
         connect
         RSpec.configure do |config|
           config.include Helpers
-          config.filter_run_excluding :postgresql => :only unless Helpers.postgresql?
-          config.filter_run_excluding :postgresql => :skip if     Helpers.postgresql?
-          config.filter_run_excluding :mysql      => :only unless Helpers.mysql?
-          config.filter_run_excluding :mysql      => :skip if     Helpers.mysql?
-          config.filter_run_excluding :sqlite3    => :only unless Helpers.sqlite3?
-          config.filter_run_excluding :sqlite3    => :skip if     Helpers.sqlite3?
+          config.filter_run_excluding postgresql: :only unless Helpers.postgresql?
+          config.filter_run_excluding postgresql: :skip if Helpers.postgresql?
+          config.filter_run_excluding mysql: :only unless Helpers.mysql?
+          config.filter_run_excluding mysql: :skip if Helpers.mysql?
+          config.filter_run_excluding sqlite3: :only unless Helpers.sqlite3?
+          config.filter_run_excluding sqlite3: :skip if Helpers.sqlite3?
         end
       end
 
       def tmproot
-        @tmproot ||= Pathname.new('tmp').tap { |path| path.mkpath }
+        @tmproot ||= Pathname.new('tmp').tap(&:mkpath)
       end
 
       def logroot
-        @logroot ||= Pathname.new('log').tap { |path| path.mkpath }
+        @logroot ||= Pathname.new('log').tap(&:mkpath)
       end
 
       def database
-        @database ||= "schema_plus_test"
+        @database ||= 'schema_plus_test'
         # @database ||= (Dir["*.gemspec"].first || "schema_dev_test").sub(/\.gemspec$/, '') + "_test"
       end
 
-      def configuration
-        case @db
+      def configuration(db: nil)
+        case db || infer_db
         when 'mysql'
           {
-            "adapter"      => 'mysql',
-            "database"     => database,
-            "username"     => ENV.fetch('MYSQL_DB_USER', 'schema_plus'),
-            "encoding"     => 'utf8',
-            "min_messages" => 'warning'
+            'adapter'      => 'mysql',
+            'database'     => database,
+            'host'         => ENV['MYSQL_DB_HOST'],
+            'username'     => ENV.fetch('MYSQL_DB_USER', 'schema_plus'),
+            'password'     => ENV['MYSQL_DB_PASS'],
+            'encoding'     => 'utf8',
+            'min_messages' => 'warning'
           }
         when 'mysql2'
           {
-            "adapter"      => 'mysql2',
-            "database"     => database,
-            "username"     => ENV.fetch('MYSQL_DB_USER', 'schema_plus'),
-            "encoding"     => 'utf8',
-            "min_messages" => 'warning'
+            'adapter'      => 'mysql2',
+            'database'     => database,
+            'host'         => ENV['MYSQL_DB_HOST'],
+            'username'     => ENV.fetch('MYSQL_DB_USER', 'schema_plus'),
+            'password'     => ENV['MYSQL_DB_PASS'],
+            'encoding'     => 'utf8',
+            'min_messages' => 'warning'
           }
         when 'postgresql'
           {
-            "adapter"      => 'postgresql',
-            "username"     => ENV['POSTGRESQL_DB_USER'],
-            "database"     => database,
-            "min_messages" => 'warning'
+            'adapter'      => 'postgresql',
+            'database'     => database,
+            'host'         => ENV['POSTGRESQL_DB_HOST'],
+            'username'     => ENV['POSTGRESQL_DB_USER'],
+            'password'     => ENV['POSTGRESQL_DB_PASS'],
+            'min_messages' => 'warning'
           }
         when 'sqlite3'
           {
-            "adapter"  => 'sqlite3',
-            "database" => tmproot.join("#{database}.sqlite3").to_s
+            'adapter'  => 'sqlite3',
+            'database' => tmproot.join("#{database}.sqlite3").to_s
           }
         else
-          raise "Unknown db adapter #{@db.inspect}"
-        end
+          raise "Unknown db adapter #{db.inspect}"
+        end.compact
       end
 
+      def infer_db
+        @infer_db ||= GemfileSelector.infer_db
+      end
+
       def connect
         ActiveRecord::Base.configurations = { 'schema_dev' => configuration }
         ActiveRecord::Base.establish_connection :schema_dev
-        case @db
+        case infer_db
         when 'sqlite3'
-          ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"
+          ActiveRecord::Base.connection.execute 'PRAGMA synchronous = OFF'
         end
       end
 
       def set_logger
         ruby = "#{RUBY_ENGINE}#{RUBY_VERSION}"
         activerecord = "activerecord#{ActiveRecord.version}"
-        ActiveRecord::Base.logger = Logger.new(logroot.join("#{ruby}-#{activerecord}-#{@db}.log").open("w"))
+        ActiveRecord::Base.logger = Logger.new(logroot.join("#{ruby}-#{activerecord}-#{infer_db}.log").open('w'))
       end
 
       module Helpers
         extend self