activerecord-safer_migrations 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22edc1b74891b126918870a164f1213a79e92627
-  data.tar.gz: 153a817bf13c44c28a22ba7048756e4d61dcaf43
+SHA256:
+  metadata.gz: d13f83c80f1349c377b473f62e9bd4c3be66b3951d5aa21cf9deb02a455338b3
+  data.tar.gz: ecae2f7ef31aeb43a8631dcc8aeab9387bb05a9117067af022e3f65f146b221b
 SHA512:
-  metadata.gz: 5cd1cfa6177e67981bf0060740d899504ab15945f59e48627b7053450483fd50bd7bbeaac137ef1410ac30b5c35a07b6d86935114b469d7902519875711c9e78
-  data.tar.gz: 75866edc3cfb0eac725953860a47f80f72212803b5f40f49cd62cc474720da6b13e83b882dfccc78f5b6b3e88369126a36a460ea45b080bb65a1b95cca4b9157
+  metadata.gz: 1e8c83b7626aea99e64e2b496cb57a5af1979f8697a7b760bed228e07a9837356b3a30671d9c66094fd858086bfe2ca773142b24a33f6ae4c15b65ebccfd0fd0
+  data.tar.gz: a62709f4e0e134b3d38550cdb5b0d4b6b752a7c2e669f89b1ad550c2b1b267bff1e2335b50b6ccbc1678ae8c9b960c18c05ae988434a5b1be1724e309cbf7ba9

data/.circleci/config.yml

@@ -0,0 +1,55 @@
+version: 2.1
+
+jobs:
+  test:
+    docker:
+      - image: circleci/ruby:<< parameters.ruby-version >>
+      - image: postgres:11.3
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: safer_migrations_test
+          POSTGRES_PASSWORD: ""
+          POSTGRES_HOST_AUTH_METHOD: trust
+    environment:
+      DATABASE_URL: postgres://postgres@localhost/safer_migrations_test
+      ACTIVERECORD_VERSION: << parameters.activerecord-version >>
+    parameters:
+      ruby-version:
+        type: string
+      activerecord-version:
+        type: string
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - bundle-v1-<< parameters.ruby-version >>-{{ checksum "activerecord-safer_migrations.gemspec" }}
+            - bundle-v1-<< parameters.ruby-version >>-
+      - run:
+          name: Install dependencies
+          command: bundle install --clean --no-cache --path vendor/bundle --jobs=4 --retry=3
+      - save_cache:
+          key: bundle-v1-<< parameters.ruby-version >>-{{ checksum "activerecord-safer_migrations.gemspec" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Run tests
+          command: bundle exec rspec
+      - run:
+          name: Run rubocop
+          command: bundle exec rubocop --parallel --extra-details --display-style-guide
+
+workflows:
+  default:
+    jobs:
+      - test:
+          name: "Ruby << matrix.ruby-version >> : ActiveRecord << matrix.activerecord-version >>"
+          matrix:
+            parameters:
+              activerecord-version:
+                - 5.2.4.4
+                - 6.0.3.3
+              ruby-version:
+                - 2.5.8
+                - 2.6.6
+                - 2.7.1
+                # - 3.0.0-preview1

data/.rubocop.yml

@@ -1,30 +1,10 @@
-AllCops:
-  DisplayCopNames: true
-
-# Use trailing rather than leading dots on multi-line call chains
-Style/DotPosition:
-  EnforcedStyle: trailing
-
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
+inherit_from: .rubocop_todo.yml
 
-Style/TrailingComma:
-  EnforcedStyleForMultiline: comma
+inherit_gem:
+  gc_ruboconfig: rubocop.yml
 
-Style/AccessorMethodName:
-  Enabled: false
-
-Style/SignalException:
-  EnforcedStyle: only_raise
-
-Style/GlobalVars:
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.7
 
-Style/FileName:
+Gemspec/RequiredRubyVersion:
   Enabled: false
-
-Metrics/LineLength:
-  Max: 100

data/.rubocop_todo.yml

@@ -0,0 +1,20 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-03-27 12:04:06 +0100 using RuboCop version 0.54.0.
+# 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: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/activerecord-safer_migrations.rb'
+
+# Offense count: 20
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'spec/active_record/safer_migrations/migration_spec.rb'

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.7.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.0.0 / 2020-09-28
+
+- [#55](https://github.com/gocardless/activerecord-safer_migrations/pull/55) Drop support for Ruby =< 2.4 and Rails =< 5.1
+
 # 2.0.0 / 2017-08-23
 
 - [#23](https://github.com/gocardless/activerecord-safer_migrations/pull/23) Drop support for Rails 4.0 and 4.1

data/Gemfile

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
 
 gem "activerecord", "~> #{ENV['ACTIVERECORD_VERSION']}" if ENV["ACTIVERECORD_VERSION"]
+gem "gc_ruboconfig", "~> 2.19.0"

data/activerecord-safer_migrations.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path("../lib/active_record/safer_migrations/version", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("lib/active_record/safer_migrations/version", __dir__)
 
 Gem::Specification.new do |gem|
   gem.name          = "activerecord-safer_migrations"
@@ -12,11 +14,11 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/gocardless/activerecord-safer_migrations"
   gem.license       = "MIT"
 
-  gem.required_ruby_version = "~> 2.2"
+  gem.required_ruby_version = ">= 2.5"
 
-  gem.add_runtime_dependency "activerecord", ">= 4.0"
+  gem.add_runtime_dependency "activerecord", ">= 5.2"
 
-  gem.add_development_dependency "pg", "~> 0.21.0"
-  gem.add_development_dependency "rspec", "~> 3.3.0"
-  gem.add_development_dependency "rubocop", "~> 0.35.1"
+  gem.add_development_dependency "pg", "~> 1.2.3"
+  gem.add_development_dependency "rspec", "~> 3.9.0"
+  gem.add_development_dependency "rubocop", "~> 0.92.0"
 end

data/lib/active_record/safer_migrations/migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/safer_migrations/setting_helper"
 
 module ActiveRecord
@@ -19,9 +21,12 @@ module ActiveRecord
         def exec_migration(conn, direction)
           # lock_timeout is an instance accessor created by class_attribute
           lock_timeout_ms = lock_timeout || SaferMigrations.default_lock_timeout
-          statement_timeout_ms = statement_timeout || SaferMigrations.default_statement_timeout
+          statement_timeout_ms = statement_timeout || SaferMigrations.
+            default_statement_timeout
           SettingHelper.new(conn, :lock_timeout, lock_timeout_ms).with_setting do
-            SettingHelper.new(conn, :statement_timeout, statement_timeout_ms).with_setting do
+            SettingHelper.new(conn,
+                              :statement_timeout,
+                              statement_timeout_ms).with_setting do
               super(conn, direction)
             end
           end
@@ -29,8 +34,10 @@ module ActiveRecord
       end
 
       module ClassMethods
+        # rubocop:disable Naming/AccessorMethodName
         def set_lock_timeout(timeout)
-          if timeout == 0
+          # rubocop:enable Naming/AccessorMethodName
+          if timeout.zero?
             raise "Setting lock_timeout to 0 is dangerous - it disables the lock " \
                   "timeout rather than instantly timing out. If you *actually* " \
                   "want to disable the lock timeout (not recommended!), use the " \
@@ -44,12 +51,14 @@ module ActiveRecord
           self.lock_timeout = 0
         end
 
+        # rubocop:disable Naming/AccessorMethodName
         def set_statement_timeout(timeout)
-          if timeout == 0
-            raise "Setting statement_timeout to 0 is dangerous - it disables the statement " \
-                  "timeout rather than instantly timing out. If you *actually* " \
-                  "want to disable the statement timeout (not recommended!), use the " \
-                  "`disable_statement_timeout!` method."
+          # rubocop:enable Naming/AccessorMethodName
+          if timeout.zero?
+            raise "Setting statement_timeout to 0 is dangerous - it disables the " \
+                  "statement timeout rather than instantly timing out. If you " \
+                  "*actually* want to disable the statement timeout (not recommended!)" \
+                  ", use the `disable_statement_timeout!` method."
           end
           self.statement_timeout = timeout
         end

data/lib/active_record/safer_migrations/postgresql_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module SaferMigrations
     module PostgreSQLAdapter

data/lib/active_record/safer_migrations/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module SaferMigrations
     class Railtie < Rails::Railtie

data/lib/active_record/safer_migrations/setting_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module SaferMigrations
     class SettingHelper
@@ -20,7 +22,7 @@ module ActiveRecord
         set_new_setting
         yield
         reset_setting
-      rescue
+      rescue StandardError
         reset_setting unless in_transaction?
         raise
       end
@@ -42,7 +44,7 @@ module ActiveRecord
       end
 
       def in_transaction?
-        ActiveRecord::Base.connection.open_transactions > 0
+        ActiveRecord::Base.connection.open_transactions.positive?
       end
     end
   end

data/lib/active_record/safer_migrations/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module SaferMigrations
-    VERSION = "2.0.0".freeze
+    VERSION = "3.0.0"
   end
 end

data/lib/activerecord-safer_migrations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/postgresql_adapter"
 require "active_record/safer_migrations/postgresql_adapter"
 require "active_record/safer_migrations/migration"

data/spec/active_record/safer_migrations/migration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe ActiveRecord::SaferMigrations::Migration do
@@ -9,13 +11,17 @@ RSpec.describe ActiveRecord::SaferMigrations::Migration do
     end
   end
 
-  before { nuke_migrations }
-  before { TimeoutTestHelpers.set(:lock_timeout, 0) }
-  before { TimeoutTestHelpers.set(:statement_timeout, 0) }
+  before do
+    nuke_migrations
+    TimeoutTestHelpers.set(:lock_timeout, 0)
+    TimeoutTestHelpers.set(:statement_timeout, 0)
+  end
 
   describe "setting timeouts explicitly" do
-    before { $lock_timeout = nil }
-    before { $statement_timeout = nil }
+    before do
+      $lock_timeout = nil
+      $statement_timeout = nil
+    end
 
     shared_examples_for "running the migration" do
       let(:migration) do
@@ -51,8 +57,10 @@ RSpec.describe ActiveRecord::SaferMigrations::Migration do
       end
 
       context "when the original timeout is not 0" do
-        before { TimeoutTestHelpers.set(:lock_timeout, 8000) }
-        before { TimeoutTestHelpers.set(:statement_timeout, 8001) }
+        before do
+          TimeoutTestHelpers.set(:lock_timeout, 8000)
+          TimeoutTestHelpers.set(:statement_timeout, 8001)
+        end
 
         it "unsets the lock timeout after the migration" do
           silence_stream($stdout) { run_migration.call }
@@ -82,10 +90,13 @@ RSpec.describe ActiveRecord::SaferMigrations::Migration do
   end
 
   describe "the default timeouts" do
-    before { $lock_timeout = nil }
-    before { $statement_timeout = nil }
-    before { ActiveRecord::SaferMigrations.default_lock_timeout = 6000 }
-    before { ActiveRecord::SaferMigrations.default_statement_timeout = 6001 }
+    before do
+      $lock_timeout = nil
+      $statement_timeout = nil
+      ActiveRecord::SaferMigrations.default_lock_timeout = 6000
+      ActiveRecord::SaferMigrations.default_statement_timeout = 6001
+    end
+
     let(:migration) do
       Class.new(migration_base_class) do
         def change
@@ -117,10 +128,13 @@ RSpec.describe ActiveRecord::SaferMigrations::Migration do
   end
 
   describe "when inheriting from a migration with timeouts defined" do
-    before { $lock_timeout = nil }
-    before { $statement_timeout = nil }
-    before { ActiveRecord::SaferMigrations.default_lock_timeout = 6000 }
-    before { ActiveRecord::SaferMigrations.default_statement_timeout = 6001 }
+    before do
+      $lock_timeout = nil
+      $statement_timeout = nil
+      ActiveRecord::SaferMigrations.default_lock_timeout = 6000
+      ActiveRecord::SaferMigrations.default_statement_timeout = 6001
+    end
+
     let(:base_migration) do
       Class.new(migration_base_class) do
         set_lock_timeout(7000)

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 require "activerecord-safer_migrations"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-safer_migrations
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - GoCardless Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,66 +16,67 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.92.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.92.0
 description: ''
 email: developers@gocardless.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -93,24 +94,23 @@ homepage: https://github.com/gocardless/activerecord-safer_migrations
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: ActiveRecord migration helpers to avoid downtime
 test_files: []

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.6
-
-addons:
-  postgresql: "9.3"
-
-before_script:
-  - psql -c 'CREATE DATABASE safer_migrations_test;' -U postgres
-
-script:
-  - bundle exec rspec spec
-  - bundle exec rubocop
-
-env:
-  global:
-    - "DATABASE_URL=postgres://postgres@localhost/safer_migrations_test"
-  matrix:
-    - "ACTIVERECORD_VERSION=4.2.9"
-    - "ACTIVERECORD_VERSION=5.0.5"
-    - "ACTIVERECORD_VERSION=5.1.3"