alpha_omega 0.0.35 → 0.0.36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alpha_omega (0.0.35)
+    alpha_omega (0.0.36)
       HeSYINUvSBZfxqA-capistrano
       HeSYINUvSBZfxqA-capistrano_colors
       HeSYINUvSBZfxqA-capistrano_log

data/recipes/alpha_omega/deploy.rb

@@ -60,11 +60,14 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
   _cset(:version_dir)       { releases.length > 0 ? "releases" : "" }
   _cset :current_dir,       "current"
   _cset :service_dir,       "service"
+  _cset :log_dir,           "log"
   _cset :releases,          %w(alpha omega)
 
   _cset(:releases_path)     { File.join(deploy_to, version_dir) }
   _cset(:current_path)      { File.join(deploy_to, current_dir) }
   _cset(:service_path)      { File.join(deploy_to, service_dir) }
+  _cset(:log_path)          { File.join(deploy_to, log_dir) }
+  _cset(:service_drop)      { File.join(deploy_to, ".#{service_dir}.d") }
   _cset(:release_path)      { File.join(releases_path, release_name) }
 
   _cset(:current_release)   { release_path }
@@ -222,7 +225,7 @@ end
         run "[[ -d #{deploy_to} ]] || #{try_sudo} install -v -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{root_user} -g #{root_group}"} #{deploy_to}"
         run "#{try_sudo} install -v -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{user} -g #{group}"} #{releases_path} #{deploy_to}/log"
       else
-        dirs = [ releases_path, service_path, "#{deploy_to}/log" ]
+        dirs = [ releases_path, service_path, service_drop, log_path ]
         dir_args = dirs.map {|d| d.sub("#{deploy_to}/", "") }.join(' ')
         run "#{try_sudo} install -v -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{user} -g #{group}"} #{deploy_to}"
         run "cd #{deploy_to} && install -v -d -m #{dir_perms} #{dir_args}"
@@ -451,7 +454,7 @@ end
       epoch = Time.now.to_i
       locker = ''
 
-      run "cat #{deploy_to}/log/.#{application}_deploy_lock 2>&- || true" do |ch, stream, data|
+      run "cat #{log_path}/.#{application}_deploy_lock 2>&- || true" do |ch, stream, data|
         locker << data
       end
 
@@ -470,7 +473,7 @@ end
       end
 
       run_script = <<-SCRIPT
-        echo #{epoch} #{ENV['USER']} > #{deploy_to}/log/.#{application}_deploy_lock;
+        echo #{epoch} #{ENV['USER']} > #{log_path}/.#{application}_deploy_lock;
       SCRIPT
 
       at_exit { self.unlock; }
@@ -479,7 +482,7 @@ end
     end
 
     task :unlock do
-      run "rm -f #{deploy_to}/log/.#{application}_deploy_lock"
+      run "rm -f #{log_path}/.#{application}_deploy_lock"
     end
 
   end # :deploy
@@ -525,7 +528,7 @@ end
   end
 
   on :exit do
-    put full_log, "#{deploy_to}/log/#{application}_last_deploy_#{release_name}_#{branch}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
+    put full_log, "#{log_path}/#{application}_last_deploy-#{release_name}-#{branch.gsub(/\W+/,"_")}.log-#{Time.now.strftime('%Y%m%d-%H%M')}"
   end
 
 end # Capistrano::Configuration

data/recipes/alpha_omega/version.rb

@@ -1,3 +1,3 @@
 module AlphaOmega
-  Version = "0.0.35"
+  Version = "0.0.36"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 87
   prerelease: 
   segments: 
   - 0
   - 0
-  - 35
-  version: 0.0.35
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - David Nghiem
@@ -16,12 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +00:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
+  type: :runtime
+  prerelease: false
   name: grit
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +42,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
+  type: :runtime
+  prerelease: false
   name: HeSYINUvSBZfxqA-foreman
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +56,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
+  type: :runtime
+  prerelease: false
   name: HeSYINUvSBZfxqA-capistrano
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +70,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
+  type: :runtime
+  prerelease: false
   name: HeSYINUvSBZfxqA-capistrano_colors
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -87,8 +84,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
+  type: :runtime
+  prerelease: false
   name: HeSYINUvSBZfxqA-capistrano_log
+  version_requirements: *id005
 description: Common reciples for persistent capistrano releases
 email: 
 - nghidav@gmail.com
@@ -1211,7 +1210,6 @@ files:
 - website/vendor/cache/showoff-0.4.2.gem
 - website/vendor/cache/sinatra-1.2.6.gem
 - website/vendor/cache/tilt-1.3.2.gem
-has_rdoc: true
 homepage: https://github.com/HeSYINUvSBZfxqA/alpha_omega
 licenses: []
 
@@ -1241,7 +1239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: alpha_omega capistrano recipes