gitlab_add_approval_rules_bot 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81962cc2d72ae66fb21336cf41280e885d3d9cf67b4d1d9fdb387a67b7e460f2
-  data.tar.gz: '09b3915ebf67302fa75af58446d56b8db10b4d3273713c18be62aee5becd329c'
+  metadata.gz: '099c7fac267195d3b330fc788f6a871590358040df7c88eb1ac6d38144f80483'
+  data.tar.gz: 4a12597e1f0a64fcc78a66bad325bf732406fc56ee6d16143b875c2f34dea821
 SHA512:
-  metadata.gz: 6eb8d9058fba110b90f28bac0b21c64ddf38611d0a14029ce5cd71f17952f2c9b19e8e419ab02592d25fdf73eb8c925927f848a974bd5e88740a65935309b6b1
-  data.tar.gz: ac1c16d0f8fd78f96973697e66bcf59cfebb796d9bd0a3dafe2a212a64a140201ae0ae554678c1e6f1eed44e1a5b5640f6821a693bab8b69edc5f8381d2ecc42
+  metadata.gz: 7b15f877f00ac4c92f5daa055067308d6294d62b6ccca0a80e3b456a9cd15687820c1fc654a77aa68872e8ea27ce37ccbae860fe111f0c95efc59144b7b1e809
+  data.tar.gz: 2d34d9bb07fa2d07511e034374c9b43a49ba06230acb0bc4c9d5ca0d969c7d4cd5f3ce739a0788ed93a5af780a575ba952b1d0ecaf74fcb76f5934eb674dc8d3

data/lib/gitlab_add_approval_rules_bot/version.rb

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

data/lib/gitlab_add_approval_rules_bot.rb

@@ -20,49 +20,65 @@ module GitlabAddApprovalRulesBot
     default_task :help
 
     desc "apply", "apply"
-    def apply(config_filename=nil, dry_run=true)
+    option :dry_run, aliases: "-d", type: :boolean, desc: "dry run mode", default: false
+    def apply(config_filename=nil)
       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']
 
       config['rules'].each do |rule|
-        options = {
+        rule_options = {
           name: rule['name'],
           approvals_required: rule['approvals_required'],
           user_ids: [],
           group_ids: [],
         }
         if rule.has_key? 'approval_project_rule_id'
-          options[:approval_project_rule_id] = rule['approval_project_rule_id']
+          rule_options[:approval_project_rule_id] = rule['approval_project_rule_id']
         end
         if rule.has_key? 'user_ids'
-          options[:user_ids] = rule['user_ids']
+          rule_options[:user_ids] = rule['user_ids']
         end
         if rule.has_key? 'group_ids'
-          options[:group_ids] = rule['group_ids']
+          rule_options[:group_ids] = rule['group_ids']
         end
         if rule.has_key? 'usernames'
           rule['usernames'].each do |username|
-            user = Gitlab.users(options: {username: username})&.first
+            user = Gitlab.user_search(username)&.first
             pp user
-            options[:user_ids] << user['id'] unless user.nil?
+            if not user.nil? and user['username'] == username
+              rule_options[:user_ids] << user['id'] unless user.nil?
+            end
           end
         end
         if rule.has_key? 'groupnames'
           rule['groupnames'].each do |groupname|
-            group = Gitlab.groups(options: {groupname: groupname})&.first
+            group = Gitlab.group_search(groupname)&.first
             pp group
-            options[:group_ids] << group['id'] unless group.nil?
+            if not group.nil? and group['groupname'] == groupname
+              rule_options[:group_ids] << group['id'] unless group.nil?
+            end
+
           end
         end
         puts "project_id: #{project_id}"
         puts "merge_request_iid: #{merge_request_iid}"
-        puts "options: #{options}"
-        if dry_run
+        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, options)
+          if project_id.nil?
+            puts "project_id is nil"
+            puts "exit"
+            return
+          end
+          if merge_request_iid.nil?
+            puts "merge_request_iid is nil"
+            puts "exit"
+            return
+          end
+          Gitlab.create_merge_request_level_rule(project_id, merge_request_iid, rule_options)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_add_approval_rules_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Shoma FUKUDA