danger-gitlab_reviewbot 1.1.4 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2886d84d0e6fb6e296379feeb66e4e183d5aa8bd8598a3f4e2713aa5b4b5927
-  data.tar.gz: 0b1aa53383e71c481256c8893064ca54cda389c8dad6f2dcad014d48117c8edb
+  metadata.gz: 67b82907ad367877d16780bff37695983a3235649eb5751564f80af6b3741eac
+  data.tar.gz: b35596f4f8d498cfdbb5dc873a99418782558ace2680980900735ede0f7f1825
 SHA512:
-  metadata.gz: 5a4d8a9e9da4ce0883efae5cd949d18497b0e571b916443c4276a884b1fe6be2fe35a143c803665bb0d6f810a16b1687032fde49585a92066d381811ed52507a
-  data.tar.gz: '03528aa2084af65294610316cdff1a584c6507ccd88ed407270d87ed27029d6734e73a0ef06f4c9af5b60ce2bd68292debc456187c48107b015760b5f8a1393f'
+  metadata.gz: 0c9ca5a7f734c3c0a86c08d80309a58049b538bf546aaa6d47f74ac18fe248593383e7977c70d8aa1cc7b4501b6610e129d7e8c7d941de03746ede64739699fc
+  data.tar.gz: 4e0234da0471bba9284fbc70d618fc96b0f931e7eba63d3f0e555e08918d6dd06ec23f09fa8cd0639fd75d664d6b691163dcb67810f414e4dd471720820cd9a2

data/.gitlab-ci.yml

@@ -4,16 +4,31 @@ cache:
   paths:
     - vendor/bundle/
 
+stages:
+  - test
+  - deploy
+
 test:
   stage: test
   script:
   - gem install bundler
   - bundle --path vendor/bundle
   - bundle exec rake spec
-  - bundle exec rake build
   artifacts:
     paths:
       - rspec.xml
     reports:
       junit: rspec.xml
 
+deploy:
+  stage: deploy
+  only:
+    - tags
+  before_script:
+    - 'mkdir ~/.gem && echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials && chmod 0600 ~/.gem/credentials'
+  script:
+    - gem install bundler
+    - bundle --path vendor/bundle
+    - bundle exec rake build
+    - gem push pkg/danger-gitlab_reviewbot-${CI_COMMIT_TAG}.gem
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-gitlab_reviewbot (1.1.3)
+    danger-gitlab_reviewbot (1.1.7)
       danger-gitlab
       danger-plugin-api (~> 1.0)
 
@@ -21,26 +21,26 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.3.2)
+    danger (8.0.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (~> 0.9)
+      faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.6)
+      git (~> 1.7)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-gitlab (7.0.0)
-      danger (~> 6.0)
+    danger-gitlab (8.0.0)
+      danger
       gitlab (~> 4.2, >= 4.2.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
     diff-lcs (1.3)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
@@ -48,7 +48,7 @@ GEM
     formatador (0.2.5)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitlab (4.14.1)
+    gitlab (4.15.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
     guard (2.16.2)
@@ -65,7 +65,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     kramdown (2.2.1)

data/lib/gitlab_reviewbot/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabReviewbot
-  VERSION = "1.1.4"
+  VERSION = "1.1.9"
 end

data/lib/gitlab_reviewbot/gitlab.rb

@@ -19,12 +19,33 @@ module Gitlab
     end
   end
 
-  class Client < API
+  class ClientHelper
+    def initialize(client)
+      @client = client
+    end
+
+    def users_with_pending_mr_review(project_id)
+      outstanding_mrs = fetch_mrs_requiring_review(project_id)
+      all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.assignees - assignees_with_review(project_id, mr.id, mr.assignees)}
+      assignees_id_map = all_assignees.each_with_object({}) do |a, acc|
+        aid = a["id"]
+        ausername = a["username"]
+        assignee = acc[aid] || User.new(aid, ausername)
+        assignee.review_count += 1
+        acc[aid] = assignee
+      end
+      assignees_id_map.values
+    end
+
+    def fetch_mrs_requiring_review(project_id)
+      @client.merge_requests(project_id, state: "opened", per_page: "100")
+    end
+
     def fetch_users_for_group(group_name)
-      group_id = search_group(group_name)
+      group_id = search_group_with_path(group_name)
       return nil if group_id.nil?
 
-      res = group_members(group_id)
+      res = @client.group_members(group_id, :per_page => 100)
 
       developer_access_level = 30
       res.select { |u| u.state == "active" && u.access_level >= developer_access_level }.map { |u| User.new(u.id, u.username) }
@@ -32,44 +53,28 @@ module Gitlab
 
     def assign_mr_to_users(project_id, mr_iid, users)
       user_ids = users.map(&:id)
-      update_merge_request(project_id, mr_iid, "assignee_ids" => user_ids)
+      @client.update_merge_request(project_id, mr_iid, "assignee_ids" => user_ids)
+
     end
 
     def fetch_author_for_mr(project_id, mr_iid)
-      res = merge_request(project_id, mr_iid)
+      res = @client.merge_request(project_id, mr_iid)
       User.new(res.author.id, res.author.name)
     end
 
-    def fetch_mrs_requiring_review(project_id)
-      merge_requests(project_id, state: "opened", per_page: "100").reject { |mr| mr.merge_status == "can_be_merged" }
-    end
-
     def find_user_with_username(username)
-      users({ username: username }).map { |u| User.new(u.id, u.username) }
-    end
-
-    def users_with_pending_mr_review(project_id)
-      outstanding_mrs = fetch_mrs_requiring_review(project_id)
-      all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.assignees }
-      assignees_id_map = all_assignees.each_with_object({}) do |a, acc|
-        aid = a["id"]
-        ausername = a["username"]
-        assignee = acc[aid] || User.new(aid, ausername)
-        assignee.review_count += 1
-        acc[aid] = assignee
-      end
-      assignees_id_map.values
+      @client.users({ username: username }).map { |u| User.new(u.id, u.username) }
     end
 
     def fetch_mr_reviewers(project_id, mr_iid)
-      merge_request(project_id, mr_iid).assignees.map { |u| User.new(u["id"], u["username"]) }
+      @client.merge_request(project_id, mr_iid).assignees.map { |u| User.new(u["id"], u["username"]) }
     end
 
     private
 
-    def search_group(group_name)
+    def search_group_with_path(group_name)
       short_name = group_name.split("/").last
-      res = group_search(short_name)
+      res = @client.group_search(short_name)
       res = res.find { |i| i.full_path == group_name }
 
       if res.nil?
@@ -78,5 +83,28 @@ module Gitlab
         res.id
       end
     end
+
+    def assignees_with_review(project_id, mr_iid, gusers)
+      approvals =  @client.merge_request_approval_state(project_id, mr_iid)
+      approved_by = approvals.rules.reduce([]) { |acc, r| acc + r['approved_by'] }
+      gusers.filter { |u| approved_by.index { |au| au['id'] == u['id'] } != nil }
+    end
+
+  end
+
+  class Client < API
+
+    def client_helper
+      @client_helper ||= ClientHelper.new(self)
+    end
+
+    def method_missing(method, *args)
+      if client_helper.respond_to?(method)
+        client_helper.send(method, *args)
+      else
+        super
+      end
+    end
+
   end
 end

data/lib/gitlab_reviewbot/strategies/least_busy.rb

@@ -13,9 +13,8 @@ module Danger
         group_users_with_reviews_pending = client.users_with_pending_mr_review(project_id).filter { |u| users_in_group.include? u }
         group_users_without_reviews_pending = users_in_group.filter { |u| !group_users_with_reviews_pending.include? u }
 
-        (group_users_with_reviews_pending + group_users_without_reviews_pending).filter { |u| !invalid_assignees.include? u }
-          .sort_by(&:review_count)
-          .first(amount)
+        candidates = (group_users_with_reviews_pending + group_users_without_reviews_pending).filter { |u| !invalid_assignees.include? u }
+        candidates.shuffle.sort_by(&:review_count).first(amount)
       end
     end
   end

data/lib/gitlab_reviewbot/strategies/strategy.rb

@@ -27,7 +27,7 @@ module Danger
         all_assignees.map(&:username)
       end
 
-      def assignees(_amount)
+      def assignees(amount)
         raise "To be implemented in the subclasses"
       end
 

data/spec/gitlab_ext_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require File.expand_path("spec_helper", __dir__)
+
+
+module Danger
+  describe Gitlab::Client do
+    before do
+      #
+      # @sam = Gitlab::User.new(1, "Sam")
+      # @tom = Gitlab::User.new(2, "Tom")
+      # @nic = Gitlab::User.new(3, "Nic")
+      # @luke = Gitlab::User.new(4, "Luke")
+      @mock_client = double(Gitlab::Client)
+      @client_helper = Gitlab::ClientHelper.new(@mock_client)
+      @sam = Gitlab::User.new(1, "Sam")
+      @tom = Gitlab::User.new(2, "Tom")
+      @nic = Gitlab::User.new(3, "Nic")
+      @assignees = [{'id' => 1, 'username' => "Sam"},
+                    {'id' => 2, 'username' => "Tom"},
+                    {'id' => 3, 'username' => "Nic"}]
+    end
+
+    it "Correctly calculates users with pending reviews" do
+      already_reviewed = [@assignees[0]]
+
+      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'id' => 110, 'assignees' => @assignees})])
+      allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => already_reviewed}]}))
+
+      expect(@client_helper.users_with_pending_mr_review(10)).to be == [@tom, @nic]
+    end
+
+    it "Correctly calculates users with pending reviews (multi rule)" do
+      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'id' => 110, 'assignees' => @assignees})])
+      allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => [{'id' => 1, 'username' => "Sam"}]}, {'approved_by' => [{'id' => 2, 'username' => "Tom"}]}]}))
+
+      expect(@client_helper.users_with_pending_mr_review(10)).to be == [@nic]
+    end
+
+    it "Fetches only active developer users for group" do
+      active_users = [Gitlab::ObjectifiedHash.new({'id' => 1, 'username' => 'Sam', 'state' => 'active', 'access_level' => 30}),
+                      Gitlab::ObjectifiedHash.new({'id' => 2, 'username' => 'Tom', 'state' => 'active', 'access_level' => 50})]
+      inactive_users = [Gitlab::ObjectifiedHash.new({'id' => 3, 'username' => 'OldSam', 'state' => 'inactive', 'access_level' => 30})]
+      non_developer_users = [Gitlab::ObjectifiedHash.new({'id' => 4, 'username' => 'Reporter', 'state' => 'active', 'access_level' => 20})]
+      allow(@mock_client).to receive(:group_search).with("mygroup").and_return([Gitlab::ObjectifiedHash.new({'id' => 10, 'full_path' => "mygroup"})])
+      allow(@mock_client).to receive(:group_members).with(10).and_return(active_users + inactive_users + non_developer_users)
+      expect(@client_helper.fetch_users_for_group("mygroup")).to be == [@sam, @tom]
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require "pry"
 
 require "rspec"
 require "danger"
+require File.expand_path("../lib/gitlab_reviewbot/gitlab", __dir__)
 
 if `git remote -v` == ""
   puts "You cannot run tests without setting a local git remote on this repo"
@@ -59,7 +60,7 @@ def testing_env
     "CI_API_V4_URL" => "https://git.curve.tools/api/v4",
     "CI_PROJECT_ID" => "346",
     "GITLAB_CI" => true,
-    "DANGER_GITLAB_API_TOKEN" => "jgUhHSk2vGNYYFr3QsPq"
+    "DANGER_GITLAB_API_TOKEN" => "token-token-token"
   }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-gitlab_reviewbot
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.9
 platform: ruby
 authors:
 - Fabio Gallonetto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -218,6 +218,7 @@ files:
 - lib/gitlab_reviewbot/strategies/least_busy.rb
 - lib/gitlab_reviewbot/strategies/random.rb
 - lib/gitlab_reviewbot/strategies/strategy.rb
+- spec/gitlab_ext_spec.rb
 - spec/gitlab_reviewbot_spec.rb
 - spec/least_busy_strategy_spec.rb
 - spec/random_strategy_spec.rb
@@ -246,6 +247,7 @@ signing_key:
 specification_version: 4
 summary: A review raffle bot for Gitlab.
 test_files:
+- spec/gitlab_ext_spec.rb
 - spec/gitlab_reviewbot_spec.rb
 - spec/least_busy_strategy_spec.rb
 - spec/random_strategy_spec.rb