crushserver 0.3.3 → 0.3.4

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
 :build: 
 :minor: 3
-:patch: 3
+:patch: 4
+:major: 0

data/crushserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crushserver}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["PJ Kelly", "Mason Browne"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-08-12}
   s.description = %q{A collection of capistrano tasks frequently used at Crush + Lovely.}
   s.email = %q{pj@crushlovely.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/crushlovely/crushserver}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.0}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{A collection of capistrano tasks frequently used at Crush + Lovely.}
 
   if s.respond_to? :specification_version then

data/lib/crushserver/recipes.rb

@@ -66,23 +66,35 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
+    desc "Send a message to the campfire chat room about the deploy start"
+    task :snitch_start do
+      message = "#{ENV['USER'].upcase} is deploying #{application.upcase}.  Please stand by..."
+      set :snitch_message, message
+      snitch
+    end
+
     desc "Send a message to the campfire chat room about the deploy end"
     task :snitch_end do
-      # set :snitch_message, "END DEPLOY [#{stage.to_s.upcase}]: #{ENV['USER']}, #{branch}/#{real_revision[0, 7]} to #{deploy_to}"
-      set :snitch_message, "#{application.upcase} was deployed to #{stage.to_s.upcase} by #{ENV['USER'].upcase} (#{branch}/#{real_revision[0, 7]})"
+      revisions
+      message = <<HERE
+#{application.upcase} was deployed to #{stage.to_s.upcase} by #{ENV['USER'].upcase} (#{branch}/#{real_revision[0, 7]})
+
+#{revisions_result}
+HERE
+      set :snitch_message, message
       snitch
     end
   end
 
   desc "Show currently deployed revision on server."
   task :revisions, :roles => :app do
+    result = String.new
     begin
       current, previous, latest = current_revision[0,7], previous_revision[0,7], real_revision[0,7]
-      puts "\n" << "-"*63
-      puts "===== Master Revision: \033[1;33m#{latest}\033[0m\n\n"
-      puts "===== [ \033[1;36m#{application} - #{stage}\033[0m ]"
-      puts "=== Deployed Revision: \033[1;32m#{current}\033[0m"
-      puts "=== Previous Revision: \033[1;32m#{previous}\033[0m\n\n"
+      result << "===== Master Revision: \033[1;33m#{latest}\033[0m\n\n"
+      result << "===== [ \033[1;36m#{application} - #{stage}\033[0m ]"
+      result << "=== Deployed Revision: \033[1;32m#{current}\033[0m"
+      result << "=== Previous Revision: \033[1;32m#{previous}\033[0m\n\n"
 
       # If deployed and master are the same, show the difference between the last 2 deployments.
       base_label, new_label, base_rev, new_rev = latest != current ? \
@@ -96,20 +108,24 @@ Capistrano::Configuration.instance(:must_exist).load do
         diff = "    " << diff.gsub("\n", "\n    ") << "\n"
         # Indent commit messages nicely, max 80 chars per line, line has to end with space.
         diff = diff.split("\n").map{|l|l.scan(/.{1,120}/).join("\n"<<" "*14).gsub(/([^ ]*)\n {14}/m,"\n"<<" "*14<<"\\1")}.join("\n")
-        puts "=== Difference between #{base_label} revision and #{new_label} revision:\n\n"
-        puts diff
+        result << "=== Difference between #{base_label} revision and #{new_label} revision:\n\n"
+        result << diff
       end
     rescue
-        puts "=== Revisions Task Failed!"
+      result << "=== Revisions Task Failed!"
     end
+    set :revisions_result, result
   end
 
   #############################################################
   # Hooks
   #############################################################
 
+  before :deploy do
+    campfire.snitch_start unless ENV['QUIET'].to_i > 0
+  end
+
   after :deploy do
     campfire.snitch_end unless ENV['QUIET'].to_i > 0
-    revisions
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crushserver
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - PJ Kelly
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A collection of capistrano tasks frequently used at Crush + Lovely.