capistrano-runit-tasks 0.2.4 → 1.0.0.pre1

data/{ChangeLog → CHANGELOG}

@@ -1,19 +1,14 @@
-*0.2.4* (July 14th 2010)
---------------------------------------------------
-
-* Backport service_root patch
-
-*0.2.3* (November 20th 2006)
+*HEAD* 
 --------------------------------------------------
+* Add service_root variable, to allow the service dir to live outside the deployment tree. [jon@zomo.co.uk]
 
 * Add runit_sudo_tasks variable, array of symbols indicating tasks names to be
-  run using sudo.
+  run using try_sudo.
 
 * Added support for mongrel, and basic mongrel runner template
 
 * Changed fcgi_port and fcgi_listener_base_port to listener_port and
-  listener_base_port. Old variable names still supported but considered
-  deprecated.
+  listener_base_port. Old variable names not supported
 
 *0.2.0* (March 23rd 2006)
 --------------------------------------------------

data/{README.txt → README}

@@ -5,21 +5,13 @@ Adds tasks to Capistrano for use with the runit supervision scheme.
 This library extends Capistrano to allow processes to be supervised using the
 runit package. It replaces some of the standard tasks with runit versions and
 includes tasks and helpers to create the service directory layout and populate
-it with run scripts. It has support fcgi and mongrel listeners, and tries to
+it with run scripts. It has support fcgi, mongrel and merb listeners, and tries to
 make it easy to add other services in your deploy.rb.
 
 == Status
 
-capistrano-runit-tests 0.2.3 (known as cappy-runit from now on) is the third
-release of the library. It will need more work to be useful to everybody who
-uses runit. It supports both the sv and runsvctrl/runsvstat versions of runit.
-Support for daemontools svc command will be added at a later date.
-
-The current version is based around a runit setup similar to the one created
-in http://www.defendem.com/read/chapter/5#page6, i.e. a supervised directory
-where links can be created to get tasks monitored. If your runit setup is
-different, read below for the variables you can set in your deploy.rb to
-handle this and let me know if there is something these can't handle.
+capistrano-runit-tests 0.3.0 (known as cappy-runit from now on) is the third
+release of the library. It supports both the sv and runsvctrl/runsvstat versions of runit.
 
 == Quick Start
 
@@ -64,6 +56,10 @@ Then adds the following tasks, helpers and variables:
                           of the service directory in the app on the server(s).
                           (Default: service)
 
+[service_root]            Change this if you want to change the location
+                          of the service directory.
+                          (Default: Same as your deploy_to)
+
 [master_service_dir]      Supervised directory where cappy-runit will link the
                           service directories to to start the service.
                           (Default: ~/services)
@@ -83,9 +79,7 @@ Then adds the following tasks, helpers and variables:
 [runit_sudo_tasks]         Array of tasks names to run using sudo
                            (default: [])
 
-cappy-runit creates a directory for each listener you ask for. At the moment
-the directories are created by setup_service_dirs. Later versions should allow
-for dynamic creation / deletion.
+cappy-runit creates a service directory for each listener you ask for. 
 
 The directories are named after the port number the listener will run on. If
 you specified 8500 for the base port and 3 for the listener_count then

data/lib/capistrano-runit-tasks.rb

@@ -4,94 +4,61 @@ require 'runit_runner_helper'
 require 'runit_command_helper'
 require 'runit_service_helper'
 
-Capistrano.configuration(:must_exist).load do |conf|
+Capistrano::Configuration.instance(:must_exist).load do
   set :service_dir, 'service'
   set :listener_count, 1
   set :listener_type, :mongrel
   set :master_service_dir, '~/service'
-  set :service_root, conf[:deploy_to]
+  set :service_root, variables[:deploy_to]
   set :listener_base_port, 9000
   set :sv_command, :sv # can be :sv or :runsvctrl
   set :runner_template_path, File.join('templates', 'runit')
   set :runit_sudo_tasks, []
    
-  # We need our own task for this as the default cold_deploy
-  # calls restart, which won't work until we've setup the 
-  # symlink, perhaps we could add a test to restart to check if the
-  # link exists, but that's beyond my current (very bad) shell-foo 
-  desc "Used only for deploying when the services haven't been setup"
-  task :cold_deploy do
-    handle_deprecated_vars
-    transaction do
-      update_code
-      symlink
+  namespace :deploy do
+    desc "Sets up services directories for supervising listeners using runit"
+    task :setup_service_dirs do
+      handle_deprecated_vars
+      application_service_dir = "#{service_root}/#{service_dir}"
+      runit_helper.run_or_sudo "mkdir -p #{application_service_dir}"
+
+      each_listener do |listener_port|
+        # DEPRECATION: Need to pass port and fcgi_port to handle old templates, fcgi_port is considered deprecated
+        service.add listener_port, :template => listener_type, :listener_port => listener_port, :fcgi_port => listener_port
+      end
     end
-    spinner
-  end
 
-  desc "Sets up services directories for supervising listeners using runit"
-  task :setup_service_dirs do
-    handle_deprecated_vars
-    application_service_dir = "#{service_root}/#{service_dir}"
-    runit_helper.run_or_sudo "mkdir -p #{application_service_dir}"
-        
-    each_listener do |listener_port|
-      # DEPRECATION: Need to pass port and fcgi_port to handle old templates, fcgi_port is considered deprecated
-      service.add listener_port, :template => listener_type, :listener_port => listener_port, :fcgi_port => listener_port
+    desc "Links created service dir into master service dir so runit starts the listeners"
+    task :start, :roles => :app do
+      handle_deprecated_vars
+      each_listener do |listener_port|
+        service_dir = "#{service_root}/#{service_dir}/#{listener_port}"
+        runit_helper.run_or_sudo "ln -nsf #{service_dir} #{master_service_dir}/#{application}-#{listener_port}"    
+      end
     end
-  end
-    
-  desc "Links created service dir into master service dir so runit starts the listeners"
-  task :spinner do
-    handle_deprecated_vars
-    each_listener do |listener_port|
-      service_dir = "#{service_root}/#{service_dir}/#{fcgi_listener_port}"
-     runit_helper.run_or_sudo "ln -sf #{service_dir} #{master_service_dir}/#{application}-#{listener_port}"    
+
+    desc "restart task for runit supervised listeners"
+    task :restart, :roles => :app do
+      handle_deprecated_vars
+      sv.usr2 listener_dirs      
     end
-  end
-  
-  desc "restart task for runit supervised listeners"
-  task :restart, :roles => :app do
-    handle_deprecated_vars
-    sv.usr2 listener_dirs      
-  end
-  
-  desc "Hook into after setup to create the runit service directory"
-  task :after_setup do
-    handle_deprecated_vars
-    setup_service_dirs
-  end
 
-  def each_listener
-    listener_base_port.upto(listener_base_port + listener_count - 1) do |listener_port|
-      yield listener_port
+    desc "Hook into after setup to create the runit service directory"
+    task :after_setup do
+      handle_deprecated_vars
+      setup_service_dirs
     end
-  end
-  
-  def listener_dirs
-    dirs = []
-    each_listener { |port| dirs << "#{service_root}/#{service_dir}/#{port}" }
-    dirs
-  end
-  
-  ## DEPRECATED - and alias_method won't work inside the instance_eval this is run in
-  def each_fcgi_listener
-    each_listener { |listener_port| yield listener_port }
-  end
 
-  def fcgi_listener_dirs
-    listener_dirs
-  end
-  
-  def handle_deprecated_vars
-    handle_deprecated_var :fcgi_listener_base_port, :listener_base_port
-    handle_deprecated_var :fcgi_count, :listener_count
-  end
-  
-  def handle_deprecated_var(old_var, new_var)
-    if @variables.has_key?(old_var)
-      set new_var, @variables[old_var]
+    def each_listener
+      listener_base_port.upto(listener_base_port + listener_count - 1) do |listener_port|
+        yield listener_port
+      end
+    end
+
+    def listener_dirs
+      dirs = []
+      each_listener { |port| dirs << "#{service_root}/#{service_dir}/#{port}" }
+      dirs
     end
-    set old_var, @variables[new_var]
   end
 end

data/lib/runit_command_helper.rb

@@ -38,13 +38,13 @@ module RunitCommandHelper
 
   protected
   def get_command(signal, cmd)
-    case configuration.sv_command
+    case self.sv_command
       when :sv
         "sv #{cmd}"
       when :runsvctrl
         signal == 'status' ? 'runsvstat' : "runsvctrl #{cmd}"
       else
-        raise "Error: sv_command setting of #{configuration.sv_command} is unsupported"
+        raise "Error: sv_command setting of #{self.sv_command} is unsupported"
     end
   end  
 end

data/lib/runit_helper.rb

@@ -9,8 +9,8 @@ end
 # use before running a command
 module RunitHelper
   def run_or_sudo(command)
-    if configuration.runit_sudo_tasks.include? configuration.actor.current_task.name
-      sudo command
+    if self.current_task && self.runit_sudo_tasks.include?(self.current_task.name)
+      try_sudo command
     else
       run command
     end
@@ -29,4 +29,4 @@ module RunitHelper
   end
 end
 
-Capistrano.plugin :runit_helper, RunitHelper
+Capistrano.plugin :runit_helper, RunitHelper

data/lib/runit_runner_helper.rb

@@ -4,6 +4,7 @@ rescue LoadError
   require 'rubygems'
   require 'capistrano'
 end
+require 'erb'
 
 # This module provides methods to ease creating run scripts in service directories.
 #
@@ -37,8 +38,12 @@ module RunitRunnerHelper
     options.delete(:log_runner)
     
     options = add_default_options(options)
-
-    runner = render options.merge(:template => get_template(template))
+    b = Proc.new { binding }.call
+    options.each do |key, value|
+      next if key == :template
+      eval "#{key} = options[:#{key}]", b
+    end
+    runner = ERB.new(get_template(template)).result(b)
 
     put runner, path, :mode => 0700    
   end  
@@ -58,7 +63,7 @@ module RunitRunnerHelper
       template
     else
       [ ".",
-        configuration.runner_template_path,
+        self.runner_template_path,
         File.join(File.dirname(__FILE__), 'capistrano-runit-tasks-templates')
       ].each do |dir|
         if File.file?(File.join(dir, template))
@@ -74,7 +79,7 @@ module RunitRunnerHelper
   
   protected
   def add_default_options(options)
-    {:deploy_to => configuration.deploy_to}.merge(options)
+    {:deploy_to => self.deploy_to}.merge(options)
   end
 end
 

data/lib/runit_service_helper.rb

@@ -31,16 +31,14 @@ module RunitServiceHelper
 
   # Returns the full path to the service directory given a service name.
   # Doesn't check the service name is valid.
-  def service_dir(service_name)
-    "#{configuration.service_root}/#{configuration.service_dir}/#{service_name}"
+  def service_path(service_name)
+    "#{self.service_root}/#{self.service_dir}/#{service_name}"
   end
   
   protected
   def create_service(service_name, options)
-    template_base = options[:common_template] ? options[:common_template] : service_name.to_s
-    options.delete(:shared_template)
     if options[:template].nil?
-      runner_template_path = options[:log_runner] ? "#{template_base}_log_runner" : "#{template_base}_runner"        
+      runner_template_path = options[:log_runner] ? "#{service_name.to_s}_log_runner" : "#{service_name.to_s}_runner"        
       runner_template = runner.get_template(runner_template_path)
       if runner_template == runner_template_path # didn't find a template
         if options[:log_runner]
@@ -54,11 +52,11 @@ module RunitServiceHelper
       runner_template = options[:template]
     end
     options.delete(:template)
-    runner.create service_dir(service_name), runner_template, options
+    runner.create service_path(service_name), runner_template, options
   end
 
   def make_service_dir(service_name)
-    runit_helper.run_or_sudo "mkdir -p #{service_dir(service_name)}/log/main"
+    runit_helper.run_or_sudo "mkdir -p #{service_path(service_name)}/log/main"
   end
 end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-runit-tasks
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: -1876988176
+  prerelease: true
   segments: 
+  - 1
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 0
+  - pre1
+  version: 1.0.0.pre1
 platform: ruby
 authors: 
 - Chris McGrath
@@ -23,7 +24,7 @@ dependencies: []
 description: This library extends Capistrano to allow processes to be supervised using the runit package. It replaces some of the standard tasks with runit versions and includes tasks and helpers to create the service directory layout and populate it with run scripts. It has support fcgi, mongrel and merb listeners, and tries to make it easy to add other services in your deploy.rb.
 email: 
 - chris@octopod.info
-- jon@zomo.co.uk
+- ""
 executables: []
 
 extensions: []
@@ -39,8 +40,8 @@ files:
 - lib/runit_helper.rb
 - lib/runit_runner_helper.rb
 - lib/runit_service_helper.rb
-- README.txt
-- ChangeLog
+- README
+- CHANGELOG
 has_rdoc: true
 homepage: http://github.com/chrismcg/cappy-runit
 licenses: []