capistrano-delayed_job 0.0.4 → 0.0.5

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem "capistrano",     ">= 2.15.5"
-gem 'capistrano-base_helper', ">= 0.0.6"
+gem 'capistrano-base_helper', ">= 0.0.7"
 
 group :development do
   gem "bundler", ">= 1.3.0"

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capistrano-base_helper (0.0.6)
+    capistrano-base_helper (0.0.7)
       capistrano (>= 2.15.5)
     faraday (0.8.7)
       multipart-post (~> 1.1)
@@ -65,5 +65,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.3.0)
   capistrano (>= 2.15.5)
-  capistrano-base_helper (>= 0.0.6)
+  capistrano-base_helper (>= 0.0.7)
   jeweler (~> 1.8.6)

data/README.md

@@ -7,7 +7,7 @@ This gem provides recipes for [Delayed Job](https://github.com/collectiveidea/de
 Add it to your Gemfile without requiring it
 
 ```ruby
-gem 'capistrano-delayed_job'
+gem 'capistrano-delayed_job', :require => false
 ```
 
 In your deploy.rb:
@@ -18,7 +18,7 @@ require 'capistrano/delayed_job'
 
 ### Monit
 
-```ruby
+```
 cap delayed_job:monit:disable          # Disable and stop monit services for Delayed Job
 cap delayed_job:monit:enable           # Enable monit services for Delayed Job
 cap delayed_job:monit:monitor          # Monitor Delayed Job
@@ -29,9 +29,18 @@ cap delayed_job:monit:stop             # Stop monit services for Delayed Job (wi
 cap delayed_job:monit:unmonitor        # Purge Delayed Job monit configuration
 ```
 
-### Runit
+#### Setup in your deploy file
+
+You can add this to deploy.rb or env.rb in order to automatically start/stop puma using monit. It is not needed if you use runit to stop/start/restart the service.
 
 ```ruby
+before "monit:unmonitor", "delayed_job:monit:stop"
+after  "monit:monitor",   "delayed_job:monit:start"
+```
+
+### Runit
+
+```
 cap delayed_job:runit:disable          # Disable Delayed Job runit-service
 cap delayed_job:runit:enable           # Enable Delayed Job runit-service
 cap delayed_job:runit:flush_sockets    # Flush delayed_job sockets, as they can end up 'han...
@@ -44,6 +53,20 @@ cap delayed_job:runit:start            # Start Delayed Job runit-service
 cap delayed_job:runit:stop             # Stop Delayed Job runit-service
 ```
 
+#### Setup in your deploy file
+
+To use runit to start/stop/restart services instead of monit, use the example below.
+
+```ruby
+# stop before deployment 
+# (must be done after monit has stopped monitoring the task. If not, the service will be restarted by monit)
+before "monit:unmonitor", "delayed_job:runit:stop"
+# start before enabling monitor
+before  "monit:monitor",   "delayed_job:runit:start"
+# restart before enabling monitor / monitoring has been started
+before  "monit:monitor",   "delayed_job:runit:restart"
+```
+
 ## Configuration
 
 See delayed_job/config.rb for default options, and ovveride any in your deploy.rb file.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/capistrano-delayed_job.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-delayed_job"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Ringstad"]
-  s.date = "2013-07-08"
+  s.date = "2013-07-29"
   s.description = "Capistrano recipes for Delayed Job using runit and monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
@@ -44,18 +44,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<capistrano>, [">= 2.15.5"])
-      s.add_runtime_dependency(%q<capistrano-base_helper>, [">= 0.0.6"])
+      s.add_runtime_dependency(%q<capistrano-base_helper>, [">= 0.0.7"])
       s.add_development_dependency(%q<bundler>, [">= 1.3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.6"])
     else
       s.add_dependency(%q<capistrano>, [">= 2.15.5"])
-      s.add_dependency(%q<capistrano-base_helper>, [">= 0.0.6"])
+      s.add_dependency(%q<capistrano-base_helper>, [">= 0.0.7"])
       s.add_dependency(%q<bundler>, [">= 1.3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
     end
   else
     s.add_dependency(%q<capistrano>, [">= 2.15.5"])
-    s.add_dependency(%q<capistrano-base_helper>, [">= 0.0.6"])
+    s.add_dependency(%q<capistrano-base_helper>, [">= 0.0.7"])
     s.add_dependency(%q<bundler>, [">= 1.3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
   end

data/lib/capistrano/delayed_job/runit.rb

@@ -9,7 +9,7 @@ Capistrano::Configuration.instance(true).load do
   # enable service after update in case it has not been setup or is disabled
   # Service should probably be started as well?
   after "deploy:update", "delayed_job:runit:enable"
-  after "delayed_job:runit:quit", "delayed_job:runit:stop"
+  before "delayed_job:runit:quit", "delayed_job:runit:stop"
 
   namespace :delayed_job do
     namespace :runit do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-delayed_job
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3670686879823204823
+      hash: -4442654335854389884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: