danger-reviewer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4211e52ae29704d83d1efac4c6689a64de52b791863d83091a596dc3efca574e
-  data.tar.gz: c188ad6c6a539941a7d2c8b5689e7b9d36f82f348f1638f27091e5a66b06abdd
+  metadata.gz: 646b0e5035c84b5a44fa8d5e9d1cf595c41b77d2cefc2ee0bfc4247dc75e090c
+  data.tar.gz: 9d77d32e0e27a25953c38049d6f7a69f0e2aa62d779f97eec00e348a916e979d
 SHA512:
-  metadata.gz: 36e3f6c591b11b494db7327a0939747e7f3682b463781ece7d9ac60329e191a6614bdaaec7f631b52dd75a1b8c4db42f1a67632219ee35d1472e2a32b5fe14c9
-  data.tar.gz: 6b514184d2ccfa52690081672f64cbdd8449c95a38f0ed748cc0f2a1e031071e0704e551a1fe2b6c35f5fffc5ac85808cb5b0c18633b6064eecfea512650fde4
+  metadata.gz: 1dc2417d16f930402640e6df18dc1ba35e69da0c5cf9888363c58637afcce78192f765cab32c54f7163336895920c3c3b181746c8b66270c69cc72ef5db64270
+  data.tar.gz: 88133eef61b9fa14c7d8aa28bdd4a6ecb154b7eee6d4b9a4dd524b03c6c9cabc3859d9dd567ae7bd26f6b935550312f6a39c4f3a833a787c5a6ec24efe53213a

data/lib/reviewer/gem_version.rb

@@ -1,3 +1,3 @@
 module Reviewer
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

data/lib/reviewer/plugin.rb

@@ -13,7 +13,7 @@ module Danger
 
       authors = find_authors
       members = team_members(team)
-      reviewers = find_reviewers((authors & members), user_blacklist, (max_reviewers - current.count))
+      reviewers = find_reviewers((authors & members), members, user_blacklist, (max_reviewers - current.count))
 
       request_reviews(reviewers)
     end
@@ -21,8 +21,6 @@ module Danger
     def request_reviews(reviewers)
       owner, repo = env.ci_source.repo_slug.split('/')
 
-      require 'pry'; binding.pry
-
       uri = URI.parse("https://api.github.com/repos/#{owner}/#{repo}/pulls/#{github.pr_json[:number]}/requested_reviewers")
       header = {'Content-Type': 'text/json', 'Authorization': "token #{ENV['DANGER_GITHUB_API_TOKEN']}" }
 
@@ -44,6 +42,7 @@ module Danger
 
       git.modified_files.each do |file|
         result = GitHub::Client.query(GitHub::BlameQuery, variables: { repository: repo, owner: owner, ref: branch, file: file })
+        next if result.data.repository.ref.nil?
         result.data.repository.ref.target.blame.ranges.each do |range|
           lines = (range.ending_line - range.starting_line) + 1
           users[range.commit.author.user.login] += lines unless range.commit.author.user.nil?
@@ -53,13 +52,21 @@ module Danger
       users.keys
     end
 
-    def find_reviewers(users, user_blacklist, max_reviewers)
+    def find_reviewers(authors, members, user_blacklist, max_reviewers)
       user_blacklist << github.pr_author
 
-      users = users - user_blacklist
-      users = users.sort_by { |_, value| value }.reverse
+      reviewers = []
+
+      authors = authors - user_blacklist
+      authors = authors.sort_by { |_, value| value }.reverse
+
+      reviewers += authors[0...max_reviewers]
+
+      if reviewers.count < max_reviewers
+        reviewers += (members - reviewers).sample(max_reviewers - reviewers.count)
+      end
 
-      users[0...max_reviewers]
+      reviewers
     end
 
     def current_reviewers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-reviewer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mikko Kokkonen