gitlabci-bundle-update-mr 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +1 -9
  3. data/CHANGELOG.md +6 -1
  4. data/Gemfile +0 -8
  5. data/Gemfile.lock +15 -20
  6. data/gitlabci-bundle-update-mr.gemspec +1 -1
  7. data/lib/gitlabci/bundle/update/mr/client.rb +1 -1
  8. data/lib/gitlabci/bundle/update/mr/version.rb +1 -1
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1d1206c8c3121aad2c45e26a171ea8dc1f4d63a63edf928c2c0461e5eee6c060
4
- data.tar.gz: 37c562a6f10341664b39d6074900f801e922a207a941ba6a2a1037fa082cc9d4
3
+ metadata.gz: b573b689c6bf38bb800c26ffcbe5e34815bc4ad8f6ae5c92ae5ba7d83ec930e2
4
+ data.tar.gz: ffba9360127be72feea30613f07ce99c8c3d55a2261ffe6acbfa55e2985db796
5
5
  SHA512:
6
- metadata.gz: 1946c3432b01d0de283c76e9e3cf66139e353b83cc931e2599efa0af6d7c2a4eab16de0b0688892c8212637e9a76cec3e2f12f31ed3c00ba9a585b30fce792d9
7
- data.tar.gz: 2cfdbd4ef410037d08a69dbea805de4d38baf0ecece5797efeb084dee4fea40e9e7b3329fe4f375a474397c40632bbe89eb3a9bc627ebe8242a55310191f14a8
6
+ metadata.gz: 3242994d13cd7c4959d5399bee444e6d13d59ad54ae2d141c5952f669b0d53f3939c47f6e5fb9e943893e779022762494a16db40039a8c0c00f1da108479a464
7
+ data.tar.gz: e9083b867e926800dc01b450b92da8c77eaeb5eb22f75f1b86627e8c209b09c5f7c9e206cd8e79581ab59ec29454dc8565cfbc65b8102cada9a9d4a94c53360b
data/.rubocop.yml CHANGED
@@ -11,19 +11,11 @@ inherit_gem:
11
11
  AllCops:
12
12
  TargetRubyVersion: 2.5
13
13
  NewCops: enable
14
+ SuggestExtensions: false
14
15
 
15
16
  Layout/HashAlignment:
16
17
  EnforcedHashRocketStyle: table
17
18
  EnforcedColonStyle: table
18
19
 
19
- Layout/IndentationConsistency:
20
- EnforcedStyle: indented_internal_methods
21
-
22
- Layout/FirstArrayElementIndentation:
23
- EnforcedStyle: consistent
24
-
25
- Layout/FirstHashElementIndentation:
26
- EnforcedStyle: consistent
27
-
28
20
  Metrics/MethodLength:
29
21
  Max: 22
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  ## Unreleased
2
- [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.1...master)
2
+ [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.2...master)
3
+
4
+ ## v1.1.2
5
+ [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.1...v1.1.2)
6
+
7
+ * Allow auto retry with `Gitlab::Error::NotAcceptable` [!134](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/134) *@sue445*
3
8
 
4
9
  ## v1.1.1
5
10
  [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.0...v1.1.1)
data/Gemfile CHANGED
@@ -8,11 +8,3 @@ gemspec
8
8
  gem "faraday", ">= 0.15.4"
9
9
  gem "octokit", ">= 4.13.0"
10
10
  gem "sawyer", ">= 0.8.1"
11
-
12
- # TODO: Remove after following PR are merged
13
- # * https://github.com/onk/onkcop/pull/62
14
- # * https://github.com/onk/onkcop/pull/63
15
- # * https://github.com/onk/onkcop/pull/65
16
- # gem "onkcop", ">= 0.53.0.3", require: false
17
- gem "onkcop", require: false, github: "sue445/onkcop", branch: "develop"
18
- gem "rubocop", ">= 0.68.0"
data/Gemfile.lock CHANGED
@@ -1,16 +1,7 @@
1
- GIT
2
- remote: https://github.com/sue445/onkcop.git
3
- revision: d09f75a5eeb1969800cca160f653325771590fae
4
- branch: develop
5
- specs:
6
- onkcop (0.53.0.3)
7
- rubocop (>= 0.53.0)
8
- rubocop-rspec (>= 1.34.0)
9
-
10
1
  PATH
11
2
  remote: .
12
3
  specs:
13
- gitlabci-bundle-update-mr (1.1.1)
4
+ gitlabci-bundle-update-mr (1.1.2)
14
5
  bundler
15
6
  compare_linker (>= 1.4.3)
16
7
  git (= 1.7.0)
@@ -33,9 +24,11 @@ GEM
33
24
  diff-lcs (1.4.4)
34
25
  docile (1.3.4)
35
26
  dotenv (2.7.6)
36
- faraday (1.2.0)
27
+ faraday (1.3.0)
28
+ faraday-net_http (~> 1.0)
37
29
  multipart-post (>= 1.2, < 3)
38
30
  ruby2_keywords
31
+ faraday-net_http (1.0.0)
39
32
  git (1.7.0)
40
33
  rchardet (~> 1.8)
41
34
  gitlab (4.17.0)
@@ -56,9 +49,12 @@ GEM
56
49
  mime-types-data (3.2020.1104)
57
50
  multi_xml (0.6.0)
58
51
  multipart-post (2.1.1)
59
- octokit (4.19.0)
52
+ octokit (4.20.0)
60
53
  faraday (>= 0.9)
61
54
  sawyer (~> 0.8.0, >= 0.5.3)
55
+ onkcop (1.0.0.0)
56
+ rubocop (>= 0.80.0)
57
+ rubocop-rspec (>= 1.34.0)
62
58
  parallel (1.20.1)
63
59
  parser (3.0.0.0)
64
60
  ast (~> 2.4.1)
@@ -72,7 +68,7 @@ GEM
72
68
  rainbow (3.0.0)
73
69
  rake (13.0.3)
74
70
  rchardet (1.8.0)
75
- regexp_parser (2.0.2)
71
+ regexp_parser (2.0.3)
76
72
  restore_bundled_with (1.0.0)
77
73
  git
78
74
  thor
@@ -89,7 +85,7 @@ GEM
89
85
  rspec-its (1.3.0)
90
86
  rspec-core (>= 3.0.0)
91
87
  rspec-expectations (>= 3.0.0)
92
- rspec-mocks (3.10.0)
88
+ rspec-mocks (3.10.1)
93
89
  diff-lcs (>= 1.2.0, < 2.0)
94
90
  rspec-support (~> 3.10.0)
95
91
  rspec-support (3.10.1)
@@ -104,9 +100,9 @@ GEM
104
100
  rubocop-ast (>= 1.2.0, < 2.0)
105
101
  ruby-progressbar (~> 1.7)
106
102
  unicode-display_width (>= 1.4.0, < 2.0)
107
- rubocop-ast (1.3.0)
103
+ rubocop-ast (1.4.0)
108
104
  parser (>= 2.7.1.5)
109
- rubocop-performance (1.9.1)
105
+ rubocop-performance (1.9.2)
110
106
  rubocop (>= 0.90.0, < 2.0)
111
107
  rubocop-ast (>= 0.4.0)
112
108
  rubocop-rspec (2.1.0)
@@ -114,12 +110,12 @@ GEM
114
110
  rubocop-ast (>= 1.1.0)
115
111
  rubocop_auto_corrector (0.4.1)
116
112
  rubocop (>= 0.87.0)
117
- ruby-progressbar (1.10.1)
113
+ ruby-progressbar (1.11.0)
118
114
  ruby2_keywords (0.0.2)
119
115
  sawyer (0.8.2)
120
116
  addressable (>= 2.3.5)
121
117
  faraday (> 0.8, < 2.0)
122
- simplecov (0.20.0)
118
+ simplecov (0.21.0)
123
119
  docile (~> 1.1)
124
120
  simplecov-html (~> 0.11)
125
121
  simplecov_json_formatter (~> 0.1)
@@ -144,13 +140,12 @@ DEPENDENCIES
144
140
  gitlab_awesome_release
145
141
  gitlabci-bundle-update-mr!
146
142
  octokit (>= 4.13.0)
147
- onkcop!
143
+ onkcop (>= 1.0.0.0)
148
144
  pry-byebug
149
145
  rake (>= 10.0)
150
146
  rspec (~> 3.0)
151
147
  rspec-its
152
148
  rspec-temp_dir
153
- rubocop (>= 0.68.0)
154
149
  rubocop-performance
155
150
  rubocop_auto_corrector
156
151
  sawyer (>= 0.8.1)
data/gitlabci-bundle-update-mr.gemspec CHANGED
@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
44
44
 
45
45
  spec.add_development_dependency "dotenv"
46
46
  spec.add_development_dependency "gitlab_awesome_release"
47
- spec.add_development_dependency "onkcop"
47
+ spec.add_development_dependency "onkcop", ">= 1.0.0.0"
48
48
  spec.add_development_dependency "pry-byebug"
49
49
  spec.add_development_dependency "rake", ">= 10.0"
50
50
  spec.add_development_dependency "rspec", "~> 3.0"
data/lib/gitlabci/bundle/update/mr/client.rb CHANGED
@@ -216,7 +216,7 @@ module Gitlabci
216
216
  retry_count ||= 0
217
217
 
218
218
  yield
219
- rescue Gitlab::Error::MethodNotAllowed => e
219
+ rescue Gitlab::Error::MethodNotAllowed, Gitlab::Error::NotAcceptable => e
220
220
  retry_count += 1
221
221
 
222
222
  if retry_count > MAX_RETRY_COUNT
data/lib/gitlabci/bundle/update/mr/version.rb CHANGED
@@ -2,7 +2,7 @@ module Gitlabci
2
2
  module Bundle
3
3
  module Update
4
4
  module Mr
5
- VERSION = "1.1.1".freeze
5
+ VERSION = "1.1.2".freeze
6
6
  end
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlabci-bundle-update-mr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - sue445
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - ">="
116
116
  - !ruby/object:Gem::Version
117
- version: '0'
117
+ version: 1.0.0.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - ">="
123
123
  - !ruby/object:Gem::Version
124
- version: '0'
124
+ version: 1.0.0.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: pry-byebug
127
127
  requirement: !ruby/object:Gem::Requirement