samson_hipchat 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08682233095d4b9335d6133ae774ecab623de5de
-  data.tar.gz: 46a38b72fd4c1ee7ba45b38d72c457faafc51e15
+  metadata.gz: a9a089b06747f9e57178c11807a6b219e486d545
+  data.tar.gz: 51fcf64e2a2e435eb584863abc8a847f4ce7feb3
 SHA512:
-  metadata.gz: 32a4b40c54790b44a9d7f0b95288a1f639ab488802bf4ac0db7c9c0e195ef12223992df8c736a5aea541a8bc462395ef1672f7666daa7bb834acf1867205ed07
-  data.tar.gz: f49f678e836478224ffdf08e79c35dfed5faf59307672fc28365cb1c5efcbc4586d0e2d8bdcc1b87be19e27793d86197013b2ccbf86e2e6e7625799d691148bf
+  metadata.gz: 7aefd6954f9d55b83ae29baab0e8a74cd2a3ccb29f025a15c2b51ce9660a419a8756b27cec86b4c4633bc17f56cca08de8d4433d14733089f7bbb9b9b2a7c107
+  data.tar.gz: 24abe14fa1630fbf9018081b5b1f56d9327ede1ac4a1105d9e8bba186433adf1897ac2b0b3936e7dc4dd3dab52618f2b2ef73e394fc60808899448643f46444a

data/app/models/hipchat_notification.rb

@@ -56,13 +56,13 @@ class HipchatNotification
 
     def subject
       if @is_multi_message
-        subject = "#{@user.name} is <a href='#{deploy_url}'>deploying</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> to <strong>#{@stage.name}</strong><br>"
 
-        subject = "#{@user.name} successfully deployed <strong>#{@project.name}</strong> @<a href='#{diff_url}'>#{@deploy.commit}</a> on <strong>#{@stage.name}</strong><br>" if @deploy.job.succeeded?
+        subject = "#{@user.name} successfully deployed <strong>#{@project.name}</strong> @<a href='#{diff_url}'>#{@deploy.commit}</a> to <strong>#{@stage.name}</strong><br>" if @deploy.job.succeeded?
 
-        subject = "#{@user.name} failed to <a href='#{deploy_url}'>deployed</a> <strong>#{@project.name}</strong> on <strong>#{@stage.name}</strong><br>" if @deploy.job.failed? || @deploy.job.errored?
+        subject = "#{@user.name} failed to <a href='#{deploy_url}'>deployed</a> <strong>#{@project.name}</strong> to <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 = "#{@user.name} cancelled <a href='#{deploy_url}'>deploy</a> <strong>#{@project.name}</strong> to <strong>#{@stage.name}</strong><br>" if @deploy.job.cancelled?
 
         subject
       else
@@ -78,7 +78,7 @@ class HipchatNotification
     def content
       if @is_multi_message
         return subject if @deploy.job.succeeded? || @deploy.job.failed? || @deploy.job.errored?
-        @content ||= HipchatNotificationRenderer.render(@deploy, subject)
+        @content ||= HipchatNotificationRenderer.render(@deploy, subject, {is_multi_message: true})
       else
         @content ||= HipchatNotificationRenderer.render(@deploy, subject)
       end

data/app/models/hipchat_notification_renderer.rb

@@ -1,8 +1,8 @@
 class HipchatNotificationRenderer
-  def self.render(deploy, subject)
+  def self.render(deploy, subject, opt = {})
     controller = ActionController::Base.new
     view = ActionView::Base.new(File.expand_path("../../views/samson_hipchat", __FILE__), {}, controller)
-    locals = { deploy: deploy, changeset: deploy.changeset, subject: subject }
+    locals = { deploy: deploy, changeset: deploy.changeset, subject: subject, option: opt }
     view.render(template: 'notification', locals: locals).chomp
   end
 end

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

@@ -1,10 +1,13 @@
 <%= subject %>
-<p>&nbsp;&nbsp;<%= deploy.try(:message) %> </p>
-<% if changeset.commits.count == 0 %>
-There are no new commits since last time.
-<% else %>
-<%= pluralize changeset.commits.count, "commit" %> by <%= changeset.author_names.to_sentence %>.
-<br>
+<p>&nbsp;&nbsp;<%= deploy.try(:message).gsub("\n","<br>") %> </p>
+
+<% if option[:is_multi_message] %>
+  <% if changeset.commits.count == 0 %>
+  There are no new commits since last time.
+  <% else %>
+  <%= pluralize changeset.commits.count, "commit" %> by <%= changeset.author_names.to_sentence %>.
+  <br>
+<% end %>
 
 <% if false %>
 <strong>Files changed:</strong>
@@ -15,6 +18,7 @@ There are no new commits since last time.
 </ul>
 <% end %>
 
+<% if option[:is_multi_message] %>
 <strong>Commits:</strong>
 <ol>
 <% changeset.commits.each do |commit| %>
@@ -24,3 +28,5 @@ There are no new commits since last time.
 <% end %>
 </ol>
 <% end %>
+
+<% end %>

metadata

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