samson_hipchat 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b61d9b6e5b8d1cbf71e7c8caec7c7100fd7f39
-  data.tar.gz: eea4c0d26ac5f3722f9eed70fb37ee7be2aa1e71
+  metadata.gz: e69d89d3040952df4214191f859936474046ad5f
+  data.tar.gz: b467d520ca2b970fea3398120098ac2d82b55013
 SHA512:
-  metadata.gz: 083f463cd20974ffde51d5a912702f0d804edc1157ee933d36f18b1e6056c8712fee995059f72a7f55e3eb4e2b2e1b7723fb630f64f852326cf92dbe45710b95
-  data.tar.gz: 03592f994dc71930e4e14fa68fe81311cbeb89e84caf2ea6f45f3d26f7e5ef225c40a4ee55a6e5c9d3f9205ce864551bde54034f1aa1c5ecb81283a139e63425
+  metadata.gz: b1431c75a7ca46118b58fd830c1a83dce559a22285bc65d74c7bb511d406fe7d7ea582b8327294bbe4cbeb2f1ce4208fd3c1505d5a76de2e9c09e1668945f7c6
+  data.tar.gz: 0490f31f2c55ed3c8408272371924d40b60e6e9fa54ecb6c76432ce2e70a8cef1578e74f0689f3f85732fa9cab2f1f7d657a95d7ad351ec2fbafabc29e16dce2

data/app/models/hipchat_notification.rb

@@ -56,15 +56,18 @@ class HipchatNotification
 
     def subject
       if @is_multi_message
-        subject = "#{@user.name} is about to <a href='#{deploy_url}'>deploy</a> <strong>#{@project.name}</strong> on <strong>#{@stage.name}</strong><br>"
+        subject = "#{@user.name} is <a href='#{deploy_url}'>deploying</a> <strong>#{@project.name}</strong> on <strong>#{@stage.name}</strong><br>"
 
         subject = "#{@user.name} successfully deploy <strong>#{@project.name}</strong> @<a href='#{diff_url}'>#{@deploy.commit}...#{@changeset.try(:previous_commit)}</a> on <strong>#{@stage.name}</strong><br>" if @deploy.job.succeeded?
 
         subject = "#{@user.name} failed to <a href='#{deploy_url}'>deploy</a> <strong>#{@project.name}</strong> on <strong>#{@stage.name}</strong><br>" if @deploy.job.failed? || @deploy.job.errored?
 
+        subject = "#{@user.name} cancelled <a href='#{deploy_url}'>deploy</a> <strong>#{@project.name}</strong> on <strong>#{@stage.name}</strong><br>" if @deploy.job.cancelled?
+
         subject
       else
-        subject = "#{@user.name} successfully deploy <strong>#{@project.name}</strong> @<a href='#{diff_url}'>#{@deploy.commit}...#{@changeset.try(:previous_commit)}</a> on <strong>#{@stage.name}</strong><br>" if @deploy.job.succeeded?
+        #subject = "#{@user.name} successfully deploy <strong>#{@project.name}</strong> @<a href='#{diff_url}'>#{@deploy.commit}...#{@changeset.try(:previous_commit)}</a> on <strong>#{@stage.name}</strong><br>" if @deploy.job.succeeded?
+        subject = "#{@user.name} successfully deploy <strong>#{@project.name}</strong> @ <a href='#{diff_url}'>#{@deploy.commit}</a> on <strong>#{@stage.name}</strong><br>" if @deploy.job.succeeded?
       end
     end
 

data/app/views/samson_hipchat/notification.text.erb

@@ -18,7 +18,9 @@ There are no new commits since last time.
 <strong>Commits:</strong>
 <ol>
 <% changeset.commits.each do |commit| %>
-  <li><a href='<%= commit.url %>'>(<%= commit.author_name %>)</a>: <%= commit.summary %></li>
+  <% if !commit.summary.start_with?("Merge pull request") %>
+    <li><a href='<%= commit.url %>'>(<%= commit.author_name %>)</a>: <%= commit.summary %></li>
+  <% end %>
 <% end %>
 </ol>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samson_hipchat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vinh Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat