gitlab-triage 1.29.0 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f594160679b71928b75f5bec0131c846d79b10cdc0cebb33388d1bc907b9769
-  data.tar.gz: 04a02e449720f03ab2820c3be0693c17486e366a7bcfe87a1c1f6e02ee6a02da
+  metadata.gz: e51bca620fb9d9638c96605f214f4420f1bd6d2ec2b3142e8d4ee1df35d324bf
+  data.tar.gz: 853652c543b2432f9d0bb5ef82515c312d536d6b550a9f2c234958335b0d9437
 SHA512:
-  metadata.gz: 44cc6360a513c7ad126ee8dbc4e5151fafbb8b4994e5e0ea84a2fdb5a32ec997271bd66ee3b065cbbbfb3e92548a38d599c025a6f32f378339522f836001cadf
-  data.tar.gz: 1177f4e8471c3fbe6606e5e0eeaee384335b327774a94574e9942d1928b7dec03c50b8c90df082091b7873f6f871c70a8b162732fa3740a222c861c1751f3f7a
+  metadata.gz: e0e71a5626258593de96cce07e1554fb5661c5a32e8931875212b32693a43b5fca5bb7a8020bf2192fd3d83e2278a9c5fbc553953b19f6456702d52354dd1d1b
+  data.tar.gz: b4db55f50baacac103a35a4eb5803ca409b7d639292a273dae79931f3c36c6a5ec08a689bcfb0c063af15d28bb1ee4eb20c82c8696be51997328420a0aac714b

data/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
   - deploy
 
 default:
-  image: ruby:2.7
+  image: ruby:3.0
   tags:
     - gitlab-org
   cache:
@@ -106,13 +106,6 @@ specs:
   script:
     - bundle exec rake spec
 
-specs ruby3.0:
-  image: ruby:3.0
-  needs: ["setup-test-env"]
-  stage: test
-  script:
-    - bundle exec rake spec
-
 ##################
 ## Triage stage ##
 ##################

data/.rubocop.yml

@@ -5,7 +5,8 @@ inherit_gem:
     - rubocop-default.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  NewCops: enable
+  TargetRubyVersion: 3.0
   Exclude:
     - 'vendor/**/*'
     - 'tmp/**/*'
@@ -14,7 +15,7 @@ AllCops:
 Rails/Output:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 152
 
 Style/SingleArgumentDig:

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.0.5

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.4
+ruby 3.0.5

data/Gemfile

@@ -12,4 +12,5 @@ end
 group :development, :test, :danger do
   gem 'gitlab-dangerfiles', '~> 2.11.0', require: false
   gem 'guard-rspec', '~> 4.7.3', require: false
+  gem 'lefthook', '~> 1.3', require: false
 end

data/README.md

@@ -129,8 +129,8 @@ resource_rules:
           date:
             attribute: committed_date
             condition: older_than
-            interval_type: 6
-            interval: months
+            interval_type: months
+            interval: 6
           name: ^feature
         actions:
           delete: true

data/lefthook.yml

@@ -0,0 +1,14 @@
+# Lefthook configuration. For more information, see:
+# https://github.com/Arkweid/lefthook/blob/master/docs/full_guide.md
+
+pre-push:
+  parallel: true
+  commands:
+    rubocop:
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
+      glob: '*.{rb,rake}'
+      run: bundle exec rubocop {files}
+    rspec:
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
+      glob: '*.{rb,rake}'
+      run: bundle exec rspec {files}

data/lib/gitlab/triage/rest_api_network.rb

@@ -34,7 +34,7 @@ module Gitlab
 
           response = execute_with_retry(
             exception_types: [Net::ReadTimeout, Errors::Network::InternalServerError],
-            backoff_exceptions: Errors::Network::TooManyRequests) do
+            backoff_exceptions: Errors::Network::TooManyRequests, debug: options.debug) do
             puts Gitlab::Triage::UI.debug "query_api: #{url}" if options.debug
 
             @adapter.get(token, url)
@@ -63,7 +63,7 @@ module Gitlab
       def post_api(url, body)
         response = execute_with_retry(
           exception_types: Net::ReadTimeout,
-          backoff_exceptions: Errors::Network::TooManyRequests) do
+          backoff_exceptions: Errors::Network::TooManyRequests, debug: options.debug) do
           puts Gitlab::Triage::UI.debug "post_api: #{url}" if options.debug
 
           @adapter.post(token, url, body)
@@ -87,7 +87,7 @@ module Gitlab
       def delete_api(url)
         response = execute_with_retry(
           exception_types: Net::ReadTimeout,
-          backoff_exceptions: Errors::Network::TooManyRequests) do
+          backoff_exceptions: Errors::Network::TooManyRequests, debug: options.debug) do
           puts Gitlab::Triage::UI.debug "delete_api: #{url}" if options.debug
 
           @adapter.delete(token, url)

data/lib/gitlab/triage/retryable.rb

@@ -2,23 +2,38 @@ module Gitlab
   module Triage
     module Retryable
       MAX_RETRIES = 3
+      RETRY_WAIT_SECONDS = 10
       BACK_OFF_SECONDS = 10
 
       attr_accessor :tries
 
-      def execute_with_retry(exception_types: [StandardError], backoff_exceptions: [])
+      def execute_with_retry(exception_types: [StandardError], backoff_exceptions: [], debug: false)
         @tries = 0
 
         until maximum_retries_reached?
           begin
             @tries += 1
             return yield
-          rescue *exception_types
-            raise if maximum_retries_reached?
-          rescue *backoff_exceptions
-            raise if maximum_retries_reached?
+          rescue *exception_types => e
+            base_message = "exception - %s, waiting #{RETRY_WAIT_SECONDS} secs)"
 
-            sleep(BACK_OFF_SECONDS)
+            if maximum_retries_reached?
+              puts_execute_with_retry_message(e, format(base_message, "gave up, tried #{MAX_RETRIES} times")) if debug
+              raise
+            else
+              puts_execute_with_retry_message(e, format(base_message, "retrying #{@tries}/#{MAX_RETRIES} times")) if debug
+              sleep(RETRY_WAIT_SECONDS)
+            end
+          rescue *backoff_exceptions => e
+            base_message = "backoff - %s, waiting #{BACK_OFF_SECONDS} secs)"
+
+            if maximum_retries_reached?
+              puts_execute_with_retry_message(e, format(base_message, "gave up, tried #{MAX_RETRIES} times")) if debug
+              raise
+            else
+              puts_execute_with_retry_message(e, format(base_message, "retrying #{@tries}/#{MAX_RETRIES} times")) if debug
+              sleep(BACK_OFF_SECONDS)
+            end
           end
         end
       end
@@ -28,6 +43,10 @@ module Gitlab
       def maximum_retries_reached?
         tries == MAX_RETRIES
       end
+
+      def puts_execute_with_retry_message(exception, message)
+        puts Gitlab::Triage::UI.debug "execute_with_retry: #{exception} (#{message}"
+      end
     end
   end
 end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.29.0'
+    VERSION = '1.30.0'
   end
 end

data/support/.gitlab-ci.example.yml

@@ -1,4 +1,4 @@
-image: ruby:2.7
+image: ruby:3.0
 
 stages:
   - triage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,6 +166,7 @@ files:
 - Rakefile
 - bin/gitlab-triage
 - gitlab-triage.gemspec
+- lefthook.yml
 - lib/gitlab/triage.rb
 - lib/gitlab/triage/action.rb
 - lib/gitlab/triage/action/base.rb