itrigga-cap_deploy 0.2.2 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/lib/itrigga/cap_deploy/cap_tasks.rb

@@ -41,14 +41,17 @@ configuration.load do
     puts "setting ownership on #{shared_log_dir} & files to #{user}"
     run "#{sudo} chown -R #{user} #{shared_log_dir}"
 
+    # this is needed for the case when the web process does not run in the
+    # app root dir (e.g. tn)
+    puts "removing default #{current_path}/log symlink"
+    run "#{sudo} rm #{current_path}/log"
+    
     puts "ensuring log dir #{web_dir}/log is symlinked to #{std_log_dir}"
     symlink_dir( std_log_dir, "#{web_dir}/log" )
 
     puts "setting ownership on log dir & files to #{user}"
     run "#{sudo} chown -R #{user} #{web_dir}/log"
 
-    puts "removing default #{current_path}/log symlink"
-    run "#{sudo} rm #{current_path}/log"
   end
 
   task :symlink_pid_dirs do
@@ -87,7 +90,7 @@ configuration.load do
     puts "regenerating monit config file(s)"
     run "test -d #{shared_dir}/templates || mkdir -p #{shared_dir}/templates"
 
-    run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=monit TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=`readlink /etc/#{config_file_name}` BASE_DIR=#{shared_dir}"
+    run "cd #{web_dir} && #{sudo} rake itrigga:generator RAILS_ENV=#{stage} APPLICATION_NAME=#{application_stub} PATTERN=monit TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=`readlink /etc/#{config_file_name}` BASE_DIR=#{shared_dir}"
     puts "setting permissions & ownership on monit config files"
     set_permissions_on_files_in_dir( :dir=>"#{shared_dir}/templates", :ownership=>"root", :permissions=>"0700")
 
@@ -114,7 +117,7 @@ configuration.load do
     puts "regenerating logrotate config file"
     run "test -d #{shared_dir}/templates || mkdir -p #{shared_dir}/templates"
     
-    run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=logrotate TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false BASE_DIR=#{shared_dir}"
+    run "cd #{web_dir} && #{sudo} rake itrigga:generator RAILS_ENV=#{stage} APPLICATION_NAME=#{application_stub} PATTERN=logrotate TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false BASE_DIR=#{shared_dir}"
     puts "setting permissions & ownership on logrotate config files"
     set_permissions_on_files_in_dir( :dir=>"#{shared_dir}/templates", :ownership=>"root", :permissions=>"0700" )
   end
@@ -142,7 +145,7 @@ configuration.load do
     
     with_role :solr do
       solr_lockfile_script_path = File.join(shared_dir,"templates","solr_lockfile_check.script")
-      run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=solr_lockfile_check.cron TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false SOLR_LOCKFILE_SCRIPT_PATH=#{solr_lockfile_script_path}"
+      run "cd #{web_dir} && #{sudo} rake itrigga:generator RAILS_ENV=#{stage} APPLICATION_NAME=#{application_stub} PATTERN=solr_lockfile_check.cron TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false SOLR_LOCKFILE_SCRIPT_PATH=#{solr_lockfile_script_path}"
     end
     
     puts "setting permissions & ownership on cron scripts"
@@ -169,7 +172,7 @@ configuration.load do
     
     with_role :solr do
       solr_lockfile_path = File.join(shared_dir,"solr","data","index","*.lock")
-      run "cd #{web_dir} && #{sudo} rake itrigga:generator PATTERN=solr_lockfile_check.script TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false SOLR_LOCKFILE_PATH=#{solr_lockfile_path} SOLR_TIMEOUT=900"
+      run "cd #{web_dir} && #{sudo} rake itrigga:generator RAILS_ENV=#{stage} APPLICATION_NAME=#{application_stub} PATTERN=solr_lockfile_check.script TEMPLATE_DIR=#{web_dir}/script/templates OUTPUT_DIR=#{shared_dir}/templates CONFIG_FILE=false SOLR_LOCKFILE_PATH=#{solr_lockfile_path} SOLR_TIMEOUT=900"
     end
     
     puts "setting permissions and ownership for solr_lockfile check script"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-cap_deploy
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Al Davidson
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 +01:00
+date: 2011-10-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: bundler
+  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +34,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id001
-  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,10 +50,10 @@ dependencies:
         - 4
         version: 1.6.4
   requirement: *id002
-  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rcov
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,10 +64,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,10 +80,10 @@ dependencies:
         - 4
         version: 1.6.4
   requirement: *id004
-  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rspec
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,10 +94,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: capistrano
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,10 +108,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: capistrano-ext
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,7 +122,6 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-  type: :development
 description: "Provides\n    - handy filesystem utility methods\n    - common capistrano tasks\n    - common hooks for deployment \n    "
 email: aldavidson@itrigga.com
 executables: []
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Common deployment tasks