danger-gitlab_reviewbot 1.1.2 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c66efab79926e5fe804ec34cd49c377885a0f88940fbf954d90068e33edcb3
-  data.tar.gz: '09d54282e82e046837938f076fb051fa10e77bd3a91d2d9cf68a058dc2304225'
+  metadata.gz: 4a7eaa5cd15e0c7c399b577b76461cf7eb3580b1d1350bcc0175c5126784fc1c
+  data.tar.gz: 17c5294182aad19fb6d68dcf6858ab313a1ed140a53acffa6ef815abdb4b5a48
 SHA512:
-  metadata.gz: 61b5e0b675c6052711bd0d6e04d205b21bb9f314a11c46f4b031aa30e39193188c00fe80cf8ada2ccc915e8cec61621102831bde06d650153f3d7fc3439759d7
-  data.tar.gz: 14afa37d0cc9f4afcff9f608ebde569834a69b30da6c5c4b58d7aa533dc758c241bc72f727837d592c88567ed72c2e18507bd2de0b8ea21f4073a01a215a9e49
+  metadata.gz: b66136604fadac6c2d49a53739b5435a40a3634a269683d68af032a0bd5475a8070f3a6f8a49801bc537a167c4f3b5955fd97fa464ea9349c268056612526708
+  data.tar.gz: 776cc841222ceb2f057aa7c9bc4fda90b3dff2fddfa602c4863e036f71ab6af098a1a22b0606dda00a829d98edcd7da77d02bf68b4c3ab9adc299489d0471f4a

data/.gitlab-ci.yml

@@ -0,0 +1,34 @@
+image: "ruby:2.6"
+
+cache:
+  paths:
+    - vendor/bundle/
+
+stages:
+  - test
+  - deploy
+
+test:
+  stage: test
+  script:
+  - gem install bundler
+  - bundle --path vendor/bundle
+  - bundle exec rake spec
+  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.1)
+    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/danger-gitlab_reviewbot.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['fabio.gallonetto@curve.com']
   spec.description   = %q{A review raffle bot for Gitlab }
   spec.summary       = %q{A review raffle bot for Gitlab.}
-  spec.homepage      = 'https://github.com/curve-technology/danger-gitlab_reviewbot'
+  spec.homepage      = 'https://git.curve.tools/fabio.gallonetto/danger-gitlab_reviewbot'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/lib/danger_gitlab_reviewbot.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "gitlab_reviewbot/gem_version"

data/lib/danger_plugin.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "gitlab_reviewbot/plugin"

data/lib/gitlab_reviewbot/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitlabReviewbot
-  VERSION = "1.1.2".freeze
+  VERSION = "1.1.8"
 end

data/lib/gitlab_reviewbot/gitlab.rb

@@ -1,4 +1,6 @@
-require 'gitlab'
+# frozen_string_literal: true
+
+require "gitlab"
 
 module Gitlab
   class User
@@ -17,57 +19,62 @@ 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) }
+      res.select { |u| u.state == "active" && u.access_level >= developer_access_level }.map { |u| User.new(u.id, u.username) }
     end
 
     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').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 }
-      assignees_id_map = all_assignees.reduce({}) { |acc, a|
-        aid = a['id']
-        ausername = a['username']
-        assignee = acc[aid] || User.new(aid, ausername)
-        assignee.review_count += 1
-        acc[aid] = assignee
-        acc
-      }
-      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)
-      short_name = group_name.split('/').last
-      res = group_search(short_name)
+
+    def search_group_with_path(group_name)
+      short_name = group_name.split("/").last
+      res = @client.group_search(short_name)
       res = res.find { |i| i.full_path == group_name }
 
       if res.nil?
@@ -76,6 +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
-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/plugin.rb

@@ -1,5 +1,6 @@
-require 'gitlab_reviewbot/strategies'
+# frozen_string_literal: true
 
+require "gitlab_reviewbot/strategies"
 
 module Danger
   # This is your plugin class. Any attributes or methods you expose here will
@@ -20,8 +21,7 @@ module Danger
   # @tags monday, weekends, time, rattata
   #
   class DangerGitlabReviewbot < Plugin
-
-    # Define the group to take the reviewers from. 
+    # Define the group to take the reviewers from.
     # NOTE: This is the group full path as in 'tech/iOS' instead of just the group name
     #
     # @return   String
@@ -44,31 +44,10 @@ module Danger
     # * Danger::AssignStrategies::LeastBusyStrategy - assign the N users with the least amount of open MRs
     #   to review
     #
-    def strategy
-      @strategy #|| Danger::AssignStrategies::RandomStrategy.new(client: gitlab.api, project: project_id, mr: mr_iid)
-    end
-
     def strategy=(klass)
-      @strategy = klass.new(client: gitlab.api, project: project_id, mr: mr_iid)
-    end
-
-    def project_id
-      ENV['CI_PROJECT_ID']
-    end
-
-    def mr_iid
-      ENV['CI_MERGE_REQUEST_IID']
+      @strategy = klass.new(client: gitlab.api, project: project_id, mr_iid: mr_iid)
     end
 
-    #Once a strategy is in place, adopt the conf methods
-    def method_missing(method, *args)
-      super unless method.to_s.start_with? 'strategy_'
-      if strategy.respond_to? method.to_s.delete_prefix('strategy_')
-        strategy.send(method.to_s.delete_prefix('strategy_'), *args)
-      else
-        super
-      end
-    end
 
     # Call this method from the Dangerfile to assign reviewers to your merge requests
     # @return   The usernames list of assigned reviewes [Array<String>]
@@ -82,14 +61,14 @@ module Danger
         raise "Env variable CI_PROJECT_ID doesn't point to a valid project id"
       end
 
-      current_assignees = (ENV['CI_MERGE_REQUEST_ASSIGNEES'] || '').split(',') #buggy?
-      already_assigned_count = current_assignees.length
-      required_assignees_count = [assignees_amount - already_assigned_count, 0].max
+      current_assignees = (ENV["CI_MERGE_REQUEST_ASSIGNEES"] || "").split(",") # buggy?
+      # already_assigned_count = current_assignees.length
+      # required_assignees_count = [assignees_amount - already_assigned_count, 0].max
 
-      puts "Project ID: #{project_id}" if verbose
-      puts "MR IID: #{mr_iid}" if verbose
-      puts "Currently assigned: #{current_assignees}" if verbose
- #    puts "Required: #{required_assignees_count}" if @verbose
+      ui.puts "Project ID: #{project_id}" if verbose
+      ui.puts "MR IID: #{mr_iid}" if verbose
+      ui.puts "Currently assigned: #{current_assignees}" if verbose
+      #    puts "Required: #{required_assignees_count}" if @verbose
 
       # if required_assignees_count == 0
       #   puts "Nothing to do" if verbose
@@ -100,12 +79,34 @@ module Danger
 
       assignees = @strategy.assign! assignees_amount
 
-      puts "Assigning: #{assignees}" if verbose
+      ui.puts "Assigning: #{assignees}" if verbose
       return assignees
     end
 
     private
 
+    attr_reader :strategy
+
+    def project_id
+      ENV["CI_PROJECT_ID"]
+    end
+
+    def mr_iid
+      ENV["CI_MERGE_REQUEST_IID"]
+    end
+    
+    # Once a strategy is in place, adopt the conf methods
+    def method_missing(method, *args)
+      super unless method.to_s.start_with? "strategy_"
+      if strategy.respond_to? method.to_s.delete_prefix("strategy_")
+        strategy.send(method.to_s.delete_prefix("strategy_"), *args)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      method_name.to_s.start_with?("strategy_") || super
+    end
   end
 end
-

data/lib/gitlab_reviewbot/strategies.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module Danger
   module AssignStrategies
-    require 'gitlab_reviewbot/strategies/strategy'
-    require 'gitlab_reviewbot/strategies/random'
-    require 'gitlab_reviewbot/strategies/least_busy'
+    require "gitlab_reviewbot/strategies/strategy"
+    require "gitlab_reviewbot/strategies/random"
+    require "gitlab_reviewbot/strategies/least_busy"
   end
 end
-

data/lib/gitlab_reviewbot/strategies/least_busy.rb

@@ -1,21 +1,21 @@
-require 'gitlab_reviewbot/gitlab'
+# frozen_string_literal: true
+
+require "gitlab_reviewbot/gitlab"
 
 module Danger
   module AssignStrategies
     class LeastBusyStrategy < Strategy
       def assignees(amount)
-        users_in_group = fetch_users_in_group()
-        author = fetch_author()
-        invalid_assignees = [ fetch_author() ] + fetch_assigned_reviewers()
+        # This doesn't fetch the review count for the users so we need to fetch it separately later
+        users_in_group = fetch_users_in_group
+        invalid_assignees = [fetch_author] + fetch_assigned_reviewers
 
-        users_with_reviews_pending = client.users_with_pending_mr_review(project_id).filter { |u| users_in_group.include? u }
-        users_without_reviews_pending = users_in_group.filter { |u| ! users_with_reviews_pending.include? u }
+        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 }
 
-        (users_with_reviews_pending + users_without_reviews_pending).filter { |u| u.id != author.id }
-                                                                    .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
 end
-

data/lib/gitlab_reviewbot/strategies/random.rb

@@ -1,12 +1,14 @@
-require 'gitlab_reviewbot/gitlab'
+# frozen_string_literal: true
+
+require "gitlab_reviewbot/gitlab"
 
 module Danger
   module AssignStrategies
     class RandomStrategy < Strategy
       def assignees(amount)
-        invalid_assignees = [ fetch_author() ] + fetch_assigned_reviewers()
-        fetch_users_in_group.filter { |u| ! invalid_assignees.include? u }
-                            .sample(amount)
+        invalid_assignees = [fetch_author] + fetch_assigned_reviewers
+        fetch_users_in_group.filter { |u| !invalid_assignees.include? u }
+          .sample(amount)
       end
     end
   end

data/lib/gitlab_reviewbot/strategies/strategy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   module AssignStrategies
     class Strategy
@@ -7,21 +9,21 @@ module Danger
       attr_accessor :client
       attr_accessor :excluded_users
 
-      def initialize(client:, project:, mr:)
+      def initialize(client:, project:, mr_iid:)
         @client = client
         @project_id = project
-        @mr_iid = mr
+        @mr_iid = mr_iid
         @excluded_users = []
       end
 
       def assign!(amount)
-        currently_assigned = fetch_assigned_reviewers()
+        currently_assigned = fetch_assigned_reviewers
         return [] if (amount - currently_assigned.length) <= 0
 
         to_be_assigned = assignees(amount - currently_assigned.length)
         all_assignees = currently_assigned + to_be_assigned
 
-        response = client.assign_mr_to_users(project_id, mr_iid, all_assignees)
+        client.assign_mr_to_users(project_id, mr_iid, all_assignees)
         all_assignees.map(&:username)
       end
 
@@ -38,11 +40,13 @@ module Danger
       end
 
       def fetch_users_in_group
-        excluded = @excluded_users.map { |u| client.find_user_with_username(u) }
-        client.fetch_users_for_group(@group_name).filter { |u| ! excluded.include? u }
+        excluded = @excluded_users.map do |u|
+          server_user = client.find_user_with_username(u).first
+          raise "ERROR: Invalid username #{u} among excluded_users" if server_user.nil?
+          server_user
+        end
+        client.fetch_users_for_group(@group_name).filter { |u| !excluded.include? u }
       end
-
     end
   end
 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/gitlab_reviewbot_spec.rb

@@ -1,4 +1,6 @@
-require File.expand_path("../spec_helper", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("spec_helper", __dir__)
 
 module Danger
   describe Danger::DangerGitlabReviewbot do
@@ -11,25 +13,24 @@ module Danger
     #
     describe "with Dangerfile" do
       before do
-        testing_env.each { |k,v| ENV[k] = "#{v}" }
+        testing_env.each { |k, v| ENV[k] = v.to_s }
 
         @dangerfile = testing_dangerfile
         @plugin = @dangerfile.gitlab_reviewbot
         @strategy_mock = instance_double(Danger::AssignStrategies::Strategy)
         allow(Danger::AssignStrategies::RandomStrategy).to receive(:new).and_return(@strategy_mock)
-        allow(@strategy_mock).to receive(:group_name=).with('tech/ios')
+        allow(@strategy_mock).to receive(:group_name=).with("tech/ios")
         @plugin.strategy = Danger::AssignStrategies::RandomStrategy
-        @plugin.gitlab_group = 'tech/ios'
-
+        @plugin.gitlab_group = "tech/ios"
       end
 
       it "Assign one reviewer" do
-        expect(@strategy_mock).to receive(:assign!).with(1).and_return(['Sam'])
+        expect(@strategy_mock).to receive(:assign!).with(1).and_return(["Sam"])
 
         @plugin.assign!
       end
       it "Assign one reviewer" do
-        expect(@strategy_mock).to receive(:assign!).with(1).and_return(['Sam'])
+        expect(@strategy_mock).to receive(:assign!).with(1).and_return(["Sam"])
 
         @plugin.assign!
       end
@@ -37,7 +38,7 @@ module Danger
       it "Assign multiple reviewers" do
         @plugin.assignees_amount = 2
 
-        expect(@strategy_mock).to receive(:assign!).with(2).and_return(['Sam, Nic'])
+        expect(@strategy_mock).to receive(:assign!).with(2).and_return(["Sam, Nic"])
 
         @plugin.assign!
       end
@@ -46,18 +47,16 @@ module Danger
         expect(@strategy_mock).to receive(:excluded_users=)
         expect(@strategy_mock).to receive(:excluded_users).and_return([])
 
-        @plugin.strategy_excluded_users = ['Tom']
-        @plugin.strategy_excluded_users << 'Sam'
-
+        @plugin.strategy_excluded_users = ["Tom"]
+        @plugin.strategy_excluded_users << "Sam"
       end
 
-      ['CI_PROJECT_ID', 'CI_MERGE_REQUEST_IID'].each do |var|
+      ["CI_PROJECT_ID", "CI_MERGE_REQUEST_IID"].each do |var|
         it "Fails when required #{var} variables are not available" do
           ENV[var] = nil
-          expect{@plugin.assign!}.to raise_error(RuntimeError)
+          expect { @plugin.assign! }.to raise_error(RuntimeError)
         end
       end
     end
   end
 end
-

data/spec/least_busy_strategy_spec.rb

@@ -1,15 +1,17 @@
-require File.expand_path("../spec_helper", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("spec_helper", __dir__)
 
 module Danger
   describe Danger::AssignStrategies::LeastBusyStrategy do
     before do
-      testing_env.each { |k,v| ENV[k] = "#{v}" }
+      testing_env.each { |k, v| ENV[k] = v.to_s }
       @dangerfile = testing_dangerfile
 
-      @sam = Gitlab::User.new(1, 'Sam')
-      @tom = Gitlab::User.new(2, 'Tom')
-      @nic = Gitlab::User.new(3, 'Nic')
-      @luke = Gitlab::User.new(4, 'Luke')
+      @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)
       @author = @nic
@@ -18,9 +20,8 @@ module Danger
       allow(@mock_client).to receive(:fetch_author_for_mr).and_return(@author)
       allow(@mock_client).to receive(:fetch_users_for_group).with("tech/ios").and_return(@members)
 
-      @strategy = AssignStrategies::LeastBusyStrategy.new(client: @mock_client, project: 10, mr: 110)
+      @strategy = AssignStrategies::LeastBusyStrategy.new(client: @mock_client, project: 10, mr_iid: 110)
       @strategy.group_name = "tech/ios"
-
     end
 
     it "Assign the one least busy" do
@@ -92,16 +93,17 @@ module Danger
       @strategy.assign!(1)
     end
 
+    # TODO: This should go up to the superclass for testing
     it "honours excluded users" do
       allow(@mock_client).to receive(:fetch_mr_reviewers).with(10, 110).and_return([])
-      @tom.review_count = 1
+      @tom.review_count = 0
       @sam.review_count = 4
       @luke.review_count = 3
-      users_with_pending_mr_review = [@author, @sam, @tom, @luke]
+      users_with_pending_mr_review = [@author, @sam, @luke]
       expect(@mock_client).to receive(:users_with_pending_mr_review).and_return(users_with_pending_mr_review)
 
-      allow(@mock_client).to receive(:find_user_with_username).with('Tom').and_return(@tom)
-      @strategy.excluded_users = ['Tom']
+      allow(@mock_client).to receive(:find_user_with_username).with("Tom").and_return([@tom])
+      @strategy.excluded_users = ["Tom"]
 
       expect(@mock_client).to receive(:assign_mr_to_users) do |project, mr, users|
         expect(project).to be == 10
@@ -112,6 +114,22 @@ module Danger
       @strategy.assign!(1)
     end
 
+    it "Raises error when excluded_user is invalid" do
+      allow(@mock_client).to receive(:fetch_mr_reviewers).with(10, 110).and_return([])
+
+      allow(@mock_client).to receive(:find_user_with_username).with("WrongTom").and_return([])
+      @strategy.excluded_users = ["WrongTom"]
+
+      expect { @strategy.assign!(1) }.to raise_error("ERROR: Invalid username WrongTom among excluded_users")
+    end
+
+     # it "test" do
+     #  strategy = AssignStrategies::LeastBusyStrategy.new(client: @dangerfile.gitlab.api, project: 346, mr_iid: 960)
+     #  strategy.excluded_users << 'fabio.gallonetto'
+     #  strategy.group_name = 'tech/ios'
+     #  require 'pry'
+     #  binding.pry
+     #  puts strategy.assign!(2)
+     #    end
   end
 end
-

data/spec/random_strategy_spec.rb

@@ -1,17 +1,18 @@
-require File.expand_path("../spec_helper", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("spec_helper", __dir__)
 
 module Danger
   describe Danger::AssignStrategies::RandomStrategy do
     before do
-      testing_env.each { |k,v| ENV[k] = "#{v}" }
+      testing_env.each { |k, v| ENV[k] = v.to_s }
       @dangerfile = testing_dangerfile
 
-      @sam = Gitlab::User.new(1, 'Sam')
-      @tom = Gitlab::User.new(2, 'Tom')
-      @nic = Gitlab::User.new(3, 'Nic')
-      @luke = Gitlab::User.new(4, 'Luke')
-      @lei = Gitlab::User.new(5, 'Lei')
-
+      @sam = Gitlab::User.new(1, "Sam")
+      @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 = @lei
@@ -19,7 +20,7 @@ module Danger
       allow(@mock_client).to receive(:fetch_author_for_mr).and_return(@author)
       allow(@mock_client).to receive(:fetch_users_for_group).with("tech/ios").and_return(@members)
 
-      @strategy = AssignStrategies::RandomStrategy.new(client: @mock_client, project: 10, mr: 110)
+      @strategy = AssignStrategies::RandomStrategy.new(client: @mock_client, project: 10, mr_iid: 110)
       @strategy.group_name = "tech/ios"
     end
 
@@ -56,7 +57,5 @@ module Danger
 
       @strategy.assign!(2)
     end
-
   end
 end
-

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require "pathname"
-ROOT = Pathname.new(File.expand_path("../../", __FILE__))
+ROOT = Pathname.new(File.expand_path("..", __dir__))
 $:.unshift((ROOT + "lib").to_s)
 $:.unshift((ROOT + "spec").to_s)
 
@@ -8,8 +10,9 @@ require "pry"
 
 require "rspec"
 require "danger"
+require File.expand_path("../lib/gitlab_reviewbot/gitlab", __dir__)
 
-if `git remote -v` == ''
+if `git remote -v` == ""
   puts "You cannot run tests without setting a local git remote on this repo"
   puts "It's a weird side-effect of Danger's internals."
   exit(0)
@@ -50,12 +53,12 @@ end
 # running a PR on TravisCI
 def testing_env
   {
-    'CI_MERGE_REQUEST_IID' => '549',
-    'CI_MERGE_REQUEST_PROJECT_PATH' => '...',
-    'CI_MERGE_REQUEST_PROJECT_URL' => '...',
-    'DANGER_GITLAB_HOST' => 'github.com', # This needs to be the same as where the repo is stored due to Danger internals :facepalm:
-    'CI_API_V4_URL' => "https://gitlab.com/api/v4",
-    'CI_PROJECT_ID' => '346',
+    "CI_MERGE_REQUEST_IID" => "549",
+    "CI_MERGE_REQUEST_PROJECT_PATH" => "...",
+    "CI_MERGE_REQUEST_PROJECT_URL" => "...",
+    "DANGER_GITLAB_HOST" => "git.curve.tools", # This needs to be the same as where the repo is stored due to Danger internals :facepalm:
+    "CI_API_V4_URL" => "https://git.curve.tools/api/v4",
+    "CI_PROJECT_ID" => "346",
     "GITLAB_CI" => true,
     "DANGER_GITLAB_API_TOKEN" => "token-token-token"
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-gitlab_reviewbot
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.8
 platform: ruby
 authors:
 - Fabio Gallonetto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -200,6 +200,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -217,11 +218,12 @@ 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
 - spec/spec_helper.rb
-homepage: https://github.com/curve-technology/danger-gitlab_reviewbot
+homepage: https://git.curve.tools/fabio.gallonetto/danger-gitlab_reviewbot
 licenses:
 - MIT
 metadata: {}
@@ -245,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