pg_failover 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7165a4aee2751c99cbbcdf92a60e57c0015fce1bb9d714840fa60f24e7755239
-  data.tar.gz: f60669765090584b6f792200cde5248d29490f02bc4777fb0a84473b52621c71
+  metadata.gz: 877a946368b8da5dc3d2c108cdf692d6339b19b576c8e4f6329477aeb197ef07
+  data.tar.gz: 9635ed678bdd5677a39dfc259ef93f75bdb44ae79ca7945b07e603676d50f5dc
 SHA512:
-  metadata.gz: af8359d882cadde831c9695c24cd3609c47e0afe3b13e092417d8bbde5e8c7530671c43bba56e0efad0218d147132723342b13862499246396e11e179fef8f54
-  data.tar.gz: c220e6922b14249ba58dd4e4c3e3977143d3c44ef783e6ce08c1f7c857dcb6e05c724d105735d88b49def4f302dd498b73f9d85ee627ebf8dd91703b1ca66744
+  metadata.gz: 4310c4d6ea9bec147d95a6b91acf20edc9974f1f645ff70f8e71961c616fbebe71abe23a551d7eaabe9f09830261b853139f23e6d51edf12389463de6e7fa1d1
+  data.tar.gz: 76c314590a3b371d10c2644c03834202ee0fac42922ff9bb6002df9d95fc2adc8aab283cd08737944aafe83fbf9649fbc6d5dbd62f1c9739c61b5b7587968f09

data/.circleci/config.yml

@@ -12,6 +12,13 @@ commands:
           key: pg_failover-{{ checksum "pg_failover.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - vendor/bundle
+
+  style:
+    steps:
+      - run:
+          name: Run static code analysis
+          command: bundle exec rubocop
+
   test:
     steps:
       - run:
@@ -43,6 +50,7 @@ jobs:
     steps:
       - checkout
       - install-dependencies
+      - style
       - test
   publish:
     executor:
@@ -62,24 +70,12 @@ jobs:
       - run:
           name: Publish gem
           command: |
-            package=$(ls -t1 pkg/pg_failover-*.gem | head -1)
+            package="$(ls -t1 pkg/pg_failover-*.gem | head -1)"
             gem push "$package"
 
 workflows:
   test-and-publish:
     jobs:
-      - build:
-          filters:
-            tags:
-              only: /.*/
-          name: "ruby23"
-          tag: "2.3"
-      - build:
-          filters:
-            tags:
-              only: /.*/
-          name: "ruby24"
-          tag: "2.4"
       - build:
           filters:
             tags:
@@ -92,6 +88,12 @@ workflows:
               only: /.*/
           name: "ruby26"
           tag: "2.6"
+      - build:
+          filters:
+            tags:
+              only: /.*/
+          name: "ruby27"
+          tag: "2.7"
       - publish:
           context: org-rubygems
           filters:
@@ -100,7 +102,6 @@ workflows:
             tags:
               only: /^v\d{1,2}\.\d{1,2}\.\d{1,2}.*/
           requires:
-            - ruby23
-            - ruby24
             - ruby25
             - ruby26
+            - ruby27

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,66 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 9999999`
+# on 2020-08-21 11:20:01 UTC using RuboCop version 0.89.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'pg_failover.gemspec'
+
+# Offense count: 2
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
+  Exclude:
+    - 'spec/pg_failover/sequel_adapter_spec.rb'
+    - 'spec/pg_failover_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'spec/pg_failover/active_record_adapter_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 22
+
+# Offense count: 14
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 82
+
+# Offense count: 3
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 18
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 6
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/pg_failover.rb'
+    - 'lib/pg_failover/active_record_adapter.rb'
+    - 'lib/pg_failover/connection_validator.rb'
+    - 'lib/pg_failover/sequel_adapter.rb'
+    - 'lib/pg_failover/throttle.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 155

data/.ruby-version

@@ -0,0 +1 @@
+2.5.8

data/CHANGELOG.md

@@ -1 +1,10 @@
+v1.1.0 Change supported ruby versions
+
+Supported:
+- 2.5
+- 2.6
+- 2.7
+
+No code changes. But from now on the above ruby versions are assumed.
+
 v1.0.0 Initial release.

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 group :development, :test do
   gem 'activerecord'

data/README.md

@@ -1,4 +1,7 @@
 # PgFailover
+[![CircleCI](https://circleci.com/gh/FundingCircle/pg_failover/tree/master.svg?style=svg)](https://circleci.com/gh/FundingCircle/pg_failover/tree/master)
+[![Gem Version](https://img.shields.io/gem/v/pg_failover.svg)](https://rubygems.org/gems/pg_failover)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d91a350f5b3e9dd025d3/maintainability)](https://codeclimate.com/github/FundingCircle/pg_failover/maintainability)
 
 Handle potential failover events in PostgreSQL database connections by
 reconnecting if the database is in a recovery mode. This check occurs when a

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "pg_failover"
-require "irb"
+require 'bundler/setup'
+require 'pg_failover'
+require 'irb'
 
 IRB.start(__FILE__)

data/lib/pg_failover.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module PgFailover
   autoload :ActiveRecordAdapter, 'pg_failover/active_record_adapter'
   autoload :Config, 'pg_failover/config'
-  autoload :ConnectionValidator,  'pg_failover/connection_validator'
+  autoload :ConnectionValidator, 'pg_failover/connection_validator'
   autoload :SequelAdapter, 'pg_failover/sequel_adapter'
   autoload :Throttle, 'pg_failover/throttle'
 

data/lib/pg_failover/config.rb

@@ -20,12 +20,8 @@ module PgFailover
       self[:max_retries] ||= (ENV['POSTGRES_FAILOVER_MAX_RETRIES'] || 1).to_i
     end
 
-    def enabled
-      self[:enabled] ||= %w(1 t true).include?(ENV['POSTGRES_FAILOVER_ENABLED'])
-    end
-
     def enabled?
-      !!enabled
+      self[:enabled] ||= %w[1 t true].include?(ENV['POSTGRES_FAILOVER_ENABLED'])
     end
   end
 end

data/lib/pg_failover/sequel_adapter.rb

@@ -19,13 +19,13 @@ module PgFailover
     end
 
     module ConnectionValidator
-      def acquire(*a)
+      def acquire(*adapter)
         connection = super
 
         PgFailover.connection_validator.call(
           throttle_by: connection,
           in_recovery: proc {
-            result = connection.execute('select pg_is_in_recovery()') { |r| r.to_a }.first
+            result = connection.execute('select pg_is_in_recovery()', &:to_a).first
             %w[1 t true].include?(result['pg_is_in_recovery'].to_s)
           },
           reconnect: proc {
@@ -33,9 +33,9 @@ module PgFailover
             # https://github.com/jeremyevans/sequel/blob/5.15.0/lib/sequel/extensions/connection_validator.rb#L103-L109
             #
             if pool_type == :sharded_threaded
-              sync{allocated(a.last).delete(Thread.current)}
+              sync { allocated(adapter.last).delete(Thread.current) }
             else
-              sync{@allocated.delete(Thread.current)}
+              sync { @allocated.delete(Thread.current) }
             end
 
             disconnect_connection(connection)

data/pg_failover.gemspec

@@ -1,35 +1,41 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |spec|
-  spec.name          = "pg_failover"
-  spec.version       = "1.0.0"
-  spec.authors       = ["Aleksandar Ivanov", "Andy Chambers", "Sasha Gerrand"]
-  spec.email         = ["engineering+pg_failover@fundingcircle.com"]
-  spec.license       = "BSD-3-Clause"
+  spec.name          = 'pg_failover'
+  spec.version       = '1.1.0'
+  spec.authors       = ['Aleksandar Ivanov', 'Andy Chambers', 'Sasha Gerrand']
+  spec.email         = ['engineering+pg_failover@fundingcircle.com']
+  spec.license       = 'BSD-3-Clause'
 
-  spec.summary       = %q{Handle Postgres failover events gracefully.}
-  spec.description   = %q{Handle Postgres failover events gracefully using your favourite ORM.}
-  spec.homepage      = "https://github.com/FundingCircle/pg_failover"
+  spec.summary       = 'Handle Postgres failover events gracefully.'
+  spec.description   = 'Handle Postgres failover events gracefully using your favourite ORM.'
+  spec.homepage      = 'https://github.com/FundingCircle/pg_failover'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  raise "RubyGems 2.0 or newer is required to protect against public gem pushes." unless spec.respond_to?(:metadata)
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
 
   spec.metadata = {
-    "changelog_uri"   => "https://github.com/FundingCircle/pg_failover/blob/master/CHANGELOG.md",
-    "homepage_uri"    => spec.homepage,
-    "source_code_uri" => "https://github.com/FundingCircle/pg_failover",
+    'changelog_uri' => 'https://github.com/FundingCircle/pg_failover/blob/master/CHANGELOG.md',
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => 'https://github.com/FundingCircle/pg_failover'
   }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '~> 2.5'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_failover
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aleksandar Ivanov
@@ -10,36 +10,36 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Handle Postgres failover events gracefully using your favourite ORM.
 email:
 - engineering+pg_failover@fundingcircle.com
@@ -78,6 +106,9 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -105,16 +136,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Handle Postgres failover events gracefully.