makandra_sidekiq 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe216cf3996745151d6aefc183425d692e334999110947a7c1cc2114cbe4b57e
-  data.tar.gz: 575bb317450b8c419706c06a62c86d541e3ef2a5657de35e354f165b48d89c6b
+  metadata.gz: 174526de88bc2d464dfd1de7580b3c893b518bc72a1865f292fd9cfb64fccc85
+  data.tar.gz: ab50c8e6a19cef667c1773beccd9ae3c15f9c37334ecaaf7db5f949bdcae7dfc
 SHA512:
-  metadata.gz: 44225769a2c6ad71c57c820ec519da9edd7cd912e95d5679727384aa73d287142244657ae1f1bd3fe160963f8e2a5ad001ef73bb2a436bb8da62c6e21c6275ac
-  data.tar.gz: 307dbf80b79f73374c464c32184fbe80fbde6d4d3a34b3ecce420c2281f031228472c9ca4cfa6e2340538f0b6a2b3158c92bbdd176f6a190d4465cac6381ce13
+  metadata.gz: 857c578c94e405fe18f03d7a90dcb20b91006d74b44d5134bfd67a68de927144aba7f7470482526ec9b23be18d10e8f0f06ce39fbba0195531ccc092d5bec834
+  data.tar.gz: a4e9e532e213d36b20829cdf044b4ea1d1a354f0977ce8a36b7be45a318c0b854b2b1c309d4af8181bb9ff6882ff022f7541d0de58bb8768052f545ed5de311d

data/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: build
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Install dependencies
+        run: bundle install --quiet
+      - name: Run tests
+        run: bundle exec rspec spec

data/.ruby-version

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

data/CHANGELOG.md

@@ -6,25 +6,53 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Unreleased
 
+
+## 0.2.3 2022-03-16
+
+### Compatible changes
+- Activate Rubygems MFA
+
+
+## 0.2.2 2020-07-20
+
+### Compatible changes
+- Support edge case where Sidekiq stopped but left behind its pidfile (closes [#5](https://github.com/makandra/makandra_sidekiq/issues/5))
+
+
+## 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,19 +1,19 @@
 PATH
   remote: .
   specs:
-    makandra_sidekiq (0.1.5)
+    makandra_sidekiq (0.2.3)
       sidekiq (< 6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    connection_pool (2.2.2)
+    connection_pool (2.2.5)
     diff-lcs (1.3)
-    rack (2.0.7)
-    rack-protection (2.0.7)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       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,11 +27,11 @@ 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.9)
       connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
+      rack (~> 2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+      redis (>= 3.3.5, < 4.2)
 
 PLATFORMS
   ruby
@@ -43,4 +43,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/README.md

@@ -1,4 +1,4 @@
-# makandra_sidekiq [![Build Status](https://travis-ci.org/makandra/makandra_sidekiq.svg?branch=master)](https://travis-ci.org/makandra/makandra_sidekiq)
+# makandra_sidekiq [![Build Status](https://github.com/makandra/makandra_sidekiq/workflows/build/badge.svg)](https://github.com/makandra/makandra_sidekiq/actions)
 
 Support code for our default Sidekiq setup.
 

data/lib/makandra_sidekiq/sidekiq_control.rb

@@ -70,9 +70,12 @@ module MakandraSidekiq
 
     def running?
       pid = read_pid
-      Process.kill(0, pid) if pid
+      Process.kill(0, pid) if pid # kill(0, pid) checks pid validity
     rescue Errno::ESRCH
-      # not running
+      false # Not running
+    rescue Errno::EPERM
+      # The process from Sidekiq's pidfile does not belong to us. This can occur
+      # when Sidekiq for some reason stopped but left behind its pidfile.
       false
     end
 
@@ -166,12 +169,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.3'
 end

data/makandra_sidekiq.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Support code for sidekiq, including rake tasks and capistrano recipes.}
   spec.homepage      = "https://github.com/makandra/makandra_sidekiq"
+  spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makandra_sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -73,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -94,7 +94,8 @@ files:
 - makandra_sidekiq.gemspec
 homepage: https://github.com/makandra/makandra_sidekiq
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:

data/.travis.yml

@@ -1,10 +0,0 @@
-sudo: false
-language: ruby
-dist: trusty
-rvm:
-  - 2.3.3
-script: bundle exec rspec spec
-cache: bundler
-branches:
-  only:
-    - master