makandra_sidekiq 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe216cf3996745151d6aefc183425d692e334999110947a7c1cc2114cbe4b57e
-  data.tar.gz: 575bb317450b8c419706c06a62c86d541e3ef2a5657de35e354f165b48d89c6b
+  metadata.gz: 47a5113e14c3e6b57bae52343b8f25107c7f3eb19c6549f57ef4f3472611aba8
+  data.tar.gz: 56b1564ce0bf25208cc3f29b02cb03853068a24a919fabbe41338f8f57dde2d4
 SHA512:
-  metadata.gz: 44225769a2c6ad71c57c820ec519da9edd7cd912e95d5679727384aa73d287142244657ae1f1bd3fe160963f8e2a5ad001ef73bb2a436bb8da62c6e21c6275ac
-  data.tar.gz: 307dbf80b79f73374c464c32184fbe80fbde6d4d3a34b3ecce420c2281f031228472c9ca4cfa6e2340538f0b6a2b3158c92bbdd176f6a190d4465cac6381ce13
+  metadata.gz: e1b74c9f9d8e299357bdd377bc784f6e0c33a5b1b2871422a08d4e41d4ad4202fdec86884c69b6f3b33849b75dbe0397d305ce6988b13b157f0c0b90bb950384
+  data.tar.gz: c0d6707a0116227fda7ed471c0e5eb5de2349e333aacc6b981881b8011036e210ccc90d3e1b515156038b3927c8502fb284a58e5d053dadbe07f692e2e6060f5

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.6

data/CHANGELOG.md

@@ -6,25 +6,41 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Unreleased
 
+
+## 0.2.1 2020-05-18
+
+### Compatible changes
+- Fixed deprecation warnings on modern Bundlers. We are now using `Bundler.with_original_env`.
+
+
+## 0.2.0 2019-11-08
+
 ### Compatible changes
-- CHANGELOG to satisfy [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) format
+- Added CHANGELOG to satisfy [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+- Fix: now considering the configured Sidekiq timeout when running
+  `sidekiqctl stop` through `sidekiq:stop`. Previously, long-running jobs would
+  get lost!
+
 
 ## 0.1.3 2017-02-13
 
 ### Changed
 - Gem no longer depends on `capistrano`, since using its Capistrano recipes is optional.
 
+
 ## 0.1.2 2017-01-12
 
 ### Added
 - `sidekiq:start` checks that sidekiq really comes up and will retry a few times.
 
+
 ## 0.1.1 2016-09-29
 
 ### Fixed
 - Do not fail on first deploy.
 
-## 0.1.0] 2016-09-29
+
+## 0.1.0 2016-09-29
 
 ### Added
 - Initial release.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    makandra_sidekiq (0.1.5)
+    makandra_sidekiq (0.2.1)
       sidekiq (< 6)
 
 GEM
@@ -9,11 +9,11 @@ GEM
   specs:
     connection_pool (2.2.2)
     diff-lcs (1.3)
-    rack (2.0.7)
-    rack-protection (2.0.7)
+    rack (2.0.9)
+    rack-protection (2.0.8.1)
       rack
     rake (10.5.0)
-    redis (4.1.3)
+    redis (4.1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -27,9 +27,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sidekiq (5.2.7)
+    sidekiq (5.2.8)
       connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
+      rack (< 2.1.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
 

data/lib/makandra_sidekiq/sidekiq_control.rb

@@ -166,12 +166,21 @@ module MakandraSidekiq
 
     def bundle_exec(*command)
       string_command = command.map(&:to_s)
-      stdout_str, stderr_str, status = Bundler.with_clean_env { Open3.capture3('bundle', 'exec', *string_command, chdir: @root.to_s) }
+      root = @root.to_s
+      stdout_str, stderr_str, status = with_original_env { capture3('bundle', 'exec', *string_command, chdir: root) }
       puts stdout_str
       unless status.success?
         fail "#{command} failed with message: #{stderr_str}"
       end
     end
 
+    def capture3(*command)
+      Open3.capture3(*command)
+    end
+
+    def with_original_env(&block)
+      Bundler.with_original_env(&block)
+    end
+
   end
 end

data/lib/makandra_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module MakandraSidekiq
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makandra_sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq