tutter-sppuppet 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWI0NDMwZWY2NmM5N2NhNDA4ZGQ4MWU4NmI3OWVhNGY0ODQyMjI0OA==
+    ZDZkMzU0MjM0MTEwYTU0N2Y2YWMwOTE5NWJiOTgwMDc3M2FlMTQ1Ng==
   data.tar.gz: !binary |-
-    YmJjZmVmYmFkZGFlMjQwNGZmMGNmNmU4MjUxOTNmNWUyODliNWVjOQ==
+    ZDZkN2JmOWFiNjg1ZjJjMTVlOGE4ZGQ1ZGY5OWUxMDg3YTU0YWIxZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWI1YzBjYmI4NDljNDgyYzVlZWI4ZGQ5YThlODMxNjIxYWQ1NjQ2ODNjYjY4
-    MmU0ZWFkYzllOGRmZDNjZDg3YmMyMDRhYWNmNDA4ZjgyNjMxZWZiODc4Yjhj
-    MzIzOTg5Y2I0Mzc5ZDBkMzViNDUwNmFjMWQ4NzBhYzdlOTc5NzY=
+    NjlhZjkyNmVlNmQxMTFjMGU5ZDQwZGM0OTkyN2FjYWEyNzA5NmM1OWY5NTI2
+    YTk0MzRhMjdkMTUxYjk3Y2VkN2Q2MGE0NmE1NzNkNzZmN2ZhMWQwNzM2MzUw
+    YzhlMzkyYjQ2NWE0MmVlNThkY2NmYTU3NzZjMjkxNmRmNDBmYTk=
   data.tar.gz: !binary |-
-    ZjY1ODgzMDkwOWI3NWNmYjFiOTY2OTU5NzI3NDBiMGE5YzU0Nzk2ZDI3MWEy
-    MThmYmUzOTc3MDczNjYwMjM1NDI4NTFmYWY3ZTBlMGU4OTZhNmY3ODFiZjEz
-    ZTVmMjQ2ZmIzNTM0ZjlkYTljMjk3MGUyODM5MjAzZGNhOWQ1ZDM=
+    MzQ4YWM4YTEzMThhNDNhOWE2ZTY3Y2ExNDU1ZjA3MWQ5ODI1ODI2MGZhYjBk
+    ZjcyNDZhYjg3MmMxODlhNjNmOWNmNjhlOGRjYjRlZWM1OTAwOWQ1ZmRjNGZl
+    ZTVlYjYyMGQ4ZjljOWNlMzdmMzJjYjI1OWVkYTkyMjNlMjJiMTc=

data/lib/tutter/action/sppuppet.rb

@@ -34,7 +34,7 @@ class Sppuppet
       return 200, 'Merge state not clean' unless @data['state'] == 'success'
       commit_sha = @data['commit']['sha']
       @client.pull_requests(@project).each do |pr|
-        return maybe_merge(pr.number,false) if pr.head.sha == commit_sha
+        return maybe_merge(pr.number, false) if pr.head.sha == commit_sha
       end
       return 200, "Found no pull requests matching #{commit_sha}"
 
@@ -57,7 +57,7 @@ class Sppuppet
     merger = nil
     pr = @client.pull_request @project, pull_request_id
 
-    unless pr.mergeable_state == 'clean' 
+    unless pr.mergeable_state == 'clean'
       msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n"
       reassure = "I will try to merge this for you when the builds turn green\n" +
         'If your build fails or becomes stuck for some reason, just say \'rebuild\''
@@ -80,8 +80,8 @@ class Sppuppet
       # We only want to check newer comments
       next if last_commit_date > i.created_at
 
-      if (i.body == '!merge' || i.body.start_with?(':shipit:'))
-        merger ||= i.attrs[:user]
+      if i.body == '!merge' || i.body.start_with?(':shipit:')
+        merger ||= i.attrs[:user].attrs[:login]
         # Count as a +1 if it is not the author
         unless pr.user.login == i.attrs[:user].attrs[:login]
           votes[i.attrs[:user].attrs[:login]] = 1
@@ -98,7 +98,7 @@ class Sppuppet
       end
     end
 
-    return 200, "No merge comment found" unless merger
+    return 200, 'No merge comment found' unless merger
 
     num_votes = votes.values.reduce(0) { |a, e| a + e }
     if num_votes < @settings['plus_ones_required']

data/tutter-sppuppet.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '0.0.22'
+  s.version     = '0.0.23'
   s.author      = ['Johan Haals', 'Erik Dalén', 'Alexey Lapitsky']
   s.email       = ['johan.haals@gmail.com', 'dalen@spotify.com', 'alexey@spotify.com']
   s.homepage    = 'https://github.com/jhaals/tutter-sppuppet'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tutter-sppuppet
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Johan Haals
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tutter