makandra_sidekiq 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39f9cb8d4180c57f0333ccaf56d611d46a89ccf4
-  data.tar.gz: 0e4ce34ef6280d53a3788c210638cb4c8c3d2c27
+SHA256:
+  metadata.gz: d1a031fd7e128b55c5af83a18fd3c66b1bce4253a71506d3d7d6e5ea863ede57
+  data.tar.gz: 797ec99395f49ab6099288054b407a8b2b7f277539037662aaae9329bc13ce24
 SHA512:
-  metadata.gz: 52c3fb15a307cab8a24efd8c8f9321a4442fce04a2b05f2bb899a58923c1a7f61ca6bff1cf6d7ca36857f7a137de75e16392e39cda3975062a76c27af386e572
-  data.tar.gz: 7ab4c0282373834c04edcf57e8330b5a413371eab6d0b3c7c1b174c6b7637260add9adf523d025b04eb9a1fb437a203b96b5c3e71e010a3113369b90b1d69a6f
+  metadata.gz: 9cb9832fe0e4c3ab143abcd544bd76b30dda4d916f35ce2536e2f4f7158c10dfbd9988ddfdd49be1750fa616966f284cfc58c1326b6411381b5efd11a77860a4
+  data.tar.gz: 13881f0bd8099f15bcf8c838b256d33e0f5b7dd7542696f696f1a6cc973ca2517fa8b42a796d152fcdc2c1941453caed35be51613914377963692c99e729cca7

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.3.3
 script: bundle exec rspec spec
 cache: bundler
 notifications:

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.3][] (2017-02-13)
+
+Gem no longer depends on `capistrano`, since using its Capistrano recipes is optional.
+
 ## [0.1.2][] (2017-01-12)
 
 `sidekiq:start` checks that sidekiq really comes up and will retry a few times.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    makandra_sidekiq (0.1.3)
+    makandra_sidekiq (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -32,4 +32,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.6
+   1.16.1

data/README.md

@@ -27,6 +27,17 @@ Make sure you include at least `:pidfile` and `:logfile`. Sane values are
 :logfile: ./log/sidekiq.log
 ```
 
+
+### Passing additional options to sidekiq
+
+Sometimes you will have to pass additional options to the sidekiq binary. You can do this by adding
+
+```
+:sidekiq_command_line_args: '--some --options'
+```
+to your `config/sidekiq.yml`.
+
+
 ### Capistrano
 
 makandra_sidekiq comes with [Capistrano](https://github.com/capistrano/capistrano) recipes to call its rake tasks for (re)starting Sidekiq during deployment.

data/lib/makandra_sidekiq/sidekiq_control.rb

@@ -1,3 +1,4 @@
+require 'bundler'
 require 'pathname'
 require 'yaml'
 require 'open3'
@@ -131,17 +132,26 @@ module MakandraSidekiq
         '--index', sidekiq_index.to_s,
         '--environment', rails_env,
         '--config', config_path.to_s,
-        '--daemon'
+        '--daemon',
+        *additional_command_line_args,
       ]
       bundle_exec('sidekiq', *arguments)
     end
 
+    def additional_command_line_args
+      if (raw_args = @config[:sidekiq_command_line_args])
+        raw_args.split(' ')
+      else
+        []
+      end
+    end
+
     def sidekiq_index
       ENV['SIDEKIQ_INDEX'] || 0
     end
 
     def bundle_exec(*command)
-      stdout_str, stderr_str, status = Open3.capture3('bundle', 'exec', *command, chdir: @root.to_s)
+      stdout_str, stderr_str, status = Bundler.with_clean_env { Open3.capture3('bundle', 'exec', *command, chdir: @root.to_s) }
       puts stdout_str
       unless status.success?
         fail "#{command} failed with message: #{stderr_str}"

data/lib/makandra_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module MakandraSidekiq
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makandra_sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Support code for sidekiq, including rake tasks and capistrano recipes.