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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229a9fbae1ea6840f3f383b08cc83a15ff50d28739f06dfd5987564424ae7ab2
-  data.tar.gz: 677df6d813f5b0609e336323496c23c9a789c2fc5dfdcff31cb3095f57057c90
+  metadata.gz: 2f6e069d472e3b2f55ef91137eaa34be5f0b01fb6ed6034e56ac9b38892e18a9
+  data.tar.gz: 81880b1864a23db44575c1889f12c24156efa073c525036de84f85afce86beed
 SHA512:
-  metadata.gz: 294bd4ec7d61cbf932e168386463eed2428f846e96e92959a44f4380e9f6640e98d75b8f17c0a8217a4be42401adebb57dd7bb623ceb81e4fd52e6cdb3aba329
-  data.tar.gz: 53be10193139b5fc00e3a4f228362b60ebf3a83c9565737307c442047855fd18faad20085a81a3a314313a64a985af3aafd6799842ccd160ed3f43d673315ce7
+  metadata.gz: 1429807a4deb0f85e6b9e18130c6ee593c35997460724efdf6c67a9df22b5de213c5db0fd9c3cc2073a61d254a7d94ed4c860527885df7ecd31907be67ee80ea
+  data.tar.gz: d652adce7976d1588aaa68829a8c964f2c95b2fbdb2a400a0f05e96bb326ffb6d0ca71c12835d757c8161c94ea361f069000c27a9cb147aac8c671cc5e27dec0

data/.codeclimate.yml

@@ -0,0 +1,3 @@
+plugins:
+  rubocop:
+    enabled: false

data/.gitlab-ci.yml

@@ -4,6 +4,7 @@ stages:
 
 include:
   - local: "/gitlabci-templates/continuous_bundle_update.yml"
+  - template: Code-Quality.gitlab-ci.yml
 
 continuous_bundle_update:
   stage: build
@@ -19,10 +20,6 @@ continuous_bundle_update:
     # Set timezone to Asia/Tokyo
     - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
-  only:
-    - schedules
-    - web # Test for topic branch
-
 .default:
   cache:
     key: "$CI_BUILD_NAME"
@@ -34,55 +31,58 @@ continuous_bundle_update:
     - bundle install --retry=3 --jobs=$(nproc)
     - bundle clean
 
-  except:
-    - schedules
-    - web
-    - tags
-
-.test:
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      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'
+
+test:
   extends: .default
 
   stage: build
 
+  image: $IMAGE
+
   script:
     - bundle exec rspec
     - bundle exec ./exe/gitlabci-bundle-update-mr --help
+    - bundle exec rubocop -P
 
-test:2.5:
-  extends: .test
-
-  image: ruby:2.5
-
-test:2.6:
-  extends: .test
-
-  image: ruby:2.6
-
-test:2.7:
-  extends: .test
-
-  image: ruby:2.7
-
-test:3.0:
-  extends: .test
-
-  image: ruby:3.0
-
-test:trunk:
-  extends: .test
-
-  image: rubylang/ruby:trunk-nightly-bionic
-  allow_failure: true
+  parallel:
+    matrix:
+      - IMAGE:
+          - ruby:2.5
+          - ruby:2.6
+          - ruby:2.7
+          - ruby:3.0
+          - rubylang/ruby:master-nightly-bionic
+
+# c.f. https://docs.gitlab.com/ee/user/project/merge_requests/code_quality.html
+code_quality:
+  stage: build
 
-rubocop:
-  extends: .default
+  artifacts:
+    paths: [gl-code-quality-report.json]
 
-  stage: build
+  rules:
+    - if: '$CODE_QUALITY_DISABLED'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_TAG'
 
-  image: ruby
+code_quality_html:
+  extends: code_quality
 
-  script:
-    - bundle exec rubocop -P
+  variables:
+    REPORT_FORMAT: html
+  artifacts:
+    paths: [ gl-code-quality-report.html ]
 
 pages:
   extends: .default
@@ -91,10 +91,31 @@ pages:
 
   image: ruby
 
+  dependencies:
+    - code_quality_html
+
   script:
     - bundle exec yard
+    - mv gl-code-quality-report.html public/
   artifacts:
     paths:
       - public
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+
+gitlab_awesome_release:
+  stage: build
+
+  image: ruby:alpine
+
+  script:
+    - gem install gitlab_awesome_release --no-doc
+    - gitlab_awesome_release create_latest_note
+
+  variables:
+    GITLAB_API_ENDPOINT: $CI_API_V4_URL
+    GITLAB_PROJECT_NAME: $CI_PROJECT_PATH
+    GITLAB_API_PRIVATE_TOKEN: $GITLAB_API_PRIVATE_TOKEN
+
   only:
-    - master
+    - web

data/.rubocop.yml

@@ -11,19 +11,11 @@ inherit_gem:
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
+  SuggestExtensions: false
 
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
-Layout/IndentationConsistency:
-  EnforcedStyle: indented_internal_methods
-
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: consistent
-
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-
 Metrics/MethodLength:
   Max: 22

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.0...master)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.3...master)
+
+## v1.1.3
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.2...v1.1.3)
+
+* Enable MFA requirement for gem releasing [!181](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/181) *@sue445*
+
+## v1.1.2
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.1...v1.1.2)
+
+* Allow auto retry with `Gitlab::Error::NotAcceptable` [!134](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/134) *@sue445*
+
+## v1.1.1
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.0...v1.1.1)
+
+* Add auto retry when `merge when pipeline succeeds` is failed [!128](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/128) *@sue445*
+* [Resolved] `open': can't modify frozen Hash: {} (FrozenError) [!131](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/131) *@sue445*
 
 ## v1.1.0
 [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.0.0...v1.1.0)

data/Gemfile

@@ -9,10 +9,6 @@ gem "faraday", ">= 0.15.4"
 gem "octokit", ">= 4.13.0"
 gem "sawyer", ">= 0.8.1"
 
-# TODO: Remove after following PR are merged
-# * https://github.com/onk/onkcop/pull/62
-# * https://github.com/onk/onkcop/pull/63
-# * https://github.com/onk/onkcop/pull/65
-# gem "onkcop", ">= 0.53.0.3", require: false
-gem "onkcop", require: false, github: "sue445/onkcop", branch: "develop"
-gem "rubocop", ">= 0.68.0"
+# v1.22.2 has a false positive. This issue has been fixed but has not yet been released at this time...
+# c.f. https://github.com/rubocop/rubocop/pull/10207
+gem "rubocop", ">= 1.22.1", "!= 1.22.2"

data/Gemfile.lock

@@ -1,27 +1,19 @@
-GIT
-  remote: https://github.com/sue445/onkcop.git
-  revision: d09f75a5eeb1969800cca160f653325771590fae
-  branch: develop
-  specs:
-    onkcop (0.53.0.3)
-      rubocop (>= 0.53.0)
-      rubocop-rspec (>= 1.34.0)
-
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (1.1.1.beta1)
+    gitlabci-bundle-update-mr (1.1.3)
       bundler
       compare_linker (>= 1.4.3)
+      git (= 1.7.0)
       gitlab (>= 4.14.1)
       restore_bundled_with
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
     compare_linker (1.4.4)
@@ -30,36 +22,55 @@ GEM
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.4.0)
     dotenv (2.7.6)
-    faraday (1.2.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     git (1.7.0)
       rchardet (~> 1.8)
     gitlab (4.17.0)
       httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    gitlab_awesome_release (1.0.2)
+    gitlab_awesome_release (1.0.3)
       dotenv
       gitlab (>= 4.0.0)
       thor
     hashdiff (1.0.1)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.1115)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    octokit (4.19.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    onkcop (1.0.0.0)
+      rubocop (>= 0.80.0)
+      rubocop-rspec (>= 1.34.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -69,13 +80,13 @@ GEM
       pry (~> 0.13.0)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rchardet (1.8.0)
-    regexp_parser (2.0.2)
+    regexp_parser (2.1.1)
     restore_bundled_with (1.0.0)
       git
       thor
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -88,48 +99,46 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.3)
     rspec-temp_dir (1.1.0)
       rspec (>= 3.0)
-    rubocop (1.7.0)
+    rubocop (1.23.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.1)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.13.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.12.0)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    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)
+    rubocop-rspec (2.6.0)
+      rubocop (~> 1.19)
+    rubocop_auto_corrector (0.4.2)
+      rubocop (>= 1.13.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simplecov (0.20.0)
+    simplecov (0.21.2)
       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.11.0)
-      addressable (>= 2.3.6)
+    simplecov_json_formatter (0.1.3)
+    terminal-table (1.6.0)
+    thor (1.1.0)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.26)
@@ -143,13 +152,13 @@ DEPENDENCIES
   gitlab_awesome_release
   gitlabci-bundle-update-mr!
   octokit (>= 4.13.0)
-  onkcop!
+  onkcop (>= 1.0.0.0)
   pry-byebug
   rake (>= 10.0)
   rspec (~> 3.0)
   rspec-its
   rspec-temp_dir
-  rubocop (>= 0.68.0)
+  rubocop (>= 1.22.1, != 1.22.2)
   rubocop-performance
   rubocop_auto_corrector
   sawyer (>= 0.8.1)

data/gitlabci-bundle-update-mr.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
     spec.metadata["homepage_uri"] = spec.homepage
     spec.metadata["source_code_uri"] = spec.homepage
     spec.metadata["changelog_uri"] = "https://gitlab.com/sue445/gitlabci-bundle-update-mr/blob/master/CHANGELOG.md"
+    spec.metadata["rubygems_mfa_required"] = "true"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+          "public gem pushes."
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -38,12 +39,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler"
   spec.add_dependency "compare_linker", ">= 1.4.3"
+  spec.add_dependency "git", "1.7.0"
   spec.add_dependency "gitlab", ">= 4.14.1"
   spec.add_dependency "restore_bundled_with"
 
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "gitlab_awesome_release"
-  spec.add_development_dependency "onkcop"
+  spec.add_development_dependency "onkcop", ">= 1.0.0.0"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

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

@@ -216,13 +216,16 @@ module Gitlabci
               retry_count ||= 0
 
               yield
-            rescue Gitlab::Error::MethodNotAllowed => e
+            rescue Gitlab::Error::MethodNotAllowed, Gitlab::Error::NotAcceptable => e
               retry_count += 1
 
               if retry_count > MAX_RETRY_COUNT
                 raise e
               end
 
+              puts "Error is occurred and auto retry (#{retry_count}/#{MAX_RETRY_COUNT}): #{e}"
+              sleep 1
+
               retry
             end
 

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

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "1.1.1.beta1".freeze
+        VERSION = "1.1.3".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.1.beta1
+  version: 1.1.3
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +270,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".env.example"
 - ".env.gitlab"
 - ".gitignore"
@@ -284,6 +299,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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -295,11 +311,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Create MergeRequest of bundle update in GitLab CI