gitlabci-bundle-update-mr 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1206c8c3121aad2c45e26a171ea8dc1f4d63a63edf928c2c0461e5eee6c060
-  data.tar.gz: 37c562a6f10341664b39d6074900f801e922a207a941ba6a2a1037fa082cc9d4
+  metadata.gz: b573b689c6bf38bb800c26ffcbe5e34815bc4ad8f6ae5c92ae5ba7d83ec930e2
+  data.tar.gz: ffba9360127be72feea30613f07ce99c8c3d55a2261ffe6acbfa55e2985db796
 SHA512:
-  metadata.gz: 1946c3432b01d0de283c76e9e3cf66139e353b83cc931e2599efa0af6d7c2a4eab16de0b0688892c8212637e9a76cec3e2f12f31ed3c00ba9a585b30fce792d9
-  data.tar.gz: 2cfdbd4ef410037d08a69dbea805de4d38baf0ecece5797efeb084dee4fea40e9e7b3329fe4f375a474397c40632bbe89eb3a9bc627ebe8242a55310191f14a8
+  metadata.gz: 3242994d13cd7c4959d5399bee444e6d13d59ad54ae2d141c5952f669b0d53f3939c47f6e5fb9e943893e779022762494a16db40039a8c0c00f1da108479a464
+  data.tar.gz: e9083b867e926800dc01b450b92da8c77eaeb5eb22f75f1b86627e8c209b09c5f7c9e206cd8e79581ab59ec29454dc8565cfbc65b8102cada9a9d4a94c53360b

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,10 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.1...master)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.2...master)
+
+## 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)

data/Gemfile

@@ -8,11 +8,3 @@ gemspec
 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"

data/Gemfile.lock

@@ -1,16 +1,7 @@
-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)
+    gitlabci-bundle-update-mr (1.1.2)
       bundler
       compare_linker (>= 1.4.3)
       git (= 1.7.0)
@@ -33,9 +24,11 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.4)
     dotenv (2.7.6)
-    faraday (1.2.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday-net_http (1.0.0)
     git (1.7.0)
       rchardet (~> 1.8)
     gitlab (4.17.0)
@@ -56,9 +49,12 @@ GEM
     mime-types-data (3.2020.1104)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    octokit (4.19.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
+    onkcop (1.0.0.0)
+      rubocop (>= 0.80.0)
+      rubocop-rspec (>= 1.34.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -72,7 +68,7 @@ GEM
     rainbow (3.0.0)
     rake (13.0.3)
     rchardet (1.8.0)
-    regexp_parser (2.0.2)
+    regexp_parser (2.0.3)
     restore_bundled_with (1.0.0)
       git
       thor
@@ -89,7 +85,7 @@ 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.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
@@ -104,9 +100,9 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
+    rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.9.1)
+    rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rspec (2.1.0)
@@ -114,12 +110,12 @@ GEM
       rubocop-ast (>= 1.1.0)
     rubocop_auto_corrector (0.4.1)
       rubocop (>= 0.87.0)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simplecov (0.20.0)
+    simplecov (0.21.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -144,13 +140,12 @@ 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-performance
   rubocop_auto_corrector
   sawyer (>= 0.8.1)

data/gitlabci-bundle-update-mr.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
 
   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,7 +216,7 @@ 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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlabci-bundle-update-mr
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - sue445
@@ -114,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