Merge pull request #9 from procore/ys/INFR-1421_support_strong_migrations

Support strong_migrations gem

Author: ylansegal

.circleci/config.yml

@@ -0,0 +1,28 @@
+version: 2
+jobs:
+  build:
+    # working_directory: ~/appName
+    docker:
+      - image: ruby:2.3.3
+        environment:
+          PG_HOST: localhost
+          PG_USER: ubuntu
+      - image: circleci/postgres:9.5-ram
+        environment:
+          POSTGRES_USER: ubuntu
+          POSTGRES_DB: circle_test
+    steps:
+      - checkout
+      - run:
+          name: Install Ruby Dependencies
+          command: bundle install
+      - run:
+          name: Install Appraisals Dependencies
+          command: bundle exec appraisal install
+      - run:
+          name: Run Appraisals Tests
+          environment:
+            POSTGRES_DB_DATABASE: circle_test
+            POSTGRES_DB_USERNAME: ubuntu
+            POSTGRES_DB_PASSWORD:
+          command: bundle exec appraisal rspec

Appraisals

@@ -2,6 +2,16 @@ appraise "activerecord-4" do
   gem "activerecord", "4.2.7.1"
 end
 
+appraise "activerecord-4_with_strong_migrations" do
+  gem "activerecord", "4.2.7.1"
+  gem "strong_migrations", "0.2"
+end
+
 appraise "activerecord-5" do
   gem "activerecord", "5.0.0.1"
 end
+
+appraise "activerecord-5_with_strong_migrations" do
+  gem "activerecord", "5.0.0.1"
+  gem "strong_migrations", "0.2"
+end

CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [1.2.0]
+### Added
+- Support for using with the [strong_migrations](https://github.com/ankane/strong_migrations) gem

circle.yml

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activerecord", "4.2.7.1"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/activerecord_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.7.1"
+gem "strong_migrations", "0.2"
+
+gemspec path: "../"

gemfiles/activerecord_4_with_strong_migrations.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activerecord", "5.0.0.1"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/activerecord_5.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.0.1"
+gem "strong_migrations", "0.2"
+
+gemspec path: "../"

gemfiles/activerecord_5_with_strong_migrations.gemfile

@@ -3,12 +3,22 @@ module LockManager
 
     def migrate(direction)
       timeout_disabled = self.class.disable_lock_timeout
-      time = self.class.lock_timeout_override || 
+      time = self.class.lock_timeout_override ||
         MigrationLockTimeout.try(:config).try(:default_timeout)
       if !timeout_disabled && direction == :up && time && !disable_ddl_transaction
-        execute "SET LOCAL lock_timeout = '#{time}s'"
+        safety_assured? do
+          execute "SET LOCAL lock_timeout = '#{time}s'"
+        end
       end
       super
     end
+
+    def safety_assured?
+      if defined?(StrongMigrations)
+        safety_assured { yield }
+      else
+        yield
+      end
+    end
   end
 end

lib/migration_lock_timeout/lock_manager.rb

@@ -1,3 +1,3 @@
 module MigrationLockTimeout
-  VERSION = "1.1.0"
+  VERSION = "1.2.0".freeze
 end