lita-github-pinger 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fefae430e666059a708616ee469943a3f10b5b8f
-  data.tar.gz: 52fb963fede4cbaf23eb14c17a19146f5637aeac
+  metadata.gz: 4f22d1757545c929eb8ce882ed716e5e478c9821
+  data.tar.gz: 9b73ca8d2da4bf7ec0d0ab0bc89893023cda6533
 SHA512:
-  metadata.gz: e247d735dee12f913d0d6c7dbb09c7768295866dd5bce29553c98aa1ab06d7987e44b763f78b0565799ba00d3733163b9df7eff7176d217ec86480275a5a3c35
-  data.tar.gz: e3177c0c6ad56b7e62440cea222021cdb5f22be4f15dd32a749e5a54a1b786d3d24bd46a12c3686012bbf0e702ec300cc78b8d3289d55f610037088f21969946
+  metadata.gz: 78eb95991b530696ab1a05314b4fdfde579be2c74bf3069e808ee93ab5e4b32fcc6db9a0557aac5f786a713eed0ed6c312faebec25823e8100e6de32cb4f3fb8
+  data.tar.gz: f1a2f74539ba843cbecbd1ffee3f2ff194e2334759a33790d0620780ffc5cef130100d29e314cb6db7e65fe389065068538ae9d1bf3814210ffae0af5f616391

data/lib/lita/handlers/github_pinger.rb

@@ -60,8 +60,8 @@ module Lita
           act_on_assign(body, response)
         end
 
-        if body["action"] && body["action"] == "opened"
-          act_on_pr_opened(body, response)
+        if body["action"] && body["action"] == "labeled"
+          act_on_pr_labeled(body, response)
         end
 
         if body["state"] && body["state"] == "success"
@@ -126,49 +126,53 @@ module Lita
         response
       end
 
-      def act_on_pr_opened(body, response)
+      def act_on_pr_labeled(body, response)
         type = detect_type(body)
-        puts "Detected that someone opened a #{type.tr('_', ' ')}."
+        puts "Detected that someone labeled a #{type.tr('_', ' ')}."
+
         if type.nil?
           puts 'Neither pull request or issue detected, exiting...'
           return
         end
 
+        if body["labels"].none? { |label| label.name.downcase.include?('review') }
+          puts 'Labels do not include a review label, exiting...'
+          return
+        end
+
         if config.enable_round_robin
           puts "round robin is enabled, selecting the next engineer.."
 
-          chosen_reviewer = redis.get(RR_REDIS_KEY)
-          engineers_with_rr_enabled = config.engineers.values.select { |eng| eng[:enable_round_robin] }
+          chosen_reviewer = get_next_round_robin_reviewer
 
-          if chosen_reviewer.nil?
-            chosen_reviewer = engineers_with_rr_enabled[0][:usernames][:slack]
-          end
+          pr_owner = find_engineer(github: body["pull_request"]["user"]["login"])
+          pr_owner = pr_owner[:usernames][:slack] unless pr_owner.nil?
 
-          current_reviewer_index = engineers_with_rr_enabled.find_index do |eng|
-            eng[:usernames][:slack] == chosen_reviewer
+          if chosen_reviewer === pr_owner
+            update_next_round_robin_reviewer
+            chosen_reviewer = get_next_round_robin_reviewer
           end
 
-          next_reviewer_index = (current_reviewer_index + 1) % engineers_with_rr_enabled.length
-          next_reviewer = engineers_with_rr_enabled[next_reviewer_index][:usernames][:slack]
-
           puts "#{chosen_reviewer} determined as the reviewer."
-          puts "#{next_reviewer} determined as the next reviewer"
-
-          puts "storing #{next_reviewer} in redis..."
-          redis.set(RR_REDIS_KEY, next_reviewer)
 
           url = body[type]['html_url']
 
-          message = "You're next in line to review a PR! Please review, or assign to an engineer with more context if you think you are unable to give a thorough review. \n#{url}"
+          message_for_reviewer = "You're next in line to review a PR! Please review, or assign to an engineer with more context if you think you are unable to give a thorough review. \n#{url}"
+          message_for_owner = "#{chosen_reviewer} has been notified via round-robin to review #{body["pull_request"]["html_url"]}"
 
           puts "Sending DM to #{chosen_reviewer}..."
           send_dm(chosen_reviewer, message)
 
-          pr_owner = find_engineer(github: body["pull_request"]["user"]["login"])
-          assignment_message = "#{chosen_reviewer} has been notified via round-robin to review #{body["pull_request"]["html_url"]}"
-          puts "Notifying #{pr_owner} of assignment."
-          send_dm(pr_owner[:usernames][:slack], assignment_message)
+          if pr_owner
+            puts "Notifying #{pr_owner} of assignment."
+            send_dm(pr_owner, assignment_message)
+          else
+            puts "Couldn't find a config for pr owner #{body["pull_request"]["user"]["login"]}. Make sure they are in the lita config!"
+            puts "Skipping notifying PR owner of RR assignment."
+          end
 
+          update_next_round_robin_reviewer
+          
           response
         end
       end
@@ -247,6 +251,31 @@ module Lita
         response
       end
 
+      def get_next_round_robin_reviewer
+        engineers_with_rr_enabled = config.engineers.values.select { |eng| eng[:enable_round_robin] }
+        next_reviewer = redis.get(RR_REDIS_KEY)
+
+        if next_reviewer.nil?
+          next_reviewer = engineers_with_rr_enabled[0][:usernames][:slack]
+        end
+
+        next_reviewer
+      end
+
+      def update_next_round_robin_reviewer
+        engineers_with_rr_enabled = config.engineers.values.select { |eng| eng[:enable_round_robin] }
+        current_reviewer = get_next_round_robin_reviewer
+
+        current_reviewer_index = engineers_with_rr_enabled.find_index do |eng|
+          eng[:usernames][:slack] == current_reviewer
+        end
+
+        next_reviewer_index = (current_reviewer_index + 1) % engineers_with_rr_enabled.length
+        next_reviewer = engineers_with_rr_enabled[next_reviewer_index][:usernames][:slack]
+
+        redis.set(RR_REDIS_KEY, next_reviewer)
+      end
+
       def alert_eng_pr(message)
         puts "Alerting #eng-pr about content #{message[0..5]}... "
         room = Lita::Room.fuzzy_find("eng-pr")

data/lita-github-pinger.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-github-pinger"
-  spec.version       = "0.7.5"
+  spec.version       = "0.7.6"
   spec.authors       = ["Taylor Lapeyre"]
   spec.email         = ["taylorlapeyre@gmail.com"]
   spec.description   = "A Lita handler that detects github comment notifications and regurgitates a ping to the correct slack username."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-github-pinger
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Taylor Lapeyre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita