gitlab_add_approval_rules_bot 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b42dbf8571c0128deea792d806b1e4ac7597bc17a9006c2753f3f155dc6bce
-  data.tar.gz: 4908d7b507ee44a9da81380f0e0d3dde80fd43884a192249f431283453b8d5e5
+  metadata.gz: 228402c58abefdb8bcb340abc611ee8694feee4f2afec50b4d39d3bf84d818bc
+  data.tar.gz: 4e63f2f8d173e120291f3dbc53357c15c0c4d851b93e272d0c0baadc7e86994a
 SHA512:
-  metadata.gz: 1285063a7244435f6c1510f83563e7e1f9bcfb71d3fbbf2320befaebc21f327b0b71803e37cf57d5c4388e516cc76dfd92312c75f5340c662a45caa0088f74eb
-  data.tar.gz: 17e0dccaec4a29fa61b600578e7cd345e02972f39bc98ea5886fc8c302a220607393d78dff86523be369b501b45f7454248ff01d6e4c2ed9cf56d7826b3ccc11
+  metadata.gz: 8fdd3b504e904ca29300fff887d3af1556c34367d2abb91fa3232dcfad6989fd669c710ab5d962a0f72604f8e233c80301f2d1eabe2f9decfeaa6294233fd75f
+  data.tar.gz: 804600dea4082bef182d0664735473afa3f58d51db6b446163f191e3f7a1c95532970c73200367ba2785db2add7aee7a0eaeb7639b8a0d5a81c110218de0e330

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    gitlab_add_approval_rules_bot (0.1.4)
+      dotenv
+      gitlab
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    dotenv (2.7.6)
+    gitlab (4.18.0)
+      httparty (~> 0.18)
+      terminal-table (>= 1.5.1)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    multi_xml (0.6.0)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  gitlab_add_approval_rules_bot!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.3.7

data/config.yml.sample

@@ -0,0 +1,19 @@
+global:
+  stop_when_error: true
+rules:
+- name: rule1
+  approvals_required: 1
+  user_ids:
+  - 1
+  group_ids:
+  - 1
+- name: rule2
+  approvals_required: 1
+  usernames:
+  - user2
+  groupnames:
+  - group2
+  user_ids:
+  - 2
+  group_ids:
+  - 2

data/docker/Dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:3.1.2-alpine3.16
+
+RUN gem install gitlab_add_approval_rules_bot
+
+CMD ["gitlab_add_approval_rules_bot"]

data/lib/gitlab_add_approval_rules_bot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabAddApprovalRulesBot
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 end

data/lib/gitlab_add_approval_rules_bot.rb

@@ -8,7 +8,7 @@ require "dotenv"
 Dotenv.load
 
 Gitlab.configure do |config|
-  config.endpoint       = ENV['GITLAB_ENDPOINT']
+  config.endpoint       = ENV['GITLAB_ENDPOINT'] || ENV['CI_API_V4_URL']
   config.private_token  = ENV['GITLAB_TOKEN']
 end
 
@@ -21,55 +21,66 @@ module GitlabAddApprovalRulesBot
 
     desc "apply", "apply"
     option :dry_run, aliases: "-d", type: :boolean, desc: "dry run mode", default: false
-    def apply(config_filename=nil)
+    option :config, aliases: "-c", type: :string, desc: "config file name", default: "config.yml"
+    def apply(*rulenames)
       config_filename = "config.yml" if config_filename.nil?
       config = YAML.load_file(config_filename)
-      project_id = ENV['PROJECT_ID'] or ENV['CI_PROJECT_ID']
-      merge_request_iid = ENV['MERGE_REQUEST_IID'] or ENV['CI_MERGE_REQUEST_IID']
+      project_id = ENV['PROJECT_ID'] || ENV['CI_PROJECT_ID']
+      merge_request_iid = ENV['MERGE_REQUEST_IID'] || ENV['CI_MERGE_REQUEST_IID']
 
-      config['rules'].each do |rule|
+      rulenames.each do |rulename|
+        if not config['rules'].key? rulename
+          puts "SKIP: rulename #{rulename} in not exists."
+          next
+        end
+        rule = config['rules'][rulename]
         rule_options = {
           name: rule['name'],
           approvals_required: rule['approvals_required'],
           user_ids: [],
           group_ids: [],
         }
-        if rule.has_key? 'approval_project_rule_id'
-          rule_options[:approval_project_rule_id] = rule['approval_project_rule_id']
-        end
-        if rule.has_key? 'user_ids'
-          rule_options[:user_ids] = rule['user_ids']
-        end
-        if rule.has_key? 'group_ids'
-          rule_options[:group_ids] = rule['group_ids']
-        end
-        if rule.has_key? 'usernames'
-          rule['usernames'].each do |username|
-            user = Gitlab.user_search(username)&.first
-            pp user
-            if not user.nil? and user['username'] == username
-              rule_options[:user_ids] << user['id'] unless user.nil?
-            end
+
+        rule_options[:approval_project_rule_id] = rule['approval_project_rule_id'] || nil
+        rule_options[:user_ids] = rule['user_ids'] || []
+        rule_options[:group_ids] = rule['group_ids'] || []
+
+        (rule['usernames'] || []).each do |username|
+          user = Gitlab.user_search(username)&.first
+          pp user
+          if not user.nil? and user['username'] == username.to_s
+            rule_options[:user_ids] << user['id']
           end
         end
-        if rule.has_key? 'groupnames'
-          rule['groupnames'].each do |groupname|
-            group = Gitlab.group_search(groupname)&.first
-            pp group
-            if not group.nil? and group['groupname'] == groupname
-              rule_options[:group_ids] << group['id'] unless group.nil?
-            end
 
+        (rule['groupnames'] || []).each do |groupname|
+          group = Gitlab.group_search(groupname)&.first
+          pp group
+          if not group.nil? and group['groupname'] == groupname.to_s
+            rule_options[:group_ids] << group['id']
           end
         end
+
         puts "project_id: #{project_id}"
         puts "merge_request_iid: #{merge_request_iid}"
         puts "options: #{rule_options}"
         if options[:dry_run]
           puts "THIS IS DRY RUN MODE!!"
-        else
-          Gitlab.create_merge_request_level_rule(project_id, merge_request_iid, rule_options)
+          next
+        end
+
+        if project_id.nil?
+          puts "project_id is nil"
+          puts "exit"
+          next
         end
+        if merge_request_iid.nil?
+          puts "merge_request_iid is nil"
+          puts "exit"
+          next
+        end
+
+        Gitlab.create_merge_request_level_rule(project_id, merge_request_iid, rule_options)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_add_approval_rules_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Shoma FUKUDA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -62,9 +62,12 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- config.yml.sample
+- docker/Dockerfile
 - exe/gitlab_add_approval_rules_bot
 - gitlab_add_approval_rules_bot.gemspec
 - lib/gitlab_add_approval_rules_bot.rb