chicken_soup 0.5.0 → 0.5.2

data/lib/chicken_soup/capabilities/rvm/rvm-defaults.rb

@@ -1,7 +1,7 @@
 ######################################################################
 #                           RVM DEFAULTS                             #
 ######################################################################
-ChickenSoup::RVM_INFO_FORMAT = /^rvm.+\s(([a-zA-Z0-9\-\._]+)(?:@([a-zA-Z0-9\-\._]+))?)/
+::ChickenSoup::RVM_INFO_FORMAT = /^rvm.+\s(([a-zA-Z0-9\-\._]+)(?:@([a-zA-Z0-9\-\._]+))?)/
 
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :capabilities do

data/lib/chicken_soup/notifiers/email/email-tasks.rb

@@ -4,13 +4,13 @@
 require 'mail'
 
 Capistrano::Configuration.instance(:must_exist).load do |cap|
-  after     'deploy:cleanup',             'notify:by_email'
+  after     'deploy:cleanup',             'notify:via_email'
 
   namespace :notify do
     desc <<-DESC
       [internal] Sends a notification via email once a deployment is complete.
     DESC
-    task :by_email do
+    task :via_email do
       Mail.defaults do
         delivery_method cap[:email_notifier_mail_method], cap[:email_notifier_mail_options]
       end

data/lib/chicken_soup/notifiers/git/git-tasks.rb

@@ -2,22 +2,24 @@
 #                         GIT NOTIFIER TASKS                         #
 ######################################################################
 Capistrano::Configuration.instance(:must_exist).load do
-  before  'deploy:cleanup',           'git:tag'
+  after     'deploy:cleanup',           'notify:via_git:tag'
 
-  namespace :git do
-    desc <<-DESC
-      Tags the deployed Git commit with the timestamp and environment it was deployed to.
+  namespace :notify do
+    namespace :via_git do
+      desc <<-DESC
+        Tags the deployed Git commit with the timestamp and environment it was deployed to.
 
-      The tag is auto-pushed to whatever `remote` is set to as well as `origin`.
-      Tag push happens in the background so it won't slow down deployment.
-    DESC
-    task :tag do
-      timestamp_string_without_seconds = Time.now.strftime("%Y%m%d%H%M")
-      tag_name = "deployed_to_#{rails_env}_#{timestamp_string_without_seconds}"
+        The tag is auto-pushed to whatever `remote` is set to as well as `origin`.
+        Tag push happens in the background so it won't slow down deployment.
+      DESC
+      task :tag do
+        timestamp_string_without_seconds = Time.now.strftime("%Y%m%d%H%M")
+        tag_name = "deployed_to_#{rails_env}_#{timestamp_string_without_seconds}"
 
-      `git tag -a -m "Tagging deploy to #{rails_env} at #{timestamp_string_without_seconds}" #{tag_name} #{branch}`
-      `git push #{remote} --tags > /dev/null 2>&1 &`
-      `git push origin --tags > /dev/null 2>&1 &`
+        `git tag -a -m "Tagging deploy to #{rails_env} at #{timestamp_string_without_seconds}" #{tag_name} #{branch}`
+        `git push #{remote} --tags > /dev/null 2>&1 &`
+        `git push origin --tags > /dev/null 2>&1 &`
+      end
     end
   end
 end

data/lib/chicken_soup/notifiers/tasks.rb

@@ -16,6 +16,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     DESC
     task :disable do
       set :notifiers,     []
+      callbacks[:after].delete_if {|c| c.source =~ /^notify:/}
     end
   end
 end

data/lib/chicken_soup/version.rb

@@ -1,3 +1,3 @@
 module ChickenSoup
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: chicken_soup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - thekompanee
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -05:00
+date: 2011-08-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency