capistrano-resque 0.0.6 → 0.0.7

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Steven Shingler
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -53,4 +53,8 @@ after "deploy:restart", "resque:restart"
 
 I've decided to lose the logging ability altogether, in order to keep up with recent versions of Resque, following the chatter on: https://github.com/defunkt/resque/pull/450
 
-If logging is important to you, there's still the 0.0.4 release of this project.
+If logging is important to you, there's still the 0.0.4 release of this project.
+
+### License
+
+Please see the included LICENSE file.

data/lib/capistrano-resque/capistrano_integration.rb

@@ -7,87 +7,77 @@ module CapistranoResque
       capistrano_config.load do
 
         _cset(:workers, {"*" => 1})
-        _cset(:app_env, (fetch(:rails_env) rescue "production"))
 
-        def remote_file_exists?(full_path)
-          "true" ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
+        def workers_roles
+          return workers.keys if workers.first[1].is_a? Hash
+          [:resque_worker]
         end
 
-        def remote_process_exists?(pid_file)
-          capture("ps -p $(cat #{pid_file}) ; true").strip.split("\n").size == 2
-        end
-
-        def current_pids
-          capture("ls #{current_path}/tmp/pids/resque_work*.pid 2>/dev/null || true").strip.split(/\r{0,1}\n/)
+        def for_each_workers(&block)
+          if workers.first[1].is_a? Hash
+            workers_roles.each do |role|
+              yield(role.to_sym, workers[role.to_sym])
+            end
+          else
+            yield(:resque_worker,workers)
+          end
         end
 
         namespace :resque do
           desc "See current worker status"
-          task :status, :roles => :resque_worker do
-            current_pids.each do |pid|
-              if remote_file_exists?(pid)
-                if remote_process_exists?(pid)
-                  logger.important("Up and running", "Resque Worker: #{pid}")
-                else
-                  logger.important("Down", "Resque Worker: #{pid}")
-                end
-              end
-            end
+          task :status, :roles => lambda { workers_roles() }, :on_no_matching_servers => :continue do
+            command = "if [ -e #{current_path}/tmp/pids/resque_work_1.pid ]; then \
+                for f in $(ls #{current_path}/tmp/pids/resque_work*.pid); do ps -p $(cat $f) | sed -n 2p ;done \
+               ;fi"
+            run(command)
           end
 
           desc "Start Resque workers"
-          task :start, :roles => :resque_worker do
-            worker_id = 1
-            workers.each_pair do |queue, number_of_workers|
-              puts "Starting #{number_of_workers} worker(s) with QUEUE: #{queue}"
-              number_of_workers.times do
-                pid = "./tmp/pids/resque_worker_#{worker_id}.pid"
-                run "cd #{current_path} && RAILS_ENV=#{app_env} QUEUE=\"#{queue}\" \
-PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 bundle exec rake environment resque:work"
-                worker_id += 1
+          task :start, :roles => lambda { workers_roles() }, :on_no_matching_servers => :continue do
+            for_each_workers do |role, workers|
+              worker_id = 1
+              workers.each_pair do |queue, number_of_workers|
+                puts "Starting #{number_of_workers} worker(s) with QUEUE: #{queue}"
+                number_of_workers.times do
+                  pid = "./tmp/pids/resque_work_#{worker_id}.pid"
+                  run("cd #{current_path} && RAILS_ENV=#{rails_env} QUEUE=\"#{queue}\" \
+                   PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 #{fetch(:bundle_cmd, "bundle")} exec rake environment resque:work >> #{shared_path}/log/resque.log 2>&1 &", 
+                      :roles => role)
+                  worker_id += 1
+                end
               end
             end
           end
 
           desc "Quit running Resque workers"
-          task :stop, :roles => :resque_worker do
-            current_pids.each do |pid|
-              if remote_file_exists?(pid)
-                if remote_process_exists?(pid)
-                  logger.important("Stopping...", "Resque Worker: #{pid}")
-                  run "#{try_sudo} kill `cat #{pid}`"
-                else
-                  run "rm #{pid}"
-                  logger.important("Resque Worker #{pid} is not running.", "Resque")
-                end
-              else
-                logger.important("No PIDs found. Check if Resque is running.", "Resque")
-              end
-            end
+          task :stop, :roles => lambda { workers_roles() }, :on_no_matching_servers => :continue do
+            command = "if [ -e #{current_path}/tmp/pids/resque_work_1.pid ]; then \
+              for f in `ls #{current_path}/tmp/pids/resque_work*.pid`; do #{try_sudo} kill `cat $f` ; rm $f ;done \
+              ;fi"
+            run(command)
           end
 
           desc "Restart running Resque workers"
-          task :restart, :roles => :resque_worker do
+          task :restart, :roles => lambda { workers_roles() }, :on_no_matching_servers => :continue do
             stop
             start
           end
-
+          
           namespace :scheduler do
             desc "Starts resque scheduler with default configs"
             task :start, :roles => :resque_scheduler do
               run "cd #{current_path} && RAILS_ENV=#{rails_env} \
-PIDFILE=./tmp/pids/scheduler.pid BACKGROUND=yes bundle exec rake resque:scheduler"
+PIDFILE=./tmp/pids/scheduler.pid BACKGROUND=yes bundle exec rake resque:scheduler >> #{shared_path}/log/resque_scheduler.log 2>&1 &"
             end
 
             desc "Stops resque scheduler"
             task :stop, :roles => :resque_scheduler do
               pid = "#{current_path}/tmp/pids/scheduler.pid"
-              if remote_file_exists?(pid)
-                logger.important("Shutting down resque scheduler...", "Resque Scheduler")
-                run remote_process_exists?(pid) ? "#{try_sudo} kill `cat #{pid}`" : "rm #{pid}"
-              else
-                logger.important("Resque scheduler not running", "Resque Scheduler")
-              end
+              command = "if [ -e #{pid} ]; then \
+                #{try_sudo} kill $(cat #{pid}) ; rm #{pid} \
+                ;fi"
+              run(command)
+              
             end
 
             task :restart do

data/lib/capistrano-resque/version.rb

@@ -1,5 +1,5 @@
 module CapistranoResque
   unless defined?(::CapistranoResque::VERSION)
-    VERSION = "0.0.6".freeze
+    VERSION = "0.0.7".freeze
   end
 end

metadata

@@ -1,48 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-resque
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Steven Shingler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70296963636080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70296963636080
 description: Capistrano plugin that integrates Resque server tasks.
 email: shingler@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - capistrano-resque.gemspec
@@ -51,37 +40,27 @@ files:
 - lib/capistrano-resque/version.rb
 homepage: https://github.com/sshingler/capistrano-resque
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Resque integration for Capistrano
 test_files: []
-
 has_rdoc: