danger-gitlab_reviewbot 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78868b60ea86cc9289c4a13598fe7807228c548190c02769f6a7007144c25bb9
-  data.tar.gz: c4a7efe442933e89acb1efdca5602ca5bc3742c51f8874b0d220a7fd0988cae0
+  metadata.gz: 18d9331afe98308a84876492708add4449315fe4a1f90145c9b23e70e8547fb7
+  data.tar.gz: 9abbf57104a68241af9bfc41475ddd32872ee7210a5f87096716b8ad1952611c
 SHA512:
-  metadata.gz: 72813a9d97245481c458864a9478e0641200e529c072adb9ab4e245954c250c3ab88d64147e23d3a82896cbdadfaa0f7463454fe1db45e4072f6ab898b4090ad
-  data.tar.gz: 56a3308398621751ce1bed2efb53a1b4f82ddf29bf105a00bd5197b06210276f0cd270b273125da66ad4ecb86e3671ba61cc67c1eb05ab12f557384ffbbfd142
+  metadata.gz: 474afe53630d3bd6c7c09b718d120ee0a966ac5fae93c80520e8ab1b4cff2376bb866ccbfce8b1c198afb923296755f222751e4e76f4b77a44f7fa81a130bae3
+  data.tar.gz: 537f846fa8177706d9dfa989c50dc36dba52730530bc617d0c1b3e24f4fa9075956082033ec4b4f9187bcfa507ef1a966bb2bcf3382ec018fe224237e9f2e0e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-gitlab_reviewbot (1.0.2)
+    danger-gitlab_reviewbot (1.1.0)
       danger-gitlab
       danger-plugin-api (~> 1.0)
 
@@ -20,26 +20,26 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.0.0)
+    danger (6.3.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
+      faraday (~> 0.9)
       faraday-http-cache (~> 2.0)
-      git (~> 1.7)
+      git (~> 1.6)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-gitlab (5.0.1)
-      danger (>= 5.0)
-      gitlab (~> 4.0)
+    danger-gitlab (7.0.0)
+      danger (~> 6.0)
+      gitlab (~> 4.2, >= 4.2.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
     diff-lcs (1.3)
-    faraday (1.0.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)

data/lib/gitlab_reviewbot/gem_version.rb

@@ -1,3 +1,3 @@
 module GitlabReviewbot
-  VERSION = "1.0.2".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/gitlab_reviewbot/gitlab.rb

@@ -42,6 +42,10 @@ module Gitlab
       merge_requests(project_id, :state => 'opened', :per_page => '100').select { |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 }

data/lib/gitlab_reviewbot/plugin.rb

@@ -32,7 +32,7 @@ module Danger
     # NOTE: The plugin won't remove existing assigned reviewers
     #
     # @return   Int
-    attr_accessor :assignees_amount
+    attr_writer :assignees_amount
     def assignees_amount
       @assignees_amount || 1
     end
@@ -44,7 +44,7 @@ module Danger
     # * Danger::AssignStrategies::LeastBusyStrategy - assign the N users with the least amount of open MRs
     #   to review
     #
-    attr_accessor :strategy
+    attr_writer :strategy
     def strategy
       @strategy || Danger::AssignStrategies::RandomStrategy
     end

data/lib/gitlab_reviewbot/strategies/strategy.rb

@@ -5,12 +5,14 @@ module Danger
       attr_accessor :project_id
       attr_accessor :group_name
       attr_accessor :client
+      attr_accessor :excluded_users
 
       def initialize(client:, project:, mr:, group:)
         @client = client
         @project_id = project
         @mr_iid = mr
         @group_name = group
+        @excluded_users = []
       end
 
       def assign!(amount)
@@ -37,7 +39,8 @@ module Danger
       end
 
       def fetch_users_in_group
-        client.fetch_users_for_group(@group_name)
+        excluded_users = @excluded_users.map { |u| client.find_user_with_username(u) }
+        client.fetch_users_for_group(@group_name).filter { |u| ! excluded_users.include? u }
       end
     end
   end

data/spec/random_strategy_spec.rb

@@ -10,9 +10,11 @@ module Danger
       @tom = Gitlab::User.new(2, 'Tom')
       @nic = Gitlab::User.new(3, 'Nic')
       @luke = Gitlab::User.new(4, 'Luke')
+      @lei = Gitlab::User.new(5, 'Lei')
+
 
       @mock_client = double(Gitlab::Client)
-      @author = @nic
+      @author = @lei
       @members = [@author, @tom, @sam]
       allow(@mock_client).to receive(:fetch_author_for_mr).and_return(@author)
       allow(@mock_client).to receive(:fetch_users_for_group).with(2200).and_return(@members)
@@ -54,6 +56,23 @@ module Danger
       @strategy.assign!(2)
     end
 
+    it "honours excluded users" do
+       allow(@mock_client).to receive(:fetch_mr_reviewers).with(10, 110).and_return([])
+       allow(@mock_client).to receive(:find_user_with_username).with('Luke').and_return(@luke)
+       allow(@mock_client).to receive(:find_user_with_username).with('Nic').and_return(@nic)
+       allow(@mock_client).to receive(:fetch_users_for_group).with(2200).and_return(@members + [@nic, @luke])
+       @strategy.excluded_users = ['Nic', 'Luke']
+
+       expect(@mock_client).to receive(:assign_mr_to_users) do |project, mr, users|
+         expect(project).to be == 10
+         expect(mr).to be == 110
+         expect(users).to contain_exactly(@tom, @sam)
+      end
+
+      @strategy.assign!(2)
+
+    end
+
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-gitlab_reviewbot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Fabio Gallonetto