gitlabci-bundle-update-mr 4.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb563308300820b9110ea14d4c57c58335dae73c76d7a25146b60b2376a0f2c
-  data.tar.gz: c1132291986a4cc9d9e971a973677dd8e6ffbf1c20b4c52f3716e54290aa037c
+  metadata.gz: 6e8ccb89165d72c281b87b804f6bee93697628d656dec2ef68d620b64b53766f
+  data.tar.gz: 2a9d8c02c2a9e3e147edcdd34b23b3eb419f5232788f6ed09c44e13ad39d31ee
 SHA512:
-  metadata.gz: 0c0aac8994e7db8368518ef7f943c19db11fae07b5cf080a4858370b5b708b8074324418dd6d4ddad181bbc303f077225cc7561b3bb012c797d0e16e6ace073b
-  data.tar.gz: 963d446f3a577cc8aec16e8e40bbd6589cafece4304091e0e028945be33571db57c9963997b89339130a7dc83fc9a75fb734505f1d452e739cbba134ba1d13e5
+  metadata.gz: e1fd7d9ad0ff855f695251b13a0f30d3c88de32c50b407b4d9e927888d84de2688d4037153bbac27b0a93fbaf1125e15b6e5a278b321a265ca714de74f52777e
+  data.tar.gz: caf95641d0632f15e189abcc6fed050cde5de0aff0e7f09e69cc31daf03c3e52e9c0717d033d7f09d8f4f200f5590a3389754ed18d424da021815e53bea489a8

data/.gitlab-ci.yml

@@ -35,8 +35,6 @@ continuous_bundle_update:
       when: never
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
-    - if: '$IMAGE == "rubylang/ruby:master-nightly-bionic"'
-      allow_failure: true
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
@@ -52,14 +50,21 @@ test:
     - bundle exec ./exe/gitlabci-bundle-update-mr --help
     - bundle exec rubocop -P
 
+  coverage: '/LOC \(([\d.]+)%\) covered/'
+
+  artifacts:
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage/coverage.xml
+
   parallel:
     matrix:
       - IMAGE:
-          - ruby:3.0
           - ruby:3.1
           - ruby:3.2
           - ruby:3.3
-          - rubylang/ruby:master-nightly-bionic
+          - ruby:3.4
 
 pages:
   extends: .default

data/.rubocop.yml

@@ -9,7 +9,7 @@ inherit_gem:
     # - "config/rspec.yml"
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   NewCops: enable
   SuggestExtensions: false
 

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v4.0.0...master)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v5.0.1...master)
+
+## v5.0.1
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v5.0.0...v5.0.1)
+
+* Fix error in Ruby 3.4+ [!346](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/346) *@sue445*
+
+## v5.0.0
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v4.0.0...v5.0.0)
+
+* Drop support ruby < 3.1.2 [!310](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/310) *@sue445*
 
 ## v4.0.0
 [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v3.0.0...v4.0.0)

data/Gemfile.lock

@@ -1,50 +1,64 @@
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (4.0.0)
+    gitlabci-bundle-update-mr (5.0.1)
       bundler
       compare_linker (>= 1.4.3)
       git (= 1.7.0)
       gitlab (>= 4.19.0)
+      mutex_m
       restore_bundled_with
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    compare_linker (1.4.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.9)
+    compare_linker (1.4.8)
+      base64
       httpclient
       octokit
-    crack (0.4.5)
+      ostruct
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    dotenv (2.8.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
-      net-http
+    csv (3.3.2)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    dotenv (3.1.7)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitlab (4.19.0)
+    gitlab (5.1.0)
+      base64 (~> 0.2.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
-    gitlab_awesome_release (1.0.4)
+    gitlab_awesome_release (1.1.0)
       dotenv
       gitlab (>= 4.0.0)
       thor
-    hashdiff (1.1.0)
-    httparty (0.21.0)
+    hashdiff (1.1.2)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    json (2.7.1)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
+    logger (1.6.4)
     mini_mime (1.1.5)
-    multi_xml (0.6.0)
-    net-http (0.4.1)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    mutex_m (0.3.0)
+    net-http (0.6.0)
       uri
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -52,64 +66,58 @@ GEM
     onkcop (1.0.0.0)
       rubocop (>= 0.80.0)
       rubocop-rspec (>= 1.34.0)
-    parallel (1.24.0)
-    parser (3.3.0.3)
+    ostruct (0.6.1)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rchardet (1.8.0)
-    regexp_parser (2.9.0)
+    rake (13.2.1)
+    rchardet (1.9.0)
+    regexp_parser (2.10.0)
     restore_bundled_with (1.0.0)
       git
       thor
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rexml (3.4.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     rspec-temp_dir (1.1.1)
       rspec (>= 3.0)
-    rubocop (1.59.0)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-performance (1.20.2)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-    rubocop_auto_corrector (0.4.4)
-      rubocop (>= 1.3.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.3.0)
+      rubocop (~> 1.61)
+    rubocop_auto_corrector (0.5.0)
+      rubocop (>= 1.30.0)
     ruby-progressbar (1.13.0)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
@@ -118,18 +126,21 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
-    webmock (3.19.1)
+    thor (1.3.2)
+    unicode-display_width (2.6.0)
+    uri (1.0.2)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.34)
+    yard (0.9.37)
 
 PLATFORMS
   ruby
@@ -151,8 +162,9 @@ DEPENDENCIES
   rubocop_auto_corrector (>= 0.4.4)
   sawyer (>= 0.8.1)
   simplecov
+  simplecov-cobertura
   webmock
   yard
 
 BUNDLED WITH
-   2.4.10
+   2.6.2

data/README.md

@@ -5,6 +5,8 @@
 
 Create MergeRequest of bundle update in GitLab CI
 
+_GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions_
+
 ![gitlabci-bundle-update-mr](img/gitlabci-bundle-update-mr.png)
 
 This is inspired by [circleci-bundle-update-pr](https://github.com/masutaka/circleci-bundle-update-pr)

data/bin/console

@@ -19,8 +19,8 @@ Gitlabci::Bundle::Update::Mr.assert_env_keys
   gitlab_api_private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
   project_name:             ENV["CI_PROJECT_PATH"],
   branch:                   ENV["CI_COMMIT_REF_NAME"],
-  author_email:             author_email,
-  author_name:              author_name,
+  author_email:,
+  author_name:,
 )
 
 require "irb"

data/exe/gitlabci-bundle-update-mr

@@ -30,14 +30,14 @@ client = Gitlabci::Bundle::Update::Mr::Client.new(
   gitlab_api_private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
   project_name:             ENV["CI_PROJECT_PATH"],
   branch:                   ENV["CI_COMMIT_REF_NAME"],
-  author_email:             author_email,
-  author_name:              author_name,
+  author_email:,
+  author_name:,
 )
 
 client.perform(
-  allow_dup_mr:                 allow_dup_mr,
-  mr_labels:                    mr_labels,
-  update_bundled_with:          update_bundled_with,
-  merge_when_pipeline_succeeds: merge_when_pipeline_succeeds,
-  assignees:                    assignees,
+  allow_dup_mr:,
+  mr_labels:,
+  update_bundled_with:,
+  merge_when_pipeline_succeeds:,
+  assignees:,
 )

data/gitlabci-bundle-update-mr.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.1.2"
 
   spec.add_dependency "bundler"
   spec.add_dependency "compare_linker", ">= 1.4.3"
@@ -43,6 +43,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gitlab", ">= 4.19.0"
   spec.add_dependency "restore_bundled_with"
 
+  # FIXME: Workaround for error in Ruby 3.4+
+  #        https://github.com/nahi/httpclient/pull/455 is merged, but not published yet...
+  spec.add_dependency "mutex_m"
+
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "gitlab_awesome_release"
   spec.add_development_dependency "onkcop", ">= 1.0.0.0"
@@ -56,6 +60,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-performance", ">= 1.14.0"
   spec.add_development_dependency "rubocop-rspec", ">= 2.21.0"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-cobertura"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"
 end

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

@@ -54,7 +54,7 @@ module Gitlabci
             commit_gemfile_lock(new_lockfile)
             description = merge_request_description(old_lockfile, new_lockfile)
 
-            mr = create_merge_request(description: description, mr_labels: mr_labels, assignee_ids: assignee_ids)
+            mr = create_merge_request(description:, mr_labels:, assignee_ids:)
             puts "MR is created: #{mr.web_url}"
 
             if merge_when_pipeline_succeeds
@@ -92,7 +92,7 @@ module Gitlabci
               source_branch:        new_branch,
               target_branch:        @branch,
               remove_source_branch: true,
-              description:          description,
+              description:,
             }
 
             unless mr_labels.empty?
@@ -139,7 +139,7 @@ module Gitlabci
           #
           # @see https://docs.gitlab.com/ee/api/users.html#for-normal-users
           def find_by_username(username)
-            @gitlab.users(username: username).first
+            @gitlab.users(username:).first
           end
 
           # @param username [String]

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

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "4.0.0".freeze
+        VERSION = "5.0.1".freeze
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gitlabci-bundle-update-mr
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - sue445
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +79,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +275,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -328,7 +355,6 @@ metadata:
   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
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,15 +362,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Create MergeRequest of bundle update in GitLab CI
 test_files: []