Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
12ec1e3c
Commit
12ec1e3c
authored
Dec 29, 2015
by
Mike Wyatt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Asana service to work with Personal Access Token, lessen number of requests to Asana API
parent
2cd2c54b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
31 deletions
+21
-31
app/models/project_services/asana_service.rb
app/models/project_services/asana_service.rb
+21
-31
No files found.
app/models/project_services/asana_service.rb
View file @
12ec1e3c
...
@@ -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
)
end
rescue
Exception
=>
e
puts
e
.
message
puts
e
.
backtrace
.
inspect
next
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
t
ask
if
t
uple
[
0
]
task
.
modify
(
completed:
true
)
task
.
update
(
completed:
true
)
end
end
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment