tutter-jenkins 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzdiODU5OTQ1OTM2ZDU2NmYwZGU4YzFkOWQyYjBiMTUyOWZjMjI3YQ==
+    MWJmNDY3MWFmZjg2MDYyOWU3NzY3OWQ4YmY2NDZmOWFhZjI4ZjdkNQ==
   data.tar.gz: !binary |-
-    NmExMTg2YTE3NjczZmUzMDVmNWIwZjZlYWRlMTJjMWYzMDk0MDUwYw==
+    MDk5MzhkY2E4YmZiNGQyYWQyNmI2N2U2ZmUzNGZjZDcwZTFhNDA5Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2U4ZWNhNTc2Zjk5MDI4ZmQzN2QwMzlhOTdkMDgxYWVlMDAzNDA5Mzk0MmIx
-    NjZmYzcyMDBkMTU2YzI2ZDgwNjUyYWYwNDk0MTQxMWFlNDEyZGQ4MGI4OWRm
-    MDZjZGMwYTBhMjZiNGI1MTlhNmQ3ZGY1MTgwMmUyOThiNzY1ZmI=
+    MTJkMDFjYzI4ZDkyY2FkMjczNzkzYjc0MGNhYzczZjg1YjFmYTY1NmJhNjVi
+    YjQ3MDlmYjExZjRhZTFkZjAyODdkZGFmYjllMGE0MmEzNzEwZjBiMjhlZjAy
+    ZjVjZWFjMDMwZDNhYjI0ZThmNDAyYzZlZjZjMjJlMDRhMDlkODE=
   data.tar.gz: !binary |-
-    OTZjMmEyZDY4MGIyNTU3ZmNlYzRmMmQyN2M5ZGM5MzliZTAwMzg4M2ViM2Yw
-    YmU0ZThkOGI3YjM4MzZiNzc5MTNlMTY3ZmEwZjg4NzlmMTExMTBmYTE4MWYx
-    OWI5NzhkYTUyNzk2ZTBjMDEzMzFlMzFhZDhhMDkxMGIzZTk2YWI=
+    NTA2Njk1MTY2MThlMzk0Nzk3NzJlNzkwOWNkNjBhZGM3N2ZkZGI3NGZhYTVm
+    MTlhMjBhYjNmZTQwZWQ4MzgzNzkxN2FmNzQ1NWIxMTc4MmUxMzVhNmU5NDA1
+    MDRiZDAyZmFlYjhhZjg0MGM1NmQxMjZkNzUyZTFjZTBiMDgzNWE=

data/.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-jenkins'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.author      = 'Alexey Lapitsky'
   s.email       = ['alexey@spotify.com']
   s.homepage    = 'https://ghe.spotify.net/io/tutter-jenkins'

data/lib/tutter/action/jenkins.rb

@@ -1,48 +1,53 @@
 class Jenkins
   def initialize(settings, client, project, data)
-    @settings = settings
+    @settings = settings || {}
     @client = client
     @project = project
     @data = data
+    @merge_request_comment = @settings['merge_request_comment']
+    @merge_request_comment ||= 'merge, my change is covered by tests'
   end
 
   def run
     pull_request_id = @data['issue']['number']
     puts "pull request id: #{pull_request_id}"
-    pr = @client.pull_request @project, pull_request_id
 
-    if pr.mergeable_state != 'clean'
-      puts "merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
+    comments = @client.issue_comments(@project, pull_request_id)
+    last_comment = comments.last
+
+    asked_to_merge = last_comment && last_comment.body.strip.downcase == @merge_request_comment.strip.downcase
+    unless asked_to_merge
+      puts "not asked to merge"
       return false
     end
 
-    # No comments, no need to go further.
-    if pr.comments == 0
-      puts 'no comments, skipping'
+    pr = @client.pull_request @project, pull_request_id
+    if pr.mergeable_state != 'clean'
+      @client.add_comment(@project, pull_request_id, "Please rebase your change, merge state is #{pr.mergeable_state}")
       return false
     end
 
-    # Don't care about code we can't merge
     unless pr.mergeable
-      puts 'not mergeable, skipping'
+      @client.add_comment(@project, pull_request_id, "Please rebase your change, pull request is not mergeable")
       return false
     end
 
-    # We fetch the latest commit and it's date.
     last_commit = @client.pull_request_commits(@project, pull_request_id).last
     last_commit_date = last_commit.commit.committer.date
 
-    comments = @client.issue_comments(@project, pull_request_id)
+    if last_comment.created_at < last_commit_date
+      @client.add_comment(@project, pull_request_id, "Please reopen pull request, found a new commit")
+      return false
+    end
+
     jenkins_last_comment = @client.issue_comments(@project, pull_request_id).select{|c| c.attrs[:user].attrs[:login] == 'jenkins'}.last
     jenkins_allows_merge = jenkins_last_comment && jenkins_last_comment.body =~ /PASS/
 
     if jenkins_allows_merge
-      puts "the last comment from jenkins allows the merge"
-      last_comment = comments.last
-      if last_comment.created_at > last_commit_date && last_comment.body.strip.downcase == 'merge, my change is covered by tests'
-        puts "merging #{pull_request_id} #{@project}"
-        @client.merge_pull_request(@project, pull_request_id, 'ok, shipping!')
-      end
+      puts "merging #{pull_request_id} #{@project}"
+      @client.merge_pull_request(@project, pull_request_id, 'ok, shipping!')
+    else
+      @client.add_comment(@project, pull_request_id, "Please make sure tests pass")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tutter-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexey Lapitsky