Modernize dependencies (#21)

jturkel · web-flow · commit 11cf42c5d352 · 2023-01-12T15:36:36.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: salsify/ruby_ci:2.7.2
+      - image: salsify/ruby_ci:2.7.7
     working_directory: ~/postgres-vacuum-monitor
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.7.2-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-2.7.2-
+            - v1-gems-ruby-2.7.7-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-2.7.7-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.7.2-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-2.7.7-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -33,17 +33,15 @@ jobs:
         type: string
     docker:
       - image: salsify/ruby_ci:<< parameters.ruby_version >>
+      - image: circleci/postgres:12.9
         environment:
-          TEST_DATABASE_URL: postgresql://circleci@localhost/circle_test
-      - image: circleci/postgres:9.6
-        environment:
-          POSTGRES_USER: "ubuntu"
-          POSTGRES_DB: "postgres_vacuum_monitor_test"
+          POSTGRES_USER: "circleci"
+          POSTGRES_DB: "circle_test"
           POSTGRES_HOST_AUTH_METHOD: "trust"
     environment:
+      DB_USER: "circleci"
+      ADMIN_DB_NAME: "circle_test"
       RACK_ENV: "test"
-      DB_HOST: 'localhost'
-      DB_USER: 'ubuntu'
       RAILS_ENV: "test"
       CIRCLE_TEST_REPORTS: "test-results"
       BUNDLE_GEMFILE: << parameters.gemfile >>
@@ -71,7 +69,7 @@ jobs:
           command: dockerize -wait tcp://localhost:5432 -timeout 60s
       - run:
           name: Wait for Database User
-          command: t=30; for i in `seq $t`; do psql -h localhost -p 5432 -U ubuntu -d postgres_vacuum_monitor_test -c '\q' && break; [ $i -eq $t ] && return 2; sleep 1; done;
+          command: t=30; for i in `seq $t`; do psql -h localhost -p 5432 -U circleci -d circle_test -c '\q' && break; [ $i -eq $t ] && return 2; sleep 1; done;
       - run:
           name: Run Tests
           command: |
@@ -86,13 +84,11 @@ workflows:
           matrix:
             parameters:
               gemfile:
-                - "gemfiles/activerecord_5_2.gemfile"
                 - "gemfiles/activerecord_6_0.gemfile"
                 - "gemfiles/activerecord_6_1.gemfile"
+                - "gemfiles/activerecord_7_0.gemfile"
               ruby_version:
-                - "2.6.6"
-                - "2.7.2"
-                - "3.0.0"
-            exclude:
-              - gemfile: "gemfiles/activerecord_5_2.gemfile"
-                ruby_version: "3.0.0"
+                - "2.7.7"
+                - "3.0.5"
+                - "3.1.3"
+                - "3.2.0"
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,7 +2,7 @@ inherit_gem:
   salsify_rubocop: conf/rubocop_rails.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/**/*'
diff --git a/Appraisals b/Appraisals
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-appraise 'activerecord_5_2' do
-  gem 'activerecord', '~> 5.2.0'
-end
-
 appraise 'activerecord_6_0' do
   gem 'activerecord', '~> 6.0.0'
 end
 
 appraise 'activerecord_6_1' do
   gem 'activerecord', '~> 6.1.0'
 end
+
+appraise 'activerecord_7_0' do
+  gem 'activerecord', '~> 7.0.0'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,20 @@
 # postgres-vacuum-monitor
-## v.12.0
-- Add support for ruby 3
+
+## v0.13.0
+- Add support for ruby 3.2 and Rails 7.0
+- Drop support for ruby < 2.7 and Rails < 6.0.
+
+## v0.12.0
+- Add support for ruby 3.0
 - Drop support for ruby < 2.6
 
-## v.11.0
+## v0.11.0
 - Add support for rails 6.1
 
-## v.10.1
+## v0.10.1
 - Query bug fix.
 
-## v.10.0
+## v0.10.0
 - Add events for connection idle time and state.
 
 ## v.0.9.0
diff --git a/gemfiles/activerecord_5_2.gemfile b/gemfiles/activerecord_5_2.gemfile
diff --git a/gemfiles/activerecord_6_0.gemfile b/gemfiles/activerecord_6_0.gemfile
@@ -1,10 +1,7 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# ActiveRecord is used to connect to DBs
-gem 'activerecord', '~> 6.0.0'
+gem "activerecord", "~> 6.0.0"
 
-gemspec path: '../'
+gemspec path: "../"
diff --git a/gemfiles/activerecord_6_1.gemfile b/gemfiles/activerecord_6_1.gemfile
@@ -1,10 +1,7 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# ActiveRecord is used to connect to DBs
-gem 'activerecord', '~> 6.1.0'
+gem "activerecord", "~> 6.1.0"
 
-gemspec path: '../'
+gemspec path: "../"
diff --git a/gemfiles/activerecord_7_0.gemfile b/gemfiles/activerecord_7_0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"
diff --git a/lib/postgres/vacuum/monitor/version.rb b/lib/postgres/vacuum/monitor/version.rb
@@ -3,7 +3,7 @@
 module Postgres
   module Vacuum
     module Monitor
-      VERSION = '0.12.0'
+      VERSION = '0.13.0'
     end
   end
 end
diff --git a/postgres-vacuum-monitor.gemspec b/postgres-vacuum-monitor.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler'
@@ -38,8 +38,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'salsify_rubocop'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.42.1'
 
-  spec.add_dependency 'activerecord', '< 6.2.0'
+  spec.add_dependency 'activerecord', '>= 6.0', '< 7.1'
   spec.add_dependency 'pg', '>= 0.18', '< 2.0'
 end
diff --git a/spec/db/database.yml b/spec/db/database.yml
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -13,30 +13,52 @@
 ActiveRecord::Base.logger = Logger.new('log/test.log')
 ActiveRecord::Base.logger.level = Logger::DEBUG
 ActiveRecord::Migration.verbose = false
-db_config = YAML.safe_load(ERB.new(File.read('spec/db/database.yml')).result)
-DB_CONFIG = db_config
+
+database_host = ENV.fetch('DB_HOST', 'localhost')
+database_port = ENV.fetch('DB_PORT', 5432)
+database_user = ENV.fetch('DB_USER', 'postgres')
+database_password = ENV.fetch('DB_PASSWORD', 'password')
+database_url = "postgres://#{database_user}:#{database_password}@#{database_host}:#{database_port}"
+admin_database_name = "/#{ENV['ADMIN_DB_NAME']}" if ENV['ADMIN_DB_NAME'].present?
+
+DATABASE_NAME = 'postgres_vacuum_monitor_test'
 
 # rubocop:disable Rails/ApplicationRecord
-class SecondPool < ActiveRecord::Base
-  # might be cleaner to put this in a method if that works.  constant is weird.
-  establish_connection DB_CONFIG['test']
-end
+class SecondPool < ActiveRecord::Base; end
+SecondPool.establish_connection("#{database_url}/#{DATABASE_NAME}")
 # rubocop:enable Rails/ApplicationRecord
 
-RSpec.configure do |config|
+def setup_test_database(pg_conn, database_name)
+  pg_conn.exec("DROP DATABASE IF EXISTS #{database_name}")
+  pg_conn.exec("CREATE DATABASE #{database_name}")
 
-  config.before(:suite) do
-    test_config = db_config['test']
-    url = "postgresql://#{test_config['username']}@#{test_config['host']}/#{test_config['database']}"
-    pg_version = `psql -d #{url} -t -c "select version()";`.strip
+  pg_version = pg_conn.exec('SELECT version()')
+  puts "Testing with Postgres version: #{pg_version.getvalue(0, 0)}"
+  puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+end
 
-    puts "Testing with Postgres version: #{pg_version}"
-    puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+def teardown_test_database(pg_conn, database_name)
+  pg_conn.exec("DROP DATABASE IF EXISTS #{database_name}")
+end
 
-    ActiveRecord::Base.establish_connection(db_config['test'])
+RSpec.configure do |config|
+  config.before(:suite) do
+    PG::Connection.open("#{database_url}#{admin_database_name}") do |connection|
+      setup_test_database(connection, DATABASE_NAME)
+    end
+
+    ActiveRecord::Base.establish_connection("#{database_url}/#{DATABASE_NAME}")
 
     DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.after(:suite) do
+    ActiveRecord::Base.connection_pool.disconnect!
+    SecondPool.connection_pool.disconnect!
+
+    PG::Connection.open("#{database_url}#{admin_database_name}") do |connection|
+      teardown_test_database(connection, DATABASE_NAME)
+    end
   end
 
   config.around do |example|
