danger-gitlab_reviewbot 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d9331afe98308a84876492708add4449315fe4a1f90145c9b23e70e8547fb7
-  data.tar.gz: 9abbf57104a68241af9bfc41475ddd32872ee7210a5f87096716b8ad1952611c
+  metadata.gz: 59b8a17d363eab75e1676896ea925e3e64691b910d1b19db8b65325d0acbdedc
+  data.tar.gz: 49458b9d7dc3ddb3948280301a6d79bc1d146d5bdf6c26f81242a765649d132b
 SHA512:
-  metadata.gz: 474afe53630d3bd6c7c09b718d120ee0a966ac5fae93c80520e8ab1b4cff2376bb866ccbfce8b1c198afb923296755f222751e4e76f4b77a44f7fa81a130bae3
-  data.tar.gz: 537f846fa8177706d9dfa989c50dc36dba52730530bc617d0c1b3e24f4fa9075956082033ec4b4f9187bcfa507ef1a966bb2bcf3382ec018fe224237e9f2e0e7
+  metadata.gz: e1d53b11855e07c588d35fd904a7f25ad9c27038dd5eede51bacfdfd8f8489fe85d35fbc9df2b0ef7243d4696123503cc8842e97ddea7bc3e679ffe5dbaf981f
+  data.tar.gz: 3c5bd67cd8c0f61951d3a2aefa36721849ff1ef544e929508de6291abce66970e64863cc8a6db2c14794c4818966d5e9b902c96145dcf2368e0508afa1842dd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-gitlab_reviewbot (1.1.0)
+    danger-gitlab_reviewbot (1.1.1)
       danger-gitlab
       danger-plugin-api (~> 1.0)
 
@@ -11,6 +11,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
+    awesome_print (1.8.0)
     claide (1.0.3)
     claide-plugins (0.9.2)
       cork
@@ -67,7 +68,6 @@ GEM
     httparty (0.18.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    jaro_winkler (1.5.4)
     kramdown (2.2.1)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -76,7 +76,7 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
     lumberjack (1.2.4)
-    method_source (1.0.0)
+    method_source (0.9.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
@@ -95,9 +95,11 @@ GEM
     parallel (1.19.1)
     parser (2.7.1.2)
       ast (~> 2.4.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
     public_suffix (4.0.5)
     rainbow (3.0.0)
     rake (13.0.1)
@@ -112,15 +114,14 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.1)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
@@ -142,12 +143,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   bundler (~> 2.1)
   danger-gitlab_reviewbot!
-  guard (~> 2.14)
-  guard-rspec (~> 4.7)
+  guard
+  guard-rspec
   listen (= 3.0.7)
   pry
+  pry-nav
   rake
   rspec
   rubocop

data/danger-gitlab_reviewbot.gemspec

@@ -33,8 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
 
   # Makes testing easy via `bundle exec guard`
-  spec.add_development_dependency 'guard', '~> 2.14'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
 
   # If you want to work on older builds of ruby
   spec.add_development_dependency 'listen', '3.0.7'
@@ -47,4 +47,7 @@ Gem::Specification.new do |spec|
   #
   # This will stop test execution and let you inspect the results
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-nav'
+  spec.add_development_dependency 'awesome_print'
+
 end

data/lib/gitlab_reviewbot/gem_version.rb

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

data/lib/gitlab_reviewbot/plugin.rb

@@ -44,17 +44,36 @@ module Danger
     # * Danger::AssignStrategies::LeastBusyStrategy - assign the N users with the least amount of open MRs
     #   to review
     #
-    attr_writer :strategy
     def strategy
-      @strategy || Danger::AssignStrategies::RandomStrategy
+      @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']
+    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>]
     #
     def assign!
-      project_id = ENV['CI_PROJECT_ID']
-      mr_iid = ENV['CI_MERGE_REQUEST_IID']
       if mr_iid.nil?
         raise "Env variable CI_MERGE_REQUEST_IID doesn't point to a valid merge request iid"
       end
@@ -73,17 +92,20 @@ module Danger
  #    puts "Required: #{required_assignees_count}" if @verbose
 
       # if required_assignees_count == 0
-      #   puts "Nothing to do" if @verbose
+      #   puts "Nothing to do" if verbose
       #   return
       # end
 
-      strategy_class = strategy.new(client: gitlab.api, project: project_id, mr: mr_iid, group: gitlab_group)
+      @strategy.group_name = gitlab_group
 
-      assignees = strategy_class.assign! assignees_amount
+      assignees = @strategy.assign! assignees_amount
 
       puts "Assigning: #{assignees}" if verbose
       return assignees
     end
+
+    private
+
   end
 end
 

data/lib/gitlab_reviewbot/strategies/least_busy.rb

@@ -8,7 +8,7 @@ module Danger
         author = fetch_author()
         invalid_assignees = [ fetch_author() ] + fetch_assigned_reviewers()
 
-        users_with_reviews_pending = client.users_with_pending_mr_review(project_id)
+        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 }
 
         (users_with_reviews_pending + users_without_reviews_pending).filter { |u| u.id != author.id }

data/lib/gitlab_reviewbot/strategies/strategy.rb

@@ -7,11 +7,10 @@ module Danger
       attr_accessor :client
       attr_accessor :excluded_users
 
-      def initialize(client:, project:, mr:, group:)
+      def initialize(client:, project:, mr:)
         @client = client
         @project_id = project
         @mr_iid = mr
-        @group_name = group
         @excluded_users = []
       end
 
@@ -39,9 +38,10 @@ module Danger
       end
 
       def fetch_users_in_group
-        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 }
+        excluded = @excluded_users.map { |u| client.find_user_with_username(u) }
+        client.fetch_users_for_group(@group_name).filter { |u| ! excluded.include? u }
       end
+
     end
   end
 end

data/spec/gitlab_reviewbot_spec.rb

@@ -15,20 +15,21 @@ module Danger
 
         @dangerfile = testing_dangerfile
         @plugin = @dangerfile.gitlab_reviewbot
-        @plugin.strategy = Danger::AssignStrategies::RandomStrategy
         @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')
+        @plugin.strategy = Danger::AssignStrategies::RandomStrategy
+        @plugin.gitlab_group = 'tech/ios'
+
       end
 
       it "Assign one reviewer" do
-        @plugin.gitlab_group = 'tech/ios'
 
         expect(@strategy_mock).to receive(:assign!).with(1).and_return(['Sam'])
 
         @plugin.assign!
       end
       it "Assign one reviewer" do
-        @plugin.gitlab_group = 'tech/ios'
 
         expect(@strategy_mock).to receive(:assign!).with(1).and_return(['Sam'])
 
@@ -36,7 +37,6 @@ module Danger
       end
 
       it "Assign multiple reviewers" do
-        @plugin.gitlab_group = 'tech/ios'
         @plugin.assignees_amount = 2
 
         expect(@strategy_mock).to receive(:assign!).with(2).and_return(['Sam, Nic'])
@@ -44,6 +44,15 @@ module Danger
         @plugin.assign!
       end
 
+      it "Assigns strategy options" do
+        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'
+
+      end
+
       ['CI_PROJECT_ID', 'CI_MERGE_REQUEST_IID'].each do |var|
         it "Fails when required #{var} variables are not available" do
           ENV[var] = nil

data/spec/least_busy_strategy_spec.rb

@@ -16,9 +16,11 @@ module Danger
       @nic.review_count = 0
       @members = [@author, @tom, @sam, @luke]
       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)
+      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.group_name = "tech/ios"
 
-      @strategy = AssignStrategies::LeastBusyStrategy.new(client: @mock_client, project: 10, mr: 110, group: 2200)
     end
 
     it "Assign the one least busy" do
@@ -89,6 +91,27 @@ module Danger
 
       @strategy.assign!(1)
     end
+
+    it "honours excluded users" do
+      allow(@mock_client).to receive(:fetch_mr_reviewers).with(10, 110).and_return([])
+      @tom.review_count = 1
+      @sam.review_count = 4
+      @luke.review_count = 3
+      users_with_pending_mr_review = [@author, @sam, @tom, @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']
+
+      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(@luke)
+      end
+
+      @strategy.assign!(1)
+    end
+
   end
 end
 

data/spec/random_strategy_spec.rb

@@ -17,9 +17,10 @@ module Danger
       @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)
+      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, group: 2200)
+      @strategy = AssignStrategies::RandomStrategy.new(client: @mock_client, project: 10, mr: 110)
+      @strategy.group_name = "tech/ios"
     end
 
     it "assign the right amount of reviewers" do
@@ -56,24 +57,6 @@ 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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Fabio Gallonetto
@@ -112,30 +112,30 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'A review raffle bot for Gitlab '
 email:
 - fabio.gallonetto@curve.com