migration-lock-timeout 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b1c5bcab7e5a412ebbbce7aada13b4bc7f72a5
-  data.tar.gz: 40fab9fcf770f14687f514573af74f317093b1c3
+  metadata.gz: 1325d4e01b685b2b269015d7f9db368a4999e0bb
+  data.tar.gz: 00acc2f8cad5b72dd237df217cfeb41b991fb2a5
 SHA512:
-  metadata.gz: 7f8e9dcde22d5a5e12b86f6ffe94cdcea8bcc9fb544400c17c38a34d5aacc90920d6c1c4d08f9a3fa8b01ae7e29d1fad2a4f21508c4e2987dd1c0593ae41a895
-  data.tar.gz: f4a5b1a8cdd182a09fc0294219a7c147614e4b98885af91d81a9fe7d85c4fbf78fbcc13fd3d11aa34481ce475d29ff57a857ec9b32196d95e55efe49cbefb3e0
+  metadata.gz: 6c5acacd2a2674efd06456150632b5830c69002b2cdc2902df9bef675657c2bb7f33c7af2365c38243c837b9f6084a6656ac18eece9b5242f2406709b9da68fd
+  data.tar.gz: 1c41ff211a8a0569b10a605af00db656ff8b4f963434419b75c464df0353915ec5030974715bfa64fa6203f004600fd5d0860bcce6b2d2bf1dc3d56ca0b76bcf

data/.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

data/.ruby-version

@@ -0,0 +1 @@
+2.4.3

data/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

data/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

data/gemfiles/activerecord_4.gemfile

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

data/gemfiles/activerecord_4_with_strong_migrations.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: "../"

data/gemfiles/activerecord_5.gemfile

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

data/gemfiles/activerecord_5_with_strong_migrations.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: "../"

data/lib/migration_lock_timeout/lock_manager.rb

@@ -3,12 +3,22 @@ module MigrationLockTimeout
 
     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

data/lib/migration_lock_timeout/version.rb

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

data/migration-lock-timeout.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "pg"
+  spec.add_development_dependency "pg", "< 1.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 11.2.2"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: migration-lock-timeout
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brad Urani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -42,16 +42,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -123,10 +123,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -134,9 +137,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - gemfiles/activerecord_4.gemfile
+- gemfiles/activerecord_4_with_strong_migrations.gemfile
 - gemfiles/activerecord_5.gemfile
+- gemfiles/activerecord_5_with_strong_migrations.gemfile
 - lib/migration-lock-timeout.rb
 - lib/migration_lock_timeout/config.rb
 - lib/migration_lock_timeout/lock_manager.rb
@@ -165,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby gem that adds a lock timeout to Active Record migrations

data/circle.yml

@@ -1,18 +0,0 @@
-machine:
-  environment:
-    POSTGRES_DB_DATABASE: circle_test
-    POSTGRES_DB_USERNAME: ubuntu
-    POSTGRES_DB_PASSWORD: ''
-  ruby:
-    version: 2.3.3
-
-database:
-  override:
-    - echo 'using circle_test'
-
-dependencies:
-  post:
-    - bundle exec appraisal install
-test:
-  override:
-    - bundle exec appraisal rspec