danger-gitlab_reviewbot 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b07048b00ab79e2a4fe6497f1559c00925da2b216240b5180eb5f9e9ac92189
-  data.tar.gz: c0a83a3f273f8b98796a41039f4502307ae9fdd698630745233f7e08a459124a
+  metadata.gz: fee50f9f05417c2fe5bb1fde3870fd12091a3f26bf7a1617f9fdf8ebcbe4f8e2
+  data.tar.gz: 18fbd83e0a3aab6c8899ae84a973b8d72b594ad8df1b0c221f07c9e52cc5e9fd
 SHA512:
-  metadata.gz: 1576186ee3d22820f48734093708df1f10ef1b2fcd28899ee82f7f648cc08142aedff7acad11c893847d69098ac014d7367c91aaee6b84e801a96647cc89acea
-  data.tar.gz: 9222d55514970d4dc4d5595d8523f1a8c076ebddb273d2e969f37b254d040bee2ca0350669a9a52272be20d8210d43633794f00f51b7a5c5eaac2af718d36c7c
+  metadata.gz: 95090385ec5b87835d91a01991d1381e89a0ce4e25c2bfd88f8ca7d15c20c18880baf90a73f5ca69deab1974beadb34fdff99d3001f3c351f22698d1879a79eb
+  data.tar.gz: d545607ea052af36ca32255c21b495094628c2c7937f4e37383a1b23db2d862091d74f322a0484f7bbb1a8f395104e8908071824ea200aff519e7d1e1f22eab5

data/.gitignore

@@ -2,3 +2,4 @@
 pkg
 .idea/
 .yardoc
+vendor

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "ruby:2.6"
+image: "ruby:2.7.3"
 
 cache:
   paths:
@@ -8,12 +8,17 @@ stages:
   - test
   - deploy
 
+.ruby:
+  before_script:
+    - gem install bundler
+    - bundle config set path 'vendor/bundle'
+    - bundle install
+
 test:
+  extends: .ruby
   stage: test
   script:
-  - gem install bundler
-  - bundle --path vendor/bundle
-  - bundle exec rake spec
+  - bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml
   artifacts:
     paths:
       - rspec.xml
@@ -21,14 +26,10 @@ test:
       junit: rspec.xml
 
 deploy:
+  extends: .ruby
   stage: deploy
-  only:
-    - tags
-  before_script:
-    - 'mkdir ~/.gem && echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials && chmod 0600 ~/.gem/credentials'
+  rules:
+    - if: $CI_COMMIT_TAG
   script:
-    - gem install bundler
-    - bundle --path vendor/bundle
     - bundle exec rake build
-    - gem push pkg/danger-gitlab_reviewbot-${CI_COMMIT_TAG}.gem
-
+    - gem push pkg/danger-gitlab_reviewbot-${CI_COMMIT_TAG/v}.gem

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    danger-gitlab_reviewbot (1.2.0)
+    danger-gitlab_reviewbot (1.2.3)
       danger-gitlab
       danger-plugin-api (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.0)
     awesome_print (1.8.0)
-    claide (1.0.3)
+    base64 (0.2.0)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
@@ -21,36 +22,40 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.0.1)
+    danger (9.4.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
+      faraday (>= 0.9.0, < 3.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.7)
-      kramdown (~> 2.0)
+      git (~> 1.13)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (~> 4.7)
-      terminal-table (~> 1)
+      octokit (>= 6.0, < 8.0)
+      terminal-table (>= 1, < 4)
     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 (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.2.0)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-http-cache (2.5.0)
       faraday (>= 0.8)
+    faraday-net_http (3.0.2)
     ffi (1.12.2)
     formatador (0.2.5)
-    git (1.7.0)
+    git (1.18.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitlab (4.15.0)
-      httparty (~> 0.14, >= 0.14.0)
-      terminal-table (~> 1.5, >= 1.5.1)
+    gitlab (4.19.0)
+      httparty (~> 0.20)
+      terminal-table (>= 1.5.1)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -65,10 +70,10 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    kramdown (2.2.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -77,20 +82,17 @@ GEM
       rb-inotify (>= 0.9.7)
     lumberjack (1.2.4)
     method_source (0.9.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mini_mime (1.1.5)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
     no_proxy_fix (0.1.2)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.18.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (7.2.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     open4 (1.3.4)
     parallel (1.19.1)
     parser (2.7.1.2)
@@ -100,7 +102,7 @@ GEM
       method_source (~> 0.9.0)
     pry-nav (0.3.0)
       pry (>= 0.9.10, < 0.13.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.3)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.4)
@@ -121,6 +123,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
@@ -129,12 +133,13 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
-    sawyer (0.8.2)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     thor (1.0.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)
@@ -153,6 +158,7 @@ DEPENDENCIES
   pry-nav
   rake
   rspec
+  rspec_junit_formatter
   rubocop
   yard
 

data/danger-gitlab_reviewbot.gemspec

@@ -6,11 +6,11 @@ require 'gitlab_reviewbot/gem_version.rb'
 Gem::Specification.new do |spec|
   spec.name          = 'danger-gitlab_reviewbot'
   spec.version       = GitlabReviewbot::VERSION
-  spec.authors       = ['Fabio Gallonetto']
-  spec.email         = ['fabio.gallonetto@curve.com']
+  spec.authors       = ['Curve']
+  spec.email         = ['team-devex@imaginecurve.com']
   spec.description   = %q{A review raffle bot for Gitlab }
   spec.summary       = %q{A review raffle bot for Gitlab.}
-  spec.homepage      = 'https://git.curve.tools/fabio.gallonetto/danger-gitlab_reviewbot'
+  spec.homepage      = 'https://gitlab.com/imaginecurve/mobile/danger-gitlab_reviewbot'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   # Testing support
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec_junit_formatter'
 
   # Linting code and docs
   spec.add_development_dependency "rubocop"

data/lib/gitlab_reviewbot/gem_version.rb

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

data/lib/gitlab_reviewbot/gitlab.rb

@@ -45,10 +45,10 @@ module Gitlab
       group_id = search_group_with_path(group_name)
       return nil if group_id.nil?
 
-      res = @client.group_members(group_id, :per_page => 100)
+      res = @client.group_members(group_id, :per_page => 100, :show_seat_info => true)
 
       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 && u.is_using_seat }.map { |u| User.new(u.id, u.username) }
     end
 
     def assign_mr_to_users(project_id, mr_iid, users)

data/spec/gitlab_ext_spec.rb

@@ -38,12 +38,13 @@ module Danger
     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})]
+      active_users = [Gitlab::ObjectifiedHash.new({'id' => 1, 'username' => 'Sam', 'state' => 'active', 'access_level' => 30, 'is_using_seat' => true}),
+                      Gitlab::ObjectifiedHash.new({'id' => 2, 'username' => 'Tom', 'state' => 'active', 'access_level' => 50, 'is_using_seat' => true})]
+      inactive_users = [Gitlab::ObjectifiedHash.new({'id' => 3, 'username' => 'OldSam', 'state' => 'inactive', 'access_level' => 30, 'is_using_seat' => true})]
+      non_developer_users = [Gitlab::ObjectifiedHash.new({'id' => 4, 'username' => 'Reporter', 'state' => 'active', 'access_level' => 20, 'is_using_seat' => true})]
+      bot_users = [Gitlab::ObjectifiedHash.new({'id' => 5, 'username' => 'danger_bot', 'state' => 'active', 'access_level' => 30, 'is_using_seat' => false})]
       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, {:per_page=>100}).and_return(active_users + inactive_users + non_developer_users)
+      allow(@mock_client).to receive(:group_members).with(10, {:per_page=>100, :show_seat_info=>true}).and_return(active_users + inactive_users + non_developer_users + bot_users)
       expect(@client_helper.fetch_users_for_group("mygroup")).to be == [@sam, @tom]
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-gitlab_reviewbot
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
-- Fabio Gallonetto
+- Curve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +208,7 @@ dependencies:
         version: '0'
 description: 'A review raffle bot for Gitlab '
 email:
-- fabio.gallonetto@curve.com
+- team-devex@imaginecurve.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -223,7 +237,7 @@ files:
 - spec/least_busy_strategy_spec.rb
 - spec/random_strategy_spec.rb
 - spec/spec_helper.rb
-homepage: https://git.curve.tools/fabio.gallonetto/danger-gitlab_reviewbot
+homepage: https://gitlab.com/imaginecurve/mobile/danger-gitlab_reviewbot
 licenses:
 - MIT
 metadata: {}
@@ -242,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A review raffle bot for Gitlab.