hipchat 0.0.2 → 0.0.3

data/README.textile

@@ -22,15 +22,9 @@ To determine the user that is currently running the deploy, the capistrano tasks
 
 # The $HIPCHAT_USER environment variable
 # The hipchat_human capistrano var.
+# The git user.name var.
 # The $USER environment variable.
 
-If you set
-
-bc. set :hipchat_human, :from_git
-
-the user name will be taken from your git config (user.name). Note that whatever you put in
-@hipchat_human@, @$HIPCHAT_USER@ always prevails.
-
 h2. Copyright
 
 Copyright (c) 2010 Mojo Tech. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/hipchat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hipchat}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["david"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-10-27}
   s.description = %q{Ruby library to interact with HipChat}
   s.email = %q{dgleal@gmail.com}
   s.extra_rdoc_files = [

data/lib/hipchat/capistrano.rb

@@ -1,14 +1,36 @@
 require 'hipchat'
 
 Capistrano::Configuration.instance(:must_exist).load do
+  set :hipchat_send_notification, false
+  set :hipchat_with_migrations, false
+
   namespace :hipchat do
     task :set_client do
       set :hipchat_client, HipChat::Client.new(hipchat_token)
     end
 
+    task :trigger_notification do
+      set :hipchat_send_notification, true
+    end
+
+    task :configure_for_migrations do
+      set :hipchat_with_migrations, true
+    end
+
     task :notify_deploy_started do
-      hipchat_client[hipchat_room_name].
-        send(deploy_user, "#{human} is deploying #{application} to #{rails_env}.", hipchat_announce)
+      if hipchat_send_notification
+        on_rollback do
+          hipchat_client[hipchat_room_name].
+            send(deploy_user, "#{human} cancelled deployment of #{application} to #{rails_env}.", hipchat_announce)
+        end
+
+        message = "#{human} is deploying #{application} to #{rails_env}"
+        message << " (with migrations)" if hipchat_with_migrations
+        message << "."
+
+        hipchat_client[hipchat_room_name].
+          send(deploy_user, message, hipchat_announce)
+      end
     end
 
     task :notify_deploy_finished do
@@ -21,13 +43,15 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     def human
-      user = ENV['HIPCHAT_USER'] || fetch(:hipchat_human, ENV['USER'])
-
-      if user == :from_git
-        %x{git config user.name}.strip
-      else
-        user
-      end
+      ENV['HIPCHAT_USER'] ||
+        fetch(:hipchat_human,
+              if (u = %x{git config user.name}.strip) != ""
+                u
+              elsif (u = ENV['USER']) != ""
+                u
+              else
+                "Someone"
+              end)
     end
 
     def rails_env
@@ -36,6 +60,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   before "hipchat:notify_deploy_started", "hipchat:set_client"
-  before "deploy", "hipchat:notify_deploy_started"
+  before "deploy", "hipchat:trigger_notification"
+  before "deploy:migrations", "hipchat:trigger_notification", "hipchat:configure_for_migrations"
+  before "deploy:update_code", "hipchat:notify_deploy_started"
   after  "deploy", "hipchat:notify_deploy_finished"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - david
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +01:00
+date: 2010-10-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency