mina-sidekiq 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00138ad54880e131c60c2d955511bbfbdd9d262
-  data.tar.gz: f66cdab70f47c85ac99a0a7ffaaa5d04e79e3cfb
+  metadata.gz: f1bba161f9399c6c8cea213d7faf58b4876edb8c
+  data.tar.gz: 6670d52acffcb22eeefccf07a18c51b3b246b33e
 SHA512:
-  metadata.gz: 7ce054e9deb259727dcd88232968ce6dc07d8a9cf921e3680277f3e250fa91be3fcbdb0e6146c5c957ebd8c03910e84d47eb2f18c7d48496474c3c3b5dd559e2
-  data.tar.gz: 66ef72fcfc9521ef8e4938e285b4c1384088edf353d61c8da5b14e7538eb6f53521b0cea8e0021a267a56686b9a7e74c7297e65157e7c927bd40217b0e992d64
+  metadata.gz: 51b9d652430f4cf542ebe35f9d23b8057353e4626ae2f6d501744878d0ed07449d4a63062edf7699aa8e5a47071e54ee1889046f2f4fbf200db45375ffdc82d8
+  data.tar.gz: 7da87f2b7e6e483237028710cb75849551c64dafba2343c5c33a02e3fd9e371e91d42384d02e352c88dc86ff7fcaf5ef587a564ef22d91352d473292edb773e3

data/README.md

@@ -51,12 +51,29 @@ using [Mina] (http://nadarei.co/mina).
 
 ## Available Options
 
-* sidekiq: Sets the path to sidekiq.
-* sidekiqctl: Sets the path to sidekiqctl.
-* sidekiq\_timeout: Sets a upper limit of time a worker is allowed to finish, before it is killed.
-* sidekiq\_log: Sets the path to the log file of sidekiq
-* sidekiq\_pid: Sets the path to the pid file of a sidekiq worker
-* sidekiq_processes: Sets the number of sidekiq processes launched
+| Option              | Description                                                                    |
+| ------------------- | ------------------------------------------------------------------------------ |
+| *sidekiq*           | Sets the path to sidekiq.                                                      |
+| *sidekiqctl*        | Sets the path to sidekiqctl.                                                   |
+| *sidekiq\_timeout*  | Sets a upper limit of time a worker is allowed to finish, before it is killed. |
+| *sidekiq\_log*      | Sets the path to the log file of sidekiq.                                      |
+| *sidekiq\_pid*      | Sets the path to the pid file of a sidekiq worker.                             |
+| *sidekiq_processes* | Sets the number of sidekiq processes launched.                                 |
+
+## Testing
+
+The test requires a local running ssh server with the ssh keys of the current
+user added to its `~/.ssh/authorized_keys`. In OS X, this is "Remote Login"
+under the Sharing pref pane.
+
+To run the full blown test suite use:
+
+    bundle exec rake test
+
+For faster release cycle use
+
+    cd test_env
+    bundle exec mina deploy --verbose
 
 ## Copyright
 

data/lib/mina_sidekiq/tasks.rb

@@ -42,7 +42,7 @@ set_default :sidekiq_timeout, 10
 
 # ### sidekiq_config
 # Sets the path to the configuration file of sidekiq
-set_default :sidekiq_config, "./config/sidekiq.yml"
+set_default :sidekiq_config, lambda { "#{deploy_to}/#{current_path}/config/sidekiq.yml" }
 
 # ### sidekiq_log
 # Sets the path to the log file of sidekiq
@@ -73,14 +73,15 @@ namespace :sidekiq do
 
   # ### sidekiq:quiet
   desc "Quiet sidekiq (stop accepting new work)"
-  task :quiet do
+  task :quiet => :environment do
     queue %[echo "-----> Quiet sidekiq (stop accepting new work)"]
     for_each_process do |pid_file, idx|
       queue %{
-        if [ -d #{deploy_to}/#{current_path} ] && [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
-          #{echo_cmd %{cd #{deploy_to}/#{current_path} && #{sidekiqctl} quiet #{pid_file}} }
+        if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
+          cd "#{deploy_to}/#{current_path}"
+          #{echo_cmd %{#{sidekiqctl} quiet #{pid_file}} }
         else
-          echo 'Sidekiq is not running'
+          echo 'Skip quiet command (no pid file found)'
         fi
       }
     end
@@ -88,14 +89,15 @@ namespace :sidekiq do
 
   # ### sidekiq:stop
   desc "Stop sidekiq"
-  task :stop do
+  task :stop => :environment do
     queue %[echo "-----> Stop sidekiq"]
     for_each_process do |pid_file, idx|
       queue %[
-        if [ -d #{deploy_to}/#{current_path} ] && [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
-          #{echo_cmd %[cd #{deploy_to}/#{current_path} && #{sidekiqctl} stop #{pid_file} #{sidekiq_timeout}]}
+        if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
+          cd "#{deploy_to}/#{current_path}"
+          #{echo_cmd %[#{sidekiqctl} stop #{pid_file} #{sidekiq_timeout}]}
         else
-          echo 'Sidekiq is not running'
+          echo 'Skip stopping sidekiq (no pid file found)'
         fi
       ]
     end
@@ -103,11 +105,12 @@ namespace :sidekiq do
 
   # ### sidekiq:start
   desc "Start sidekiq"
-  task :start do
+  task :start => :environment do
     queue %[echo "-----> Start sidekiq"]
     for_each_process do |pid_file, idx|
       queue %{
-        #{echo_cmd %[cd #{deploy_to}/#{current_path}; nohup #{sidekiq} -e #{rails_env} -C #{sidekiq_config} -P #{pid_file} >> #{sidekiq_log} 2>&1 &] }
+        cd "#{deploy_to}/#{current_path}"
+        #{echo_cmd %[nohup #{sidekiq} -e #{rails_env} -C #{sidekiq_config} -i #{idx} -P #{pid_file} >> #{sidekiq_log} 2>&1 &] }
       }
     end
   end

data/lib/mina_sidekiq/version.rb

@@ -1,5 +1,5 @@
 module MinaSidekiq
   def self.version
-    "0.2.0"
+    "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joerg Thalheim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Tasks to deploy Sidekiq with mina.