capistrano-shoryuken 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDZmODU5ZjljNGE4N2NkMWI2MjcyN2NhM2I1YjZlMTYzMTU3MTE5ZA==
+    Y2JiMTM3NzliMDhhNzA4ZWYzYzkyMTRmOGZiYWJiMjUxZTYzYzllNw==
   data.tar.gz: !binary |-
-    MjgwMTVjMmYzOWNkN2E5MzY5NDE1YmM5ODRiMDRiMTc2MzM1OTcwMg==
+    MzZmYzViOTM1YTYwNGJkMWNmN2MxZTBiZjA4MTdkOTM1YTMyZDcxOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWNhMTY0ZWRkZjU3MGNkYTQxY2ZhMjU2NzVmMWIzYTUyZDM1YTIzNmYzMGNk
-    NDJjYjcyODllM2I4NDU5N2JmMTBmMzczOWJhM2RmNWYzNzdmN2Q1MWIzOWZh
-    NWVkOWQ5NjI2NzdiMmMzOGEwZmIxMWViMDJiNmEzM2M4MTczYzY=
+    MDZhNjMzYjU1NzUzMjc4NmQwMzczNjQyMWYzNDEyNjIwYWE5MzQxZDIwZGEw
+    NTEwYTllYTdjNjQxNzA3YTk3Yjg1NjIxMzI5N2Y0YjQ3NGNlODkwMDI4NDZk
+    MDkxZmFjNDIxODhiMWMxN2FjZmUxMTNjYTBhYTJlZGY0YjY0ODk=
   data.tar.gz: !binary |-
-    ZjRjZDdlNTJhODcxOGE5OTE4ZGM3NmI4OTNmYmY5ZmFiODdjYTJiZWZmNGNl
-    MWRlYTg0NGY2YTgzN2I2NDJlMmE5YWRkNWYxYjlmMDlhYzNhMzU0NTdiZGQw
-    ODNiOGJkOTMzNjQxZWZhNmRjOGM4ODk3OTFlMzc5ZDZmNmE1YjQ=
+    ODY3ZGMyY2Y5MDgyMDBjYTBiMzFjZjA1NTdkOWUyZjBhYTk3OTIxM2YyZTkw
+    ZGM4M2IzMGQyZDc1Nzg5MjIzNGQ5NGMwYThhYTkwMTY3NjUyZTY1OWZhYTdk
+    ZmMyZTNiMDY4ZDI4N2Q5OTJjODAyYjJmNjZmYTI0YTk0MjRmYWU=

data/README.md

@@ -1,2 +1,60 @@
 # capistrano-shoryuken
-Shoryuken integration for Capistrano
+Shoryuken integration for Capistrano.  Loosely based on `capistrano-sidekiq`
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'capistrano-shoryuken', github: 'joekhoobyar/capistrano-shoryuken'
+
+or:
+
+    gem 'capistrano-shoryuken', group: :development
+
+And then execute:
+
+    $ bundle
+
+
+## Usage
+```ruby
+    # Capfile
+
+    require 'capistrano/shoryuken'
+```
+
+
+Configurable options, shown here with defaults (using Capistrano 3 syntax):
+
+```ruby
+    # config/deploy.rb
+    
+    # Whether or not to hook into the default deployment recipe.
+    set :shoryuken_default_hooks,  true
+    
+    set :shoryuken_pid,            -> { File.join(shared_path, 'tmp', 'pids', 'shoryuken.pid') }
+    set :shoryuken_env,            -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+    set :shoryuken_log,            -> { File.join(shared_path, 'log', 'shoryuken.log') }
+    set :shoryuken_config,         -> { File.join(release_path, 'config', 'shoryuken.yml') }
+    set :shoryuken_requires,       -> { [] }
+    set :shoryuken_options,        -> { ['--rails'] }
+    set :shoryuken_queues,         -> { [] }
+    set :shoryuken_role,           :app
+```
+
+## Changelog
+- 0.1.2: Support --require option.
+- 0.1.1: Default --rails option. Support Capistrano 3
+- 0.1.0: Support Capistrano 2
+
+## Contributors
+
+- [Joe Khoobyar] (https://github.com/joekhoobyar)
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/capistrano/shoryuken/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Shoryuken
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/capistrano/tasks/capistrano2.rb

@@ -2,16 +2,17 @@ Capistrano::Configuration.instance.load do
 
   _cset(:shoryuken_default_hooks) { true }
 
-  _cset(:shoryuken_pid) { File.join(shared_path, 'pids', 'shoryuken.pid') }
-  _cset(:shoryuken_env) { fetch(:rack_env, fetch(:rails_env, 'production')) }
-  _cset(:shoryuken_log) { File.join(shared_path, 'log', 'shoryuken.log') }
-  _cset(:shoryuken_config) { "#{current_path}/config/shoryuken.yml" }
-  _cset(:shoryuken_options) { '--rails' }
-  _cset(:shoryuken_queues) { nil }
+  _cset(:shoryuken_pid)      { File.join(shared_path, 'pids', 'shoryuken.pid') }
+  _cset(:shoryuken_env)      { fetch(:rack_env, fetch(:rails_env, 'production')) }
+  _cset(:shoryuken_log)      { File.join(shared_path, 'log', 'shoryuken.log') }
+  _cset(:shoryuken_config)   { "#{current_path}/config/shoryuken.yml" }
+  _cset(:shoryuken_requires) { [] }
+  _cset(:shoryuken_queues)   { [] }
+  _cset(:shoryuken_options)  { '--rails' }
 
-  _cset(:shoryuken_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec shoryuken" }
+  _cset(:shoryuken_cmd)     { "#{fetch(:bundle_cmd, 'bundle')} exec shoryuken" }
 
-  _cset(:shoryuken_role) { :app }
+  _cset(:shoryuken_role)    { :app }
 
   if fetch(:shoryuken_default_hooks)
     after 'deploy:stop', 'shoryuken:stop'
@@ -43,6 +44,7 @@ Capistrano::Configuration.instance.load do
       logfile = fetch(:shoryuken_log) and args.push "--logfile '#{logfile}'"
       config = fetch(:shoryuken_config) and args.push "--config '#{config}'"
       queues = Array(fetch(:shoryuken_queues)) and queues.each{|queue| args.push "--queue #{queue}" }
+      reqs = Array(fetch(:shoryuken_requires)) and reqs.each{|req| args.push "--require #{req}" }
       options = fetch(:shoryuken_options) and args.push Array(options).join(' ')
       
       cmd = fetch(:shoryuken_cmd)

data/lib/capistrano/tasks/shoryuken.cap

@@ -2,13 +2,15 @@ namespace :load do
   task :defaults do
     set :shoryuken_default_hooks, -> { true }
 
-    set :shoryuken_pid,     -> { File.join(shared_path, 'tmp', 'pids', 'shoryuken.pid') }
-    set :shoryuken_env,     -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
-    set :shoryuken_log,     -> { File.join(shared_path, 'log', 'shoryuken.log') }
-    set :shoryuken_config,  -> { File.join(release_path, 'config', 'shoryuken.yml') }
-    set :shoryuken_options, -> { '--rails' }
+    set :shoryuken_pid,      -> { File.join(shared_path, 'tmp', 'pids', 'shoryuken.pid') }
+    set :shoryuken_env,      -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+    set :shoryuken_log,      -> { File.join(shared_path, 'log', 'shoryuken.log') }
+    set :shoryuken_config,   -> { File.join(release_path, 'config', 'shoryuken.yml') }
+    set :shoryuken_requires, -> { [] }
+    set :shoryuken_queues,   -> { [] }
+    set :shoryuken_options,  -> { '--rails' }
       
-    set :shoryuken_role,    -> { :app }
+    set :shoryuken_role,     -> { :app }
     
     # Rbenv and RVM integration
     set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(shoryuken))
@@ -89,6 +91,7 @@ namespace :shoryuken do
           logfile = fetch(:shoryuken_log) and args.push "--logfile '#{logfile}'"
           config = fetch(:shoryuken_config) and args.push "--config '#{config}'"
           queues = Array(fetch(:shoryuken_queues)) and queues.each{|queue| args.push "--queue #{queue}" }
+          reqs = Array(fetch(:shoryuken_requires)) and reqs.each{|req| args.push "--require #{req}" }
           options = fetch(:shoryuken_options) and args.push Array(options).join(' ')
           
           with rails_env: fetch(:shoryuken_env) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-shoryuken
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joe Khoobyar