tutter-sppuppet 0.0.22 → 0.0.23
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/tutter/action/sppuppet.rb +5 -5
- data/tutter-sppuppet.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZDZkMzU0MjM0MTEwYTU0N2Y2YWMwOTE5NWJiOTgwMDc3M2FlMTQ1Ng==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZDZkN2JmOWFiNjg1ZjJjMTVlOGE4ZGQ1ZGY5OWUxMDg3YTU0YWIxZQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NjlhZjkyNmVlNmQxMTFjMGU5ZDQwZGM0OTkyN2FjYWEyNzA5NmM1OWY5NTI2
|
10
|
+
YTk0MzRhMjdkMTUxYjk3Y2VkN2Q2MGE0NmE1NzNkNzZmN2ZhMWQwNzM2MzUw
|
11
|
+
YzhlMzkyYjQ2NWE0MmVlNThkY2NmYTU3NzZjMjkxNmRmNDBmYTk=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MzQ4YWM4YTEzMThhNDNhOWE2ZTY3Y2ExNDU1ZjA3MWQ5ODI1ODI2MGZhYjBk
|
14
|
+
ZjcyNDZhYjg3MmMxODlhNjNmOWNmNjhlOGRjYjRlZWM1OTAwOWQ1ZmRjNGZl
|
15
|
+
ZTVlYjYyMGQ4ZjljOWNlMzdmMzJjYjI1OWVkYTkyMjNlMjJiMTc=
|
@@ -34,7 +34,7 @@ class Sppuppet
|
|
34
34
|
return 200, 'Merge state not clean' unless @data['state'] == 'success'
|
35
35
|
commit_sha = @data['commit']['sha']
|
36
36
|
@client.pull_requests(@project).each do |pr|
|
37
|
-
return maybe_merge(pr.number,false) if pr.head.sha == commit_sha
|
37
|
+
return maybe_merge(pr.number, false) if pr.head.sha == commit_sha
|
38
38
|
end
|
39
39
|
return 200, "Found no pull requests matching #{commit_sha}"
|
40
40
|
|
@@ -57,7 +57,7 @@ class Sppuppet
|
|
57
57
|
merger = nil
|
58
58
|
pr = @client.pull_request @project, pull_request_id
|
59
59
|
|
60
|
-
unless pr.mergeable_state == 'clean'
|
60
|
+
unless pr.mergeable_state == 'clean'
|
61
61
|
msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n"
|
62
62
|
reassure = "I will try to merge this for you when the builds turn green\n" +
|
63
63
|
'If your build fails or becomes stuck for some reason, just say \'rebuild\''
|
@@ -80,8 +80,8 @@ class Sppuppet
|
|
80
80
|
# We only want to check newer comments
|
81
81
|
next if last_commit_date > i.created_at
|
82
82
|
|
83
|
-
if
|
84
|
-
merger ||= i.attrs[:user]
|
83
|
+
if i.body == '!merge' || i.body.start_with?(':shipit:')
|
84
|
+
merger ||= i.attrs[:user].attrs[:login]
|
85
85
|
# Count as a +1 if it is not the author
|
86
86
|
unless pr.user.login == i.attrs[:user].attrs[:login]
|
87
87
|
votes[i.attrs[:user].attrs[:login]] = 1
|
@@ -98,7 +98,7 @@ class Sppuppet
|
|
98
98
|
end
|
99
99
|
end
|
100
100
|
|
101
|
-
return 200,
|
101
|
+
return 200, 'No merge comment found' unless merger
|
102
102
|
|
103
103
|
num_votes = votes.values.reduce(0) { |a, e| a + e }
|
104
104
|
if num_votes < @settings['plus_ones_required']
|
data/tutter-sppuppet.gemspec
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
2
|
Gem::Specification.new do |s|
|
3
3
|
s.name = 'tutter-sppuppet'
|
4
|
-
s.version = '0.0.
|
4
|
+
s.version = '0.0.23'
|
5
5
|
s.author = ['Johan Haals', 'Erik Dalén', 'Alexey Lapitsky']
|
6
6
|
s.email = ['johan.haals@gmail.com', 'dalen@spotify.com', 'alexey@spotify.com']
|
7
7
|
s.homepage = 'https://github.com/jhaals/tutter-sppuppet'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tutter-sppuppet
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.23
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Johan Haals
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2015-03-
|
13
|
+
date: 2015-03-25 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: tutter
|