peoplegroup-connectors 0.1.61 → 0.1.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e59dce9e0a49509f7d7d224419117938e46a4ac2f734a50338c585c5e767a1e
-  data.tar.gz: f4d2795919f9a057fe39c2ad2fd1791e6af24c35eedd2ee36d1320a35ea44ddd
+  metadata.gz: 324983963ed713d77a2d17cfe9c1d8f0c6d1f3bc6d20e7893adccd2e604899ba
+  data.tar.gz: f4e29ae74cd6c9433273760535935367f0c39e261f5371fe1ddbb8948afc3b63
 SHA512:
-  metadata.gz: 44d2a74d27ce7435b88ad1ebbe8d6c4006b2010ca6baa08db4a6fa490171c67480336c65a2cc6e81d4fb1c73d7babff21c0d553e3239b0960ee44fe034113ac1
-  data.tar.gz: bc28647937a2043f81224906bb62483d6b1735bf02d810cc13175e262af997bf5d0934cb26d0f21e618565678f35e7776bea8de31091c57393f74d3984912934
+  metadata.gz: 45d74ed9e67a22076d99fa72b738f3662405d478844df268e74408a0b16a65c64cce969d409505317ad8a078389065ca59271ae14b37fc220cd52d3f6228d9b7
+  data.tar.gz: 0e48a07eea15697f57dc8169f2d03463aacfb62a2898b6f21c9615f7cba03e8d974371fc6a8e705f0a4098af1a127e9b5f9ef63ec47567060a62c2ffad1a5b38

data/lib/peoplegroup/connectors/bamboo.rb

@@ -187,6 +187,10 @@ module PeopleGroup
         meta_fields.detect { |res| res['name'] == 'Division' }.dig('options').each_with_object([]) { |option, array| array << option['name'] if option['archived'] == 'no' } || []
       end
 
+      def locations
+        meta_fields.detect { |res| res['name'] == 'Location' }.dig('options').each_with_object([]) { |option, array| array << option['name'] if option['archived'] == 'no' } || []
+      end
+
       def fields
         return @fields if @fields
 

data/lib/peoplegroup/connectors/gitlab.rb

@@ -16,7 +16,7 @@ module PeopleGroup
       def find_gitlabber(field, query)
         return if !query || query.empty?
 
-        possible_members = retry_on_error { @client.group_members('gitlab-com', query: query) }
+        possible_members = get_group_members('gitlab-com', query: query)
         if field === :email
           possible_members.first
         else
@@ -27,7 +27,7 @@ module PeopleGroup
       def find_gitlabber_on(field, query, group)
         return if !query || query.empty?
 
-        possible_members = retry_on_error { @client.group_members(group, query: query) }
+        possible_members = get_group_members(group, query: query)
         if field === :email
           possible_members.first
         else
@@ -35,14 +35,29 @@ module PeopleGroup
         end
       end
 
-      def remove_group_member(group, user_id)
-        retry_on_error { @client.remove_group_member(group, user_id) }
+      def create_group(name, path, options = {})
+        retry_on_error { @client.create_group(name, path, options) }
+      end
+
+      def get_subgroups(group_id, options = {})
+        retry_on_error { @client.group_subgroups(group_id, options).auto_paginate }
+      end
+
+      def get_group_members(group_id, options = {})
+        retry_on_error { @client.group_members(group_id, options).auto_paginate }
+      end
+
+      def add_group_member(group_id, user_id, access_level_name)
+        access_level = access_levels[access_level_name]
+        retry_on_error { @client.add_group_member(group_id, user_id, access_level) }
+      end
+
+      def remove_group_member(group_id, user_id)
+        retry_on_error { @client.remove_group_member(group_id, user_id) }
       end
 
       def create_issue(project, title, options = {})
-        retry_on_error do
-          @client.create_issue(project, title, options)
-        end
+        retry_on_error { @client.create_issue(project, title, options) }
       end
 
       def create_issue_note(project, id, text)
@@ -72,8 +87,8 @@ module PeopleGroup
         epic || retry_on_error { @client.create_epic(group_id, title, options) }
       end
 
-      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil)
-        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
+      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil, target_branch: 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
         actions = []
         new_files.each do |file|
           actions << {
@@ -85,7 +100,7 @@ module PeopleGroup
 
         retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
-        options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
+        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
         options[:description] = description if description
         retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
@@ -120,8 +135,8 @@ module PeopleGroup
         retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
 
-      def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil)
-        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
+      def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil, target_branch: 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
         actions = [
           {
             action: 'update',
@@ -131,7 +146,7 @@ module PeopleGroup
         ]
         retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
-        options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
+        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
         options[:description] = description if description
         retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
@@ -177,6 +192,19 @@ module PeopleGroup
       def reopen_epic(epic)
         retry_on_error { @client.edit_epic(epic.group_id, epic.iid, { state_event: 'reopen' }) }
       end
+
+      # Map access level names to values according to https://docs.gitlab.com/ee/api/members.html#valid-access-levels
+      def access_levels
+        @access_levels ||= {
+          no_access: 0,
+          minimal_access: 5,
+          guest: 10,
+          reporter: 20,
+          developer: 30,
+          maintainer: 40,
+          owner: 50
+        }
+      end
     end
   end
 end

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.61'
+    VERSION = '0.1.65'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.61
+  version: 0.1.65
 platform: ruby
 authors:
 - lien van den steen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab