From f12ec5f4e80bee7690a2ec72cd65e72e62b21a18 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 5 Mar 2015 01:54:28 -0800 Subject: Add merge and issue event notification for HipChat --- app/models/project_services/hipchat_service.rb | 87 ++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 5 deletions(-) (limited to 'app/models') diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 4fb80a98d24..9d094eaf146 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -45,7 +45,7 @@ class HipchatService < Service end def supported_events - %w(push) + %w(push issue merge_request) end def execute(data) @@ -62,7 +62,21 @@ class HipchatService < Service @gate ||= HipChat::Client.new(token, options) end - def create_message(push) + def create_message(data) + object_kind = data[:object_kind] + + message = \ + case object_kind + when "push" + create_push_message(data) + when "issue" + create_issue_message(data) unless is_update?(data) + when "merge_request" + create_merge_request_message(data) unless is_update?(data) + end + end + + def create_push_message(push) ref = push[:ref].gsub("refs/heads/", "") before = push[:before] after = push[:after] @@ -71,9 +85,9 @@ class HipchatService < Service message << "#{push[:user_name]} " if before.include?('000000') message << "pushed new branch #{ref}"\ - " to "\ - "#{project.name_with_namespace.gsub!(/\s/, "")}\n" + "#{project_url}/commits/#{URI.escape(ref)}\">#{ref}"\ + " to "\ + "#{project_url}\n" elsif after.include?('000000') message << "removed branch #{ref} from #{project.name_with_namespace.gsub!(/\s/,'')} \n" else @@ -93,4 +107,67 @@ class HipchatService < Service message end + + def create_issue_message(data) + username = data[:user][:username] + + obj_attr = data[:object_attributes] + obj_attr = HashWithIndifferentAccess.new(obj_attr) + title = obj_attr[:title] + state = obj_attr[:state] + issue_iid = obj_attr[:iid] + issue_url = obj_attr[:url] + description = obj_attr[:description] + + issue_link = "##{issue_iid}" + message = "#{username} #{state} issue #{issue_link} in #{project_link}: #{title}" + + if description + description = description.truncate(200, separator: ' ', omission: '...') + message << "
#{description}
" + end + + message + end + + def create_merge_request_message(data) + username = data[:user][:username] + + obj_attr = data[:object_attributes] + obj_attr = HashWithIndifferentAccess.new(obj_attr) + merge_request_id = obj_attr[:iid] + source_branch = obj_attr[:source_branch] + target_branch = obj_attr[:target_branch] + state = obj_attr[:state] + description = obj_attr[:description] + title = obj_attr[:title] + + merge_request_url = "#{project_url}/merge_requests/#{merge_request_id}" + merge_request_link = "##{merge_request_id}" + message = "#{username} #{state} merge request #{merge_request_link} in " \ + "#{project_link}: #{title}" + + if description + description = description.truncate(200, separator: ' ', omission: '...') + message << "
#{description}
" + end + + message + end + + def project_name + project.name_with_namespace.gsub(/\s/, '') + end + + def project_url + project.web_url + end + + def project_link + "#{project_name}" + end + + def is_update?(data) + data[:object_attributes][:action] == 'update' + end end -- cgit v1.2.3