capistrano-base_helper 0.0.8 → 0.0.9

data/README.md

@@ -1,6 +1,6 @@
 # Capistrano - Base helpers
 
-This libary is a helper library for capistrano tasks that setup monit/runit for various services.
+This libary is a helper library for capistrano tasks that setup [runit](smarden.org/runit/) and [monit](http://mmonit.com/monit) for various services.
 
 ## Services for Monit and Runit
 
@@ -83,7 +83,7 @@ See each gem if you want to start/stop each service separate instead of together
 ## Assumptions
 
 There are some assumptions when using this with capistrano.
-The following variables must be set 
+The following variables must be set
 
 * _:application_ - The application name
 * _:user_ - The username which is running the deployed application (usually deploy..)

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/capistrano-base_helper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-base_helper"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Ringstad"]
-  s.date = "2013-07-29"
+  s.date = "2013-08-01"
   s.description = "Helpers for capistrano recipes using runit/monit. Currently: capistrano-puma and capistrano-delayed_job"
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [

data/lib/capistrano/base_helper/monit_base.rb

@@ -5,7 +5,7 @@
 # Available services: shared_path/monit/available
 # Enabled services: shared_path/monit/enabled
 # Application "global" config: shared_path/monit/application.conf <-- in this: include shared_path/monit/enabled
-# 
+#
 # For control of monit, sudo is required, as it always runs as root. (Unfortunately.)
 #
 
@@ -13,7 +13,7 @@ Capistrano::Configuration.instance(true).load do
   _cset :monit_dir,            defer { File.join(shared_path, "monit") }
   _cset :monit_available_path, defer { File.join(monit_dir, "available") }
   _cset :monit_enabled_path,   defer { File.join(monit_dir, "enabled") }
-  _cset :monit_etc_path,       File.join("/etc", "monit") 
+  _cset :monit_etc_path,       File.join("/etc", "monit")
   _cset :monit_etc_conf_d_path,  defer { File.join(monit_etc_path, "conf.d") }
   _cset :monit_application_group_name,  defer { "#{fetch(:user)}_#{fetch(:application)}_#{Capistrano::BaseHelper.environment}" }
 
@@ -33,7 +33,7 @@ Capistrano::Configuration.instance(true).load do
   _cset :monit_local_application_conf, File.join(File.expand_path(File.join(File.dirname(__FILE__),"../../../templates", "monit")), "app_include.conf.erb")
 
   _cset :monit_remote_monitrc, File.join("/etc","monit","monitrc")
-  _cset :monit_remote_application_conf, File.join(fetch(:monit_dir), "monit.conf")
+  _cset :monit_remote_application_conf, defer { File.join(fetch(:monit_dir), "monit.conf") }
 
   #after "deploy:update", "monit:enable"
   after "deploy:setup", "monit:setup"
@@ -50,7 +50,7 @@ Capistrano::Configuration.instance(true).load do
 
   before "monit:disable", "monit:unmonitor"
   after "monit:disable", "monit:reload"
-  
+
   before "monit:purge", "monit:unmonitor"
 
   namespace :monit do
@@ -95,7 +95,7 @@ Capistrano::Configuration.instance(true).load do
       # symlink to include file
       run("[ -h #{symlink} ] || #{sudo} ln -sf #{real_conf} #{symlink}")
     end
- 
+
     desc "Disable monit services for application"
     task :disable, :roles => [:app, :db, :web] do
       symlink   = File.join(fetch(:monit_etc_conf_d_path), "#{Capistrano::BaseHelper.user_app_env_underscore}.conf")
@@ -104,7 +104,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Purge/remove all monit configurations for the application"
     task :purge, :roles => [:app, :db, :web] do
-        symlink   = File.join(fetch(:monit_etc_conf_d_path), "#{Capistrano::BaseHelper.user_app_env_underscore}.conf")
+      symlink   = File.join(fetch(:monit_etc_conf_d_path), "#{Capistrano::BaseHelper.user_app_env_underscore}.conf")
       run("[ ! -h #{symlink} ]   || #{sudo} rm -f #{symlink}")
       run("[ ! -d #{fetch(:monit_dir)} ] || #{sudo} rm -f #{fetch(:monit_dir)}")
     end
@@ -112,17 +112,17 @@ Capistrano::Configuration.instance(true).load do
     desc "Monitor the application"
     task :monitor, :roles => [:app, :db, :web] do
       Capistrano::MonitBase::Application::command_monit_group(fetch(:monit_application_group_name), "monitor")
-    end 
+    end
 
     desc "Unmonitor the application"
     task :unmonitor, :roles => [:app, :db, :web] do
       Capistrano::MonitBase::Application::command_monit_group(fetch(:monit_application_group_name), "unmonitor")
-    end 
+    end
 
     desc "Stop monitoring the application permanent (Monit saves state)"
     task :stop, :roles => [:app, :db, :web] do
       Capistrano::MonitBase::Application::command_monit_group(fetch(:monit_application_group_name), "stop")
-    end 
+    end
 
     desc "Start monitoring the application permanent (Monit saves state)"
     task :start, :roles => [:app, :db, :web] do
@@ -185,8 +185,8 @@ module Capistrano
       ##
       # Command a single monit service
       #
-      # The service name scheme is recommended to be 
-      # "#{user}_#{application}_#{environment}_#{service}" 
+      # The service name scheme is recommended to be
+      # "#{user}_#{application}_#{environment}_#{service}"
       #
       def command_monit(command, service_name="", arguments="")
         c = Capistrano::BaseHelper.get_capistrano_instance
@@ -198,7 +198,7 @@ module Capistrano
       # The service name is the same as the conf file name for the service.
       # E.g. puma.conf
       #
-      # This will symlink the service to enabled service, but not start or reload monit configuration 
+      # This will symlink the service to enabled service, but not start or reload monit configuration
       #
       def enable(service_conf_filename)
         c = Capistrano::BaseHelper.get_capistrano_instance
@@ -209,7 +209,7 @@ module Capistrano
         c = Capistrano::BaseHelper.get_capistrano_instance
         c.run("rm -f #{File.join(c.fetch(:monit_enabled_path), service_conf_filename)}")
       end
-    end  
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-base_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1100537454403355880
+      hash: 1324722637583950222
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: