mina-sidekiq 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a002d492fb54e6a01583a09efe302e1546e2b7
-  data.tar.gz: 1048b8227cd914a3f026c4d251bbbf88c8f41c53
+  metadata.gz: acfbee2bf568322c26dd1d8b8db732c9d9662184
+  data.tar.gz: e04cb0de6682f4c5727bfec73f710ad6b4c70151
 SHA512:
-  metadata.gz: e6e261d3d3cdf3f5fd4363290cbdb54dd78a5152b2715f6e94529ce61a69b72faa477a02c599e9465695ebeb6302545ec311297e9033f7c34ef690056229ba13
-  data.tar.gz: b66da6613c2382ab9a362009fceb5cef9bb7f5bb5e2b0f756e2b19b42537ff05a069cc0b39e9546c4387218e4e7fd1416536d3bdc920d3ebd1ea22aa7e33ebaa
+  metadata.gz: b2625ff578aea58664567ae903a2113c630ee5a92b25bc5810326b08404447e5a26b45f5d5e5c90e99f7ce6be62da39b1c07eeac9fd0bb753de8edb6e38bd7af
+  data.tar.gz: ce034454db6285509d08bb6cb71fe2b36649b3769fcd99f73e16384ae2a130b40e57b0e4912b763ba67cade8c0d71c294c026c308d3b375a57c925bc47412151

data/Changelog.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.0.1 2016-11-17
+----------------
+* restore current directory after changing to sidekiq directory
+
 1.0.0 2016-10-10
 ----------------
 * support for mina 1.0 (thanks @devvmh)

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     mina-sidekiq (1.0.0)
-      mina (>= 1.0.0)
+      mina (>= 1.0.2)
 
 GEM
   remote: https://www.rubygems.org/
@@ -10,7 +10,7 @@ GEM
     byebug (9.0.6)
     coderay (1.1.1)
     method_source (0.8.2)
-    mina (1.0.0)
+    mina (1.0.2)
       open4 (~> 1.3.4)
       rake
     minitest (5.9.1)
@@ -34,4 +34,4 @@ DEPENDENCIES
   pry-byebug
 
 BUNDLED WITH
-   1.13.1
+   1.13.3

data/README.md

@@ -6,43 +6,44 @@ mina-sidekiq
 mina-sidekiq is a gem that adds tasks to aid in the deployment of [Sidekiq] (http://mperham.github.com/sidekiq/)
 using [Mina] (http://nadarei.co/mina).
 
-Starting with 1.0.0 this gem requires Mina 1.0!
+Starting with 1.0.0 this gem requires Mina 1.0! (thanks [@devvmh](https://github.com/devvmh))
 
 # Getting Start
 
 ## Installation
 
-    gem install mina-sidekiq
+```console
+gem install mina-sidekiq
+```
 
 ## Example
 
-## Usage example
-
-    require 'mina_sidekiq/tasks'
+```ruby
+require 'mina_sidekiq/tasks'
+#...
+
+task :setup do
+  # sidekiq needs a place to store its pid file and log file
+  command %(mkdir -p "#{fetch(:deploy_to)}/shared/pids/")
+  command %(mkdir -p "#{fetch(:deploy_to)}/shared/log/")
+end
+
+task :deploy do
+  deploy do
+    # stop accepting new workers
+    invoke :'sidekiq:quiet'
+    invoke :'git:clone'
+    invoke :'deploy:link_shared_paths'
     ...
-    # to make logs persistent between deploys
-    set :shared_paths, ['log']
 
-    task :setup do
-      # sidekiq needs a place to store its pid file and log file
-      queue! %[mkdir -p "#{deploy_to}/shared/pids/"]
-      queue! %[mkdir -p "#{deploy_to}/shared/log/"]
+    on :launch do
+      ...
+      invoke :'sidekiq:restart'
     end
+  end
+end
+```
 
-    task :deploy do
-      deploy do
-        # stop accepting new workers
-        invoke :'sidekiq:quiet'
-        invoke :'git:clone'
-        invoke :'deploy:link_shared_paths'
-        ...
-
-        to :launch do
-          ...
-          invoke :'sidekiq:restart'
-        end
-      end
-    end
 
 ## Available Tasks
 
@@ -71,12 +72,16 @@ under the Sharing pref pane. You will also need a working rvm installation.
 
 To run the full blown test suite use:
 
-    bundle exec rake test
+```console
+bundle exec rake test
+```
 
 For faster release cycle use
 
-    cd test_env
-    bundle exec mina deploy --verbose
+```console
+cd test_env
+bundle exec mina deploy --verbose
+```
 
 ## Copyright
 

data/lib/mina_sidekiq/tasks.rb

@@ -76,15 +76,16 @@ namespace :sidekiq do
   desc "Quiet sidekiq (stop accepting new work)"
   task :quiet => :environment do
     comment 'Quiet sidekiq (stop accepting new work)'
-    for_each_process do |pid_file, idx|
-      command %{
-        if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}` > /dev/null 2>&1; then
-          cd "#{fetch(:current_path)}"
-          #{fetch(:sidekiqctl)} quiet #{pid_file}
-        else
-          echo 'Skip quiet command (no pid file found)'
-        fi
-      }.strip
+    in_path(fetch(:current_path)) do
+      for_each_process do |pid_file, idx|
+        command %{
+          if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}` > /dev/null 2>&1; then
+            #{fetch(:sidekiqctl)} quiet #{pid_file}
+          else
+            echo 'Skip quiet command (no pid file found)'
+          fi
+        }.strip
+      end
     end
   end
 
@@ -92,15 +93,16 @@ namespace :sidekiq do
   desc "Stop sidekiq"
   task :stop => :environment do
     comment 'Stop sidekiq'
-    for_each_process do |pid_file, idx|
-      command %{
-        if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
-          cd #{fetch(:current_path)}
-          #{fetch(:sidekiqctl)} stop #{pid_file} #{fetch(:sidekiq_timeout)}
-        else
-          echo 'Skip stopping sidekiq (no pid file found)'
-        fi
-      }.strip
+    in_path(fetch(:current_path)) do
+      for_each_process do |pid_file, idx|
+        command %{
+          if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
+            #{fetch(:sidekiqctl)} stop #{pid_file} #{fetch(:sidekiq_timeout)}
+          else
+            echo 'Skip stopping sidekiq (no pid file found)'
+          fi
+        }.strip
+      end
     end
   end
 
@@ -108,14 +110,14 @@ namespace :sidekiq do
   desc "Start sidekiq"
   task :start => :environment do
     comment 'Start sidekiq'
-    for_each_process do |pid_file, idx|
-      sidekiq_concurrency = fetch(:sidekiq_concurrency)
-      concurrency_arg = if sidekiq_concurrency.nil?
-                          ""
-                        else
-                          "-c #{sidekiq_concurrency}"
-                        end
-      in_path(fetch(:current_path)) do
+    in_path(fetch(:current_path)) do
+      for_each_process do |pid_file, idx|
+        sidekiq_concurrency = fetch(:sidekiq_concurrency)
+        concurrency_arg = if sidekiq_concurrency.nil?
+                            ""
+                          else
+                            "-c #{sidekiq_concurrency}"
+                          end
         command %[#{fetch(:sidekiq)} -d -e #{fetch(:rails_env)} #{concurrency_arg} -C #{fetch(:sidekiq_config)} -i #{idx} -P #{pid_file} -L #{fetch(:sidekiq_log)}]
       end
     end

data/lib/mina_sidekiq/version.rb

@@ -1,5 +1,5 @@
 module MinaSidekiq
   def self.version
-    '1.0.0'
+    '1.0.1'
   end
 end

data/mina-sidekiq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'mina', '>= 1.0.0'
+  s.add_runtime_dependency 'mina', '>= 1.0.2'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'minitest'
 end

data/test_env/config/deploy.rb

@@ -14,14 +14,8 @@ set :repository, 'https://github.com/Mic92/mina-sidekiq-test-rails.git'
 set :keep_releases, 2
 set :sidekiq_processes, 2
 
-set :shared_dirs, fetch(:shared_dirs, []).push('log')
-
 task :environment do
-  # this line is disabled because of a bug in mina 1.0.0
-  # invoke :'rvm:use', ENV.fetch('RUBY_VERSION', 'ruby-2.3.1')
-  env = ENV.fetch('RUBY_VERSION', 'ruby-2.3.1')
-  command %{source #{fetch(:rvm_use_path)}}
-  command %{rvm use "#{env}" --create}
+  invoke :'rvm:use', ENV.fetch('RUBY_VERSION', 'ruby-2.3.1')
 end
 
 task setup: :environment do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Joerg Thalheim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement