capistrano-runit 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.1.3 2013-04-19
+
+  * Added recipes for sidekiq.
+  * Fixed: runit:setup should run on servers with db-role too.
+  * Added recipes for thinking-sphinx.
+  * Use rails_env variable instead of hardwired 'production' in run-unicorn.
+
 === 1.1.2 2011-11-05
 
   * Added double quotes for environment variables values.

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2011-2013 Anton Ageev
+
+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/capistrano-runit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capistrano-runit"
-  s.version = "1.1.2"
+  s.version = "1.1.3"
   s.summary = "Useful deployment recipes."
   s.homepage = "https://github.com/antage/capistrano-runit"
   s.author = "Anton Ageev"

data/lib/capistrano-runit/recipes.rb

@@ -2,3 +2,5 @@ require "capistrano-runit/recipes/base"
 require "capistrano-runit/recipes/unicorn"
 require "capistrano-runit/recipes/delayed_job"
 require "capistrano-runit/recipes/resque"
+require "capistrano-runit/recipes/sidekiq"
+require "capistrano-runit/recipes/thinking_sphinx"

data/lib/capistrano-runit/recipes/base.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(true).load do
 
   namespace :runit do
     desc "Setup runit directories"
-    task :setup, :roles => :app do
+    task :setup, :roles => [:app, :db] do
       run "[ -d #{runit_dir}/.env ] || mkdir -p #{runit_dir}/.env"
       run "echo $HOME > #{runit_dir}/.env/HOME"
       run "[ -d #{runit_dir}/available ] || mkdir -p #{runit_dir}/available"

data/lib/capistrano-runit/recipes/delayed_job.rb

@@ -1,7 +1,7 @@
 Capistrano::Configuration.instance(true).load do
   _cset :runit_delayed_job_service_name, "delayed_job"
   _cset :runit_delayed_job_template, File.expand_path(File.join(File.dirname(__FILE__), "../templates/run-delayed_job.erb"))
-  _cset :runit_delayed_job_environment, defer { { "RAILS_ENV" => fetch(:rails_env) } }
+  _cset :runit_delayed_job_environment, defer { { "RAILS_ENV" => fetch(:rails_env, "production") } }
   _cset :runit_delayed_job_command, "./script/delayed_job"
 
   namespace :runit do

data/lib/capistrano-runit/recipes/resque.rb

@@ -1,7 +1,7 @@
 Capistrano::Configuration.instance(true).load do
   _cset :runit_resque_service_name, "resque"
   _cset :runit_resque_template, File.expand_path(File.join(File.dirname(__FILE__), "../templates/run-resque.erb"))
-  _cset :runit_resque_environment, defer { { "RAILS_ENV" => fetch(:rails_env) } }
+  _cset :runit_resque_environment, defer { { "RAILS_ENV" => fetch(:rails_env, "production") } }
   _cset :runit_resque_command, defer { "#{rake} environment resque:work" }
   _cset :runit_resque_queue, "*"
 

data/lib/capistrano-runit/recipes/sidekiq.rb

@@ -0,0 +1,49 @@
+Capistrano::Configuration.instance(true).load do
+  _cset :runit_sidekiq_service_name, "sidekiq"
+  _cset :runit_sidekiq_template, File.expand_path(File.join(File.dirname(__FILE__), "../templates/run-sidekiq.erb"))
+  _cset :runit_sidekiq_environment, {}
+  _cset :runit_sidekiq_command, "sidekiq"
+  _cset :runit_sidekiq_queues, ["default"]
+  _cset :runit_sidekiq_processes, 4
+
+  namespace :runit do
+    namespace :sidekiq do
+      desc "Setup sidekiq runit-service"
+      task :setup, :roles => :app do
+        run "[ -d #{runit_dir}/available/#{runit_sidekiq_service_name} ] || mkdir -p #{runit_dir}/available/#{runit_sidekiq_service_name}"
+        template = File.read(runit_sidekiq_template)
+        erb_template = ERB.new(template)
+        servers = find_servers_for_task(current_task)
+        servers.each do |server|
+          put erb_template.result(binding), "#{runit_dir}/available/#{runit_sidekiq_service_name}/run", :mode => 0755, :hosts => server.host
+        end
+        find_and_execute_task "runit:sidekiq:enable"
+      end
+
+      desc "Enable sidekiq runit-service"
+      task :enable, :roles => :app do
+        run "cd #{runit_dir}/enabled && [ -h ./#{runit_sidekiq_service_name} ] || ln -sf ../available/#{runit_sidekiq_service_name} ."
+      end
+
+      desc "Disable sidekiq runit-service"
+      task :disable, :roles => :app do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_sidekiq_service_name} ] || sv stop #{runit_dir}/enabled/#{runit_sidekiq_service_name}/ && rm -f #{runit_dir}/enabled/#{runit_sidekiq_service_name}"
+      end
+
+      desc "Start sidekiq runit-service"
+      task :start, :roles => :app do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_sidekiq_service_name} ] || sv start #{runit_dir}/enabled/#{runit_sidekiq_service_name}/"
+      end
+
+      desc "Stop sidekiq runit-service"
+      task :stop, :roles => :app do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_sidekiq_service_name} ] || sv stop #{runit_dir}/enabled/#{runit_sidekiq_service_name}/"
+      end
+
+      desc "Restart sidekiq runit-service"
+      task :restart, :roles => :app do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_sidekiq_service_name} ] || sv restart #{runit_dir}/enabled/#{runit_sidekiq_service_name}/"
+      end
+    end
+  end
+end

data/lib/capistrano-runit/recipes/thinking_sphinx.rb

@@ -0,0 +1,47 @@
+Capistrano::Configuration.instance(true).load do
+  _cset :runit_thinking_sphinx_service_name, "sphinx"
+  _cset :runit_thinking_sphinx_template, File.expand_path(File.join(File.dirname(__FILE__), "../templates/run-sphinx.erb"))
+  _cset :runit_thinking_sphinx_environment, defer { fetch(:rails_env, "production") }
+  _cset :runit_thinking_sphinx_searchd_command, "/usr/bin/searchd"
+
+  namespace :runit do
+    namespace :thinking_sphinx do
+      desc "Setup Thinking Sphinx runit-service"
+      task :setup, :roles => :db do
+        run "[ -d #{runit_dir}/available/#{runit_thinking_sphinx_service_name} ] || mkdir -p #{runit_dir}/available/#{runit_thinking_sphinx_service_name}"
+        template = File.read(runit_thinking_sphinx_template)
+        erb_template = ERB.new(template)
+        servers = find_servers_for_task(current_task)
+        servers.each do |server|
+          put erb_template.result(binding), "#{runit_dir}/available/#{runit_thinking_sphinx_service_name}/run", :mode => 0755, :hosts => server.host
+        end
+        find_and_execute_task "runit:thinking_sphinx:enable"
+      end
+
+      desc "Enable Thinking Sphinx runit-service"
+      task :enable, :roles => :db do
+        run "cd #{runit_dir}/enabled && [ -h ./#{runit_thinking_sphinx_service_name} ] || ln -sf ../available/#{runit_thinking_sphinx_service_name} ."
+      end
+
+      desc "Disable Thinking Sphinx runit-service"
+      task :disable, :roles => :db do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name} ] || sv stop #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name}/ && rm -f #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name}"
+      end
+
+      desc "Start Thinking Sphinx runit-service"
+      task :start, :roles => :db do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name} ] || sv start #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name}/"
+      end
+
+      desc "Stop Thinking Sphinx runit-service"
+      task :stop, :roles => :db do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name} ] || sv stop #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name}/"
+      end
+
+      desc "Restart Thinking Sphinx runit-service"
+      task :restart, :roles => :db do
+        run "[ ! -h #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name} ] || sv restart #{runit_dir}/enabled/#{runit_thinking_sphinx_service_name}/"
+      end
+    end
+  end
+end

data/lib/capistrano-runit/templates/run-sidekiq.erb

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd <%= current_path %>
+<%= fetch(:default_environment, {}).map { |k, v| "#{k}=\"#{v}\"" }.join(" ") %> <%= runit_sidekiq_environment.map { |k, v| "#{k}=\"#{v}\"" }.join(" ") %> exec <%= runit_sidekiq_command %> -e <%= fetch(:rails_env, "production") %> -g <%= application %> -c <%= fetch(:runit_sidekiq_processes, 4) %> <%= runit_sidekiq_queues.map { |q| "-q #{q}" }.join(" ") %> -L <%= File.join(shared_path, "log", "sidekiq.#{fetch(:rails_env, "production")}.log") %> -P <%= File.join(shared_path, "pids", "sidekiq.pid") %>

data/lib/capistrano-runit/templates/run-sphinx.erb

@@ -0,0 +1,4 @@
+#!/bin/sh
+exec <%= runit_thinking_sphinx_searchd_command %> \
+  --nodetach \
+  --config <%= current_path %>/config/<%= runit_thinking_sphinx_environment %>.sphinx.conf

data/lib/capistrano-runit/templates/run-unicorn.erb

@@ -125,7 +125,7 @@ if [ ! $RUNNING ]; then
     echo "Starting unicorn"
     old=$(pwd)
     cd $APP_DIR
-    <%= fetch(:default_environment, {}).map { |k, v| "#{k}=\"#{v}\"" }.join(" ") %> <%= runit_unicorn_command %> -E production -c $THIS_DIR/unicorn.rb -D
+    <%= fetch(:default_environment, {}).map { |k, v| "#{k}=\"#{v}\"" }.join(" ") %> <%= runit_unicorn_command %> -E <%= fetch(:rails_env, "production") %> -c $THIS_DIR/unicorn.rb -D
     cd $old
     sleep 2
     CUR_PID=$(cat $CUR_PID_FILE)

metadata

@@ -1,92 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-runit
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.1.3
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Anton Ageev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email: antage@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - History.txt
+- LICENSE
 - README.markdown
 - capistrano-runit.gemspec
 - lib/capistrano-runit/recipes.rb
 - lib/capistrano-runit/recipes/base.rb
 - lib/capistrano-runit/recipes/delayed_job.rb
 - lib/capistrano-runit/recipes/resque.rb
+- lib/capistrano-runit/recipes/sidekiq.rb
+- lib/capistrano-runit/recipes/thinking_sphinx.rb
 - lib/capistrano-runit/recipes/unicorn.rb
 - lib/capistrano-runit/templates/run-delayed_job.erb
 - lib/capistrano-runit/templates/run-resque.erb
+- lib/capistrano-runit/templates/run-sidekiq.erb
+- lib/capistrano-runit/templates/run-sphinx.erb
 - lib/capistrano-runit/templates/run-unicorn.erb
 homepage: https://github.com/antage/capistrano-runit
 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.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Useful deployment recipes.
 test_files: []
-