gitlabci-bundle-update-mr 1.1.0 → 1.1.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 328b0a88d5bbc5b521b604ee4d223ebe299b0b3eeb130680c18683ff8150bfc4
-  data.tar.gz: fff81a3041e33440121420c3adbace6229105eddce5ce3514e726313af5a8d1a
+  metadata.gz: 229a9fbae1ea6840f3f383b08cc83a15ff50d28739f06dfd5987564424ae7ab2
+  data.tar.gz: 677df6d813f5b0609e336323496c23c9a789c2fc5dfdcff31cb3095f57057c90
 SHA512:
-  metadata.gz: e1b567cbe53d70bb6677221d500d07a417db35dfbbfc8c2061056926b1e6a2840f203cfab1ed8983c48591d74a28efbe08411bbebb122e27d08f7a2535c18ef0
-  data.tar.gz: 3bba3ccee80b94393b1294a0238b4bf0a21e8463a8b1e42ef99e4a5b4d8ed3574b50a70219efc8114d5dab82ced6abfaf9b9335f23b268f9cbca99e1baa0f5bc
+  metadata.gz: 294bd4ec7d61cbf932e168386463eed2428f846e96e92959a44f4380e9f6640e98d75b8f17c0a8217a4be42401adebb57dd7bb623ceb81e4fd52e6cdb3aba329
+  data.tar.gz: 53be10193139b5fc00e3a4f228362b60ebf3a83c9565737307c442047855fd18faad20085a81a3a314313a64a985af3aafd6799842ccd160ed3f43d673315ce7

data/.gitlab-ci.yml

@@ -30,7 +30,8 @@ continuous_bundle_update:
       - vendor/bundle/
 
   before_script:
-    - bundle install --path vendor/bundle
+    - bundle config --local path 'vendor/bundle'
+    - bundle install --retry=3 --jobs=$(nproc)
     - bundle clean
 
   except:
@@ -62,6 +63,11 @@ test:2.7:
 
   image: ruby:2.7
 
+test:3.0:
+  extends: .test
+
+  image: ruby:3.0
+
 test:trunk:
   extends: .test
 

data/Gemfile.lock

@@ -1,16 +1,16 @@
 GIT
   remote: https://github.com/sue445/onkcop.git
-  revision: 4f7e76b93efff0b7d4d7d9058a487d435479b129
+  revision: d09f75a5eeb1969800cca160f653325771590fae
   branch: develop
   specs:
     onkcop (0.53.0.3)
       rubocop (>= 0.53.0)
-      rubocop-rspec (>= 1.24.0)
+      rubocop-rspec (>= 1.34.0)
 
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (1.1.0)
+    gitlabci-bundle-update-mr (1.1.1.beta1)
       bundler
       compare_linker (>= 1.4.3)
       gitlab (>= 4.14.1)
@@ -27,16 +27,18 @@ GEM
     compare_linker (1.4.4)
       httpclient
       octokit
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.4)
     dotenv (2.7.6)
-    faraday (1.0.1)
+    faraday (1.2.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     git (1.7.0)
       rchardet (~> 1.8)
-    gitlab (4.16.1)
-      httparty (~> 0.14, >= 0.14.0)
+    gitlab (4.17.0)
+      httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab_awesome_release (1.0.2)
       dotenv
@@ -50,14 +52,14 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -67,66 +69,70 @@ GEM
       pry (~> 0.13.0)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rchardet (1.8.0)
-    regexp_parser (1.8.0)
+    regexp_parser (2.0.2)
     restore_bundled_with (1.0.0)
       git
       thor
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     rspec-temp_dir (1.1.0)
       rspec (>= 3.0)
-    rubocop (0.92.0)
+    rubocop (1.7.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.6.0)
+    rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.1)
+      rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
+    rubocop-rspec (2.1.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
     rubocop_auto_corrector (0.4.1)
       rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simplecov (0.19.0)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
     unicode-display_width (1.7.0)
-    webmock (3.9.1)
+    webmock (3.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.25)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
@@ -150,6 +156,3 @@ DEPENDENCIES
   simplecov
   webmock
   yard
-
-BUNDLED WITH
-   2.1.2

data/README.md

@@ -129,7 +129,7 @@ Usage: gitlabci-bundle-update-mr [options]
 ```
 
 ## ProTip
-### Randomly assign 1 person to MergeRequest
+### Randomly assign one person to MergeRequest
 ```yml
 include:
   - remote: "https://gitlab.com/sue445/gitlabci-bundle-update-mr/raw/master/gitlabci-templates/continuous_bundle_update.yml"
@@ -153,6 +153,10 @@ continuous_bundle_update:
     - ASSIGNEES=$(ruby -rtime -e 'a=%w[foo bar baz]; print a[Time.now.to_date.cweek% a.size]')
 ```
 
+It will be assigned weekly in the following order.
+
+`foo` -> `bar` -> `baz` -> `foo` -> `bar` -> `baz` -> ...
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/gitlabci/bundle/update/mr/client.rb

@@ -5,6 +5,7 @@ module Gitlabci
         class Client # rubocop:disable Metrics/ClassLength
           BRANCH_PREFIX = "bundle-update-".freeze
           TITLE_PREFIX  = "bundle update at ".freeze
+          MAX_RETRY_COUNT = 3
 
           # rubocop:disable Metrics/ParameterLists
 
@@ -206,7 +207,23 @@ module Gitlabci
             end
 
             def accept_merge_request(mr_id)
-              @gitlab.accept_merge_request(@project_name, mr_id, merge_when_pipeline_succeeds: true, should_remove_source_branch: true)
+              with_retry do
+                @gitlab.accept_merge_request(@project_name, mr_id, merge_when_pipeline_succeeds: true, should_remove_source_branch: true)
+              end
+            end
+
+            def with_retry
+              retry_count ||= 0
+
+              yield
+            rescue Gitlab::Error::MethodNotAllowed => e
+              retry_count += 1
+
+              if retry_count > MAX_RETRY_COUNT
+                raise e
+              end
+
+              retry
             end
 
             def get_assignee_ids(assignees)

data/lib/gitlabci/bundle/update/mr/version.rb

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "1.1.0".freeze
+        VERSION = "1.1.1.beta1".freeze
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlabci-bundle-update-mr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1.beta1
 platform: ruby
 authors:
 - sue445
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -284,7 +284,7 @@ metadata:
   homepage_uri: https://gitlab.com/sue445/gitlabci-bundle-update-mr
   source_code_uri: https://gitlab.com/sue445/gitlabci-bundle-update-mr
   changelog_uri: https://gitlab.com/sue445/gitlabci-bundle-update-mr/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -295,12 +295,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Create MergeRequest of bundle update in GitLab CI
 test_files: []