samson_hipchat 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 895c0f23e1e141e45e4f164e7987aa0d9378d86c
-  data.tar.gz: b00a8dbeeacc86b154882dba946d36648e4071c6
+  metadata.gz: b4b61d9b6e5b8d1cbf71e7c8caec7c7100fd7f39
+  data.tar.gz: eea4c0d26ac5f3722f9eed70fb37ee7be2aa1e71
 SHA512:
-  metadata.gz: 8c5d648a82cdb3c8c8742e0d5bb7df2b7896d1c43356131336705f80ed7feaf633e4c2ed1f8477a5df1bb572657430d31016f1cce271b5d8e5cd87cde4ae3577
-  data.tar.gz: 2beb0dd16de702b7e98ef759eb9f0a6f8c59b0ec37137a5ba4ce22bb8f53e7788b6430e6e8a8e8fb0a881951c1dd92cd3e6726236a473e4895a1cbea02b496e1
+  metadata.gz: 083f463cd20974ffde51d5a912702f0d804edc1157ee933d36f18b1e6056c8712fee995059f72a7f55e3eb4e2b2e1b7723fb630f64f852326cf92dbe45710b95
+  data.tar.gz: 03592f994dc71930e4e14fa68fe81311cbeb89e84caf2ea6f45f3d26f7e5ef225c40a4ee55a6e5c9d3f9205ce864551bde54034f1aa1c5ecb81283a139e63425

data/app/decorators/stage_decorator.rb

@@ -20,12 +20,14 @@ Stage.class_eval do
   end
 
   def update_room_id
-    if room_for(room_name)
-      # we attempt to save room id
-      self.hipchat_rooms.first.room_id = room_for(room_name)['id']
-    else
-      # if we fail, this maybe a notification token, just set it to 0
-      self.hipchat_rooms.first.room_id = 0 if room_name
+    self.hipchat_rooms.each do |room|
+      if room_for(room_name)
+        # we attempt to save room id
+        room.room_id = room_for(room_name)['id']
+      else
+        # if we fail, this maybe a notification token, just set it to 0
+        room.room_id = 0 if room_name
+      end
     end
   end
 

data/app/models/hipchat_notification.rb

@@ -6,15 +6,30 @@ class HipchatNotification
   end
 
   def deliver
-    message = Message.new(@deploy)
+    return if @stage.hipchat_rooms.empty?
+
+    @stage.hipchat_rooms.each do |room|
+      try_delivery(@deploy, room)
+    end
+
+  end
+
+  def try_delivery(deploy, room)
+    if !room.accept_notify?(deploy)
+      Rails.logger.debug("No need to notify #{room.name}")
+      return
+    end
+
+    Rails.logger.debug("Begin to notify #{room.name}")
+    message = Message.new(deploy, room.multi_message?)
     begin
-      hipchat[@stage.hipchat_rooms.first.name].send message.from, message.to_s, **message.style
+      hipchat(room.token)[room.name].send message.from, message.to_s, **message.style
     rescue HipChat::UnknownRoom => e
       Rails.logger.error("Room did not existed")
     rescue HipChat::Unauthorized => e
       Rails.logger.error("Invalid token to post to room")
     rescue HipChat::UnknownResponseCode => e
-      Rails.logger.error("Could not deliver hipchat message: #{e.message}")
+      Rails.logger.error("Could not deliver hipchat message: #{e.message} to room #{room.name}")
     end
   end
 
@@ -22,12 +37,13 @@ class HipchatNotification
     delegate :project, :stage, :user, to: :@deploy
     delegate :project_deploy_url, to: 'AppRoutes.url_helpers'
 
-    def initialize(deploy)
+    def initialize(deploy, is_multi_message)
       @deploy = deploy
       @stage = deploy.stage
       @project = @stage.project
       @user = @deploy.user
       @changeset = @deploy.changeset
+      @is_multi_message = is_multi_message
     end
 
     def style
@@ -39,13 +55,17 @@ class HipchatNotification
     end
 
     def subject
-      subject = "#{@user.name} is about to <a href='#{deploy_url}'>deploy</a> <strong>#{@project.name}</strong> on <strong>#{@stage.name}</strong><br>"
+      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} 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} 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} 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
+        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?
+      end
     end
 
     def to_s
@@ -53,8 +73,12 @@ class HipchatNotification
     end
 
     def content
-      return subject if @deploy.job.succeeded? || @deploy.job.failed? || @deploy.job.errored?
-      @content ||= HipchatNotificationRenderer.render(@deploy, subject)
+      if @is_multi_message
+        return subject if @deploy.job.succeeded? || @deploy.job.failed? || @deploy.job.errored?
+        @content ||= HipchatNotificationRenderer.render(@deploy, subject)
+      else
+        @content ||= HipchatNotificationRenderer.render(@deploy, subject)
+      end
     end
 
     private
@@ -76,7 +100,8 @@ class HipchatNotification
 
   private
 
-  def hipchat
-    HipChat::Client.new @stage.hipchat_rooms.first.token, api_version: 'v2'
+  def hipchat(token = nil)
+    HipChat::Client.new @stage.hipchat_rooms.first.token, api_version: 'v2' if token.nil?
+    HipChat::Client.new token, api_version: 'v2'
   end
 end

data/app/models/hipchat_room.rb

@@ -1,3 +1,32 @@
 class HipchatRoom < ActiveRecord::Base
   belongs_to :stage
+  enum notify_on: { always: 0, succeeded: 1, failed: 2 }
+
+  def always_notify?
+    return notify_on == "always"
+  end
+
+  def only_notify_suceeded?
+    return notify_on == "succeeded"
+  end
+
+  def accept_notify?(deploy)
+    if deploy.job.failed? || deploy.job.errored?
+      return always_notify?
+    end
+
+    if deploy.job.succeeded?
+      return always_notify? || only_notify_suceeded?
+    end
+
+    # Other status, we will only notifiy if we enable always notify
+    return always_notify?
+  end
+
+  # Check if we can send multi message to this room
+  # Our logic: notify_on = suceeded only has to be single message becase we
+  # will only notify on succeeded
+  def multi_message?
+    return notify_on == "always"
+  end
 end

data/app/views/samson_hipchat/_fields.html.erb

@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset id="hipchat-room-containers">
   <legend>Hipchat</legend>
   <p class="col-lg-offset-2">Hipchat room and token.</p>
 
@@ -7,6 +7,7 @@
 
   <%= form.fields_for :hipchat_rooms do |hipchat_fields| %>
     <div class="form-group">
+
       <div class="col-lg-2 col-lg-offset-2">
         <%= hipchat_fields.text_field :name, class: "form-control", placeholder: "Room name" %>
       </div>
@@ -14,6 +15,11 @@
         <%= hipchat_fields.text_field :token, class: "form-control", placeholder: "Token" %>
       </div>
 
+      <div class="col-lg-2 col-lg-offset-2">
+        <%= hipchat_fields.select :notify_on, [['Always', :always], ['Succeeed', :succeeded]] %>
+        <%= hipchat_fields.label :notify_on, "Notify?" %>
+      </div>
+
       <% if hipchat_fields.object.persisted? %>
         <div class="col-lg-1 checkbox">
           <%= hipchat_fields.check_box :_destroy if hipchat_fields.object.persisted? %>
@@ -22,4 +28,32 @@
       <% end %>
     </div>
   <% end %>
+  <button class="btn btn-default" id="hipchat-room-create">Create room</button>
 </fieldset>
+
+<script>
+  //@TODO put them into asset
+  $(document).ready(function () {
+    function addHipChatForm(e) {
+      var formCount =$('#hipchat-room-containers')
+        .find(".form-group")
+        .length
+
+      e.preventDefault()
+      var form = $('#hipchat-room-containers')
+        .find(".form-group").last().clone()
+        .insertBefore('#hipchat-room-containers #hipchat-room-create')
+      form.find('input').each(function () {
+        var element = $(this)
+        if (element.prop('name') != undefined) {
+          element.prop('name', element.prop('name').replace(/\[[0-9]+\]/g, '[' + formCount + ']'));
+        }
+        if (element.attr('id') != undefined) {
+          element.attr('id', element.attr('id').replace(/_[0-9]+_/g, '_' + formCount + '_'));
+        }
+      })
+    }
+
+    $('#hipchat-room-create').click(addHipChatForm)
+  })
+</script>

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

@@ -1,5 +1,5 @@
 <%= subject %>
-<p>&nbsp;&nbsp;<%= deploy.message %> </p>
+<p>&nbsp;&nbsp;<%= deploy.try(:message) %> </p>
 <% if changeset.commits.count == 0 %>
 There are no new commits since last time.
 <% else %>

data/db/migrate/20150706182832_add_notify_on_to_hipchat_room.rb

@@ -0,0 +1,8 @@
+class AddNotifyOnToHipchatRoom < ActiveRecord::Migration
+  def change
+    change_table :hipchat_rooms do |t|
+      # Always send notification
+      t.integer :notify_on, default: 0
+    end
+  end
+end

data/lib/samson_hipchat/samson_plugin.rb

@@ -9,7 +9,7 @@ Samson::Hooks.callback :stage_clone do |old_stage, new_stage|
 end
 
 Samson::Hooks.callback :stage_permitted_params do
-  { hipchat_rooms_attributes: [:id, :name, :token, :_destroy] }
+  { hipchat_rooms_attributes: [:id, :name, :token, :notify_on, :_destroy] }
 end
 
 notify = -> (deploy, _buddy) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samson_hipchat
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Vinh Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -38,6 +38,7 @@ files:
 - app/views/samson_hipchat/notification.text.erb
 - config/initializers/hipchat.rb
 - db/migrate/20150519105221_create_hipchat_rooms.rb
+- db/migrate/20150706182832_add_notify_on_to_hipchat_room.rb
 - lib/samson_hipchat/samson_plugin.rb
 homepage: 
 licenses: []