Commit 12ec1e3c authored by Mike Wyatt's avatar Mike Wyatt

Update Asana service to work with Personal Access Token, lessen number of requests to Asana API

parent 2cd2c54b
...@@ -67,35 +67,34 @@ http://developer.asana.com/documentation/#api_keys' ...@@ -67,35 +67,34 @@ http://developer.asana.com/documentation/#api_keys'
%w(push) %w(push)
end end
def client
@_client ||= begin
Asana::Client.new do |c|
c.authentication :access_token, api_key
end
end
end
def execute(data) def execute(data)
return unless supported_events.include?(data[:object_kind]) return unless supported_events.include?(data[:object_kind])
Asana.configure do |client| # check the branch restriction is poplulated and branch is not included
client.api_key = api_key
end
user = data[:user_name]
branch = Gitlab::Git.ref_name(data[:ref]) branch = Gitlab::Git.ref_name(data[:ref])
branch_restriction = restrict_to_branch.to_s branch_restriction = restrict_to_branch.to_s
# check the branch restriction is poplulated and branch is not included
if branch_restriction.length > 0 && branch_restriction.index(branch).nil? if branch_restriction.length > 0 && branch_restriction.index(branch).nil?
return return
end end
user = data[:user_name]
project_name = project.name_with_namespace project_name = project.name_with_namespace
push_msg = user + ' pushed to branch ' + branch + ' of ' + project_name push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} )"
data[:commits].each do |commit| data[:commits].each do |commit|
check_commit(' ( ' + commit[:url] + ' ): ' + commit[:message], push_msg) check_commit(commit[:message], push_msg)
end end
end end
def check_commit(message, push_msg) def check_commit(message, push_msg)
task_list = []
close_list = []
# matches either: # matches either:
# - #1234 # - #1234
# - https://app.asana.com/0/0/1234 # - https://app.asana.com/0/0/1234
...@@ -109,28 +108,19 @@ http://developer.asana.com/documentation/#api_keys' ...@@ -109,28 +108,19 @@ http://developer.asana.com/documentation/#api_keys'
# tuple will be # tuple will be
# [ 'fix', 'id_from_url', 'id_from_pound' ] # [ 'fix', 'id_from_url', 'id_from_pound' ]
taskid = tuple[2] || tuple[1] taskid = tuple[2] || tuple[1]
task_list.push(taskid)
if tuple[0]
close_list.push(taskid)
end
end
# post commit to every taskid found
task_list.each do |taskid|
task = Asana::Task.find(taskid)
if task begin
task.create_story(text: push_msg + ' ' + message) task = Asana::Task.find_by_id(client, taskid)
rescue Exception => e
puts e.message
puts e.backtrace.inspect
next
end end
end
# close all tasks that had 'fix(ed/es/ing) #:id' in them task.add_comment(text: "#{push_msg} #{message}")
close_list.each do |taskid|
task = Asana::Task.find(taskid)
if task if tuple[0]
task.modify(completed: true) task.update(completed: true)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment