peoplegroup-connectors 0.1.10 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c78c67d1667a5441fdc3c59cd7aceaead99cc3c23e6f646a2a29a837ceef8c69
-  data.tar.gz: 666e6fec2e69ea4ed830a9247a61fa5fe9f43d9ae363aff5223c8a07554f5262
+  metadata.gz: f8847d05d5e51183ec2a4d92c80e87c33da93d78784550f28408187a4190253b
+  data.tar.gz: 2cb11bd6247f69133e5965025460e4b969ed9dd3f82125f10b2e4ab851e5b7fd
 SHA512:
-  metadata.gz: 6493e56abb36adacbab060fcf91f41db56bd69e8280d028e7086bc73ceae8a144ef8f7c84850640ffcc70a5577323387365a936099c93c3611875171a0dd6d12
-  data.tar.gz: c3bda22d3e0612c3c059c80cee5aea1f866b4dfbae0b0fa391b320d87063b4f8ec1bc65f86dcae192a71bd9c68a0dcc0facc6536106ad3553fb9d279d5f3e3de
+  metadata.gz: 004abace3f43d42ae71370a648db2c025a30c41d8ddf4f55a76d59950b6609c23769f00d6f39e7ef29009d9530209253a855cb76c0cd9fd64ee1d60ed34f75c1
+  data.tar.gz: 7685f31b08d82817c0eb66e8494bd12401add246a2f4a2d3a5e3705a3f17a695e83ea8f75688509fd92b64d7b3737514fa6d9265d74e95c9113e686fce06136b

data/lib/peoplegroup/connectors/bamboo.rb

@@ -37,6 +37,7 @@ module PeopleGroup
       def search_employee_by_field(field:, value:)
         employees.find { |employee| employee[field] == value.to_s }
       end
+      alias_method :search_team_member_by_field, :search_employee_by_field
 
       def fetch_manager(team_member)
         active_team_members.find { |tm| tm['id'] == team_member['supervisorEId'] }
@@ -71,7 +72,7 @@ module PeopleGroup
 
         begin
           @employees ||= @client.report.custom(fields, 'JSON').reject { |employee| employee['lastName'] == 'Test-Gitlab' }
-        rescue Net::ReadTimeout
+        rescue Net::ReadTimeout, Bamboozled::GatewayError
           retry if (retries += 1) < MAX_RETRIES
         end
       end
@@ -81,6 +82,14 @@ module PeopleGroup
       end
       alias_method :active_team_members, :active_employees
 
+      def active_and_current_employees
+        today = Date.current
+        employees.select do |employee|
+          employee['status'] == 'Active' && Date.parse(employee['hireDate']) <= today
+        end
+      end
+      alias_method :active_and_current_team_members, :active_and_current_employees
+
       def add_stock_options(employee_id, data)
         @client.employee.add_table_row(employee_id, 'customEquity', data)
       end

data/lib/peoplegroup/connectors/gitlab.rb

@@ -45,7 +45,25 @@ module PeopleGroup
         epic || @client.create_epic(group_id, title, options)
       end
 
-      def commit_change_to_new_merge_request_v2(project_id, branch_name, commit_message, description = '', files_to_delete = [], files_to_update = [])
+      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil)
+        @client.create_branch(project_id, branch_name, 'master')
+        actions = []
+        new_files.each do |file|
+          actions << {
+            action: 'create',
+            file_path: file.sub('tmp', '/data/team_members/person'),
+            content: File.read(file)
+          }
+        end
+
+        @client.create_commit(project_id, branch_name, commit_message, actions)
+
+        options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
+        options[:description] = description if description
+        @client.create_merge_request(project_id, commit_message, options)
+      end
+
+      def commit_change_to_new_merge_request_v2(project_id, branch_name, commit_message, description = nil, files_to_delete = [], files_to_update = [])
         actions = []
 
         files_to_delete.each do |file|
@@ -60,7 +78,7 @@ module PeopleGroup
           action = {
             action: 'update',
             file_path: file[:file_path],
-            content: file[:file_with_change]
+            content: File.read(file[:tmp_file_path])
           }
           actions << action
         end
@@ -71,7 +89,7 @@ module PeopleGroup
         @client.create_commit(project_id, branch_name, commit_message, actions)
 
         options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
-        options[:description] = description if description.present?
+        options[:description] = description if description
         @client.create_merge_request(project_id, commit_message, options)
       end
 

data/lib/peoplegroup/connectors/slack.rb

@@ -18,6 +18,12 @@ module PeopleGroup
         nil
       end
 
+      def find_user_by_id(id)
+        @client.users_info(user: id)
+      rescue ::Slack::Web::Api::Errors::SlackError
+        nil
+      end
+
       def list_public_channels
         channels = @client.channels_list(exclude_archived: true).channels
         channels.reject(&:is_private)&.map(:name)

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.10'
+    VERSION = '0.1.16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.16
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab