git_helper 3.5.0 → 3.5.1

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +16 -16
  3. data/README.md +1 -1
  4. data/lib/git_helper/merge_request.rb +9 -8
  5. data/lib/git_helper/setup.rb +0 -2
  6. data/lib/git_helper/version.rb +1 -1
  7. metadata +3 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 37d1cb4ca342aac0362a8e7bd6f9726731315aead8c49ee2462d34ccdd6026c8
4
- data.tar.gz: d5d4193926ecfc3d37ab4f5289be2364d5cca527aec32fcae7fa1ede7406d9da
3
+ metadata.gz: ffcb2655eb57e6b7a6ea293fa815ecfcc4d4eb52bfdd8eb4a003ce5f7e0ed5a2
4
+ data.tar.gz: c3d0bbc2018ecf87cd486331e7d7643409c57b083d2b41ecfdc96bdf3bb9fcd8
5
5
  SHA512:
6
- metadata.gz: 7d44f55e02a52b3c419a06b10d99755fb1858270b82e505d134a97b2a61b53378c15fea01f54c9f421bf097a403ba9cdc029f5872529a5db051932e9b036df75
7
- data.tar.gz: c31682a0cb41f8ccf74ecf70ec1f302904d209dcdd043730207127f428541a91f4619db9d23e493bfd5d67481d769d2c84fb496f4dee6402c0ce0dee2d5c3357
6
+ metadata.gz: acc45c11fb46082119da17cfbf66d5baddd4c45e5c9d0757abc9cf2537f3b0a5067b025da48c4a34bd5dee5b137bb241245b6d2a746aa4d263d29e4fc852a79c
7
+ data.tar.gz: 2daef5b537909e00ab2c978e42367ab00c49c400bfe044caa1d0a940a8c2c790d14b3832033119b34c3006d919fea85dee810d216d1149f1815fb19bca1e7094
data/Gemfile.lock CHANGED
@@ -1,12 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- git_helper (3.5.0)
4
+ git_helper (3.5.1.pre.test)
5
5
  gitlab (~> 4.16)
6
6
  gli (~> 2.13)
7
7
  highline_wrapper (~> 1.1)
8
8
  octokit (~> 4.18)
9
- psych (< 4)
10
9
 
11
10
  GEM
12
11
  remote: https://rubygems.org/
@@ -19,7 +18,7 @@ GEM
19
18
  diff-lcs (1.4.4)
20
19
  faker (2.18.0)
21
20
  i18n (>= 1.6, < 2)
22
- faraday (1.5.0)
21
+ faraday (1.7.1)
23
22
  faraday-em_http (~> 1.0)
24
23
  faraday-em_synchrony (~> 1.0)
25
24
  faraday-excon (~> 1.1)
@@ -27,6 +26,7 @@ GEM
27
26
  faraday-net_http (~> 1.0)
28
27
  faraday-net_http_persistent (~> 1.1)
29
28
  faraday-patron (~> 1.0)
29
+ faraday-rack (~> 1.0)
30
30
  multipart-post (>= 1.2, < 3)
31
31
  ruby2_keywords (>= 0.0.4)
32
32
  faraday-em_http (1.0.0)
@@ -34,21 +34,22 @@ GEM
34
34
  faraday-excon (1.1.0)
35
35
  faraday-httpclient (1.0.1)
36
36
  faraday-net_http (1.0.1)
37
- faraday-net_http_persistent (1.1.0)
37
+ faraday-net_http_persistent (1.2.0)
38
38
  faraday-patron (1.0.0)
39
+ faraday-rack (1.0.0)
39
40
  ffi (1.15.3)
40
41
  formatador (0.3.0)
41
42
  gitlab (4.17.0)
42
43
  httparty (~> 0.18)
43
44
  terminal-table (~> 1.5, >= 1.5.1)
44
45
  gli (2.20.1)
45
- guard (2.17.0)
46
+ guard (2.18.0)
46
47
  formatador (>= 0.2.4)
47
48
  listen (>= 2.7, < 4.0)
48
49
  lumberjack (>= 1.0.12, < 2.0)
49
50
  nenv (~> 0.1)
50
51
  notiffany (~> 0.0)
51
- pry (>= 0.9.12)
52
+ pry (>= 0.13.0)
52
53
  shellany (~> 0.0)
53
54
  thor (>= 0.18.1)
54
55
  guard-compat (1.2.1)
@@ -57,21 +58,21 @@ GEM
57
58
  guard-compat (~> 1.1)
58
59
  rspec (>= 2.99.0, < 4.0)
59
60
  highline (2.0.3)
60
- highline_wrapper (1.2.2)
61
+ highline_wrapper (1.3.0)
61
62
  highline (~> 2.0)
62
63
  httparty (0.18.1)
63
64
  mime-types (~> 3.0)
64
65
  multi_xml (>= 0.5.2)
65
66
  i18n (1.8.10)
66
67
  concurrent-ruby (~> 1.0)
67
- listen (3.5.1)
68
+ listen (3.6.0)
68
69
  rb-fsevent (~> 0.10, >= 0.10.3)
69
70
  rb-inotify (~> 0.9, >= 0.9.10)
70
71
  lumberjack (1.2.8)
71
72
  method_source (1.0.0)
72
73
  mime-types (3.3.1)
73
74
  mime-types-data (~> 3.2015)
74
- mime-types-data (3.2021.0704)
75
+ mime-types-data (3.2021.0901)
75
76
  multi_xml (0.6.0)
76
77
  multipart-post (2.1.1)
77
78
  nenv (0.3.0)
@@ -82,12 +83,11 @@ GEM
82
83
  faraday (>= 0.9)
83
84
  sawyer (~> 0.8.0, >= 0.5.3)
84
85
  parallel (1.20.1)
85
- parser (3.0.1.1)
86
+ parser (3.0.2.0)
86
87
  ast (~> 2.4.1)
87
88
  pry (0.14.1)
88
89
  coderay (~> 1.1)
89
90
  method_source (~> 1.0)
90
- psych (3.3.2)
91
91
  public_suffix (4.0.6)
92
92
  rainbow (3.0.0)
93
93
  rb-fsevent (0.11.0)
@@ -108,19 +108,19 @@ GEM
108
108
  diff-lcs (>= 1.2.0, < 2.0)
109
109
  rspec-support (~> 3.10.0)
110
110
  rspec-support (3.10.2)
111
- rubocop (1.18.2)
111
+ rubocop (1.18.4)
112
112
  parallel (~> 1.10)
113
113
  parser (>= 3.0.0.0)
114
114
  rainbow (>= 2.2.2, < 4.0)
115
115
  regexp_parser (>= 1.8, < 3.0)
116
116
  rexml
117
- rubocop-ast (>= 1.7.0, < 2.0)
117
+ rubocop-ast (>= 1.8.0, < 2.0)
118
118
  ruby-progressbar (~> 1.7)
119
119
  unicode-display_width (>= 1.4.0, < 3.0)
120
- rubocop-ast (1.7.0)
120
+ rubocop-ast (1.9.0)
121
121
  parser (>= 3.0.1.1)
122
122
  ruby-progressbar (1.11.0)
123
- ruby2_keywords (0.0.4)
123
+ ruby2_keywords (0.0.5)
124
124
  sawyer (0.8.2)
125
125
  addressable (>= 2.3.5)
126
126
  faraday (> 0.8, < 2.0)
@@ -143,4 +143,4 @@ DEPENDENCIES
143
143
  rubocop (~> 1.10)
144
144
 
145
145
  BUNDLED WITH
146
- 2.2.21
146
+ 2.2.25
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # Git Helper [![Main](https://github.com/emmahsax/git_helper/actions/workflows/main.yml/badge.svg)](https://github.com/emmahsax/git_helper/actions/workflows/main.yml)
1
+ # Git Helper
2
2
 
3
3
  ## Gem Usage
4
4
 
data/lib/git_helper/merge_request.rb CHANGED
@@ -127,14 +127,15 @@ module GitHelper
127
127
  private def squash_merge_request
128
128
  return @squash_merge_request if @squash_merge_request
129
129
 
130
- case existing_project.squash_option
131
- when 'always', 'default_on'
132
- @squash_merge_request = true
133
- when 'never'
134
- @squash_merge_request = false
135
- else # 'default_off' or anything else
136
- @squash_merge_request = highline.ask_yes_no('Squash merge request? (y/n)')
137
- end
130
+ @squash_merge_request =
131
+ case existing_project.squash_option
132
+ when 'always', 'default_on'
133
+ true
134
+ when 'never'
135
+ false
136
+ else # 'default_off' or anything else
137
+ highline.ask_yes_no('Squash merge request? (y/n)')
138
+ end
138
139
  end
139
140
 
140
141
  private def remove_source_branch
data/lib/git_helper/setup.rb CHANGED
@@ -49,7 +49,6 @@ module GitHelper
49
49
  end
50
50
 
51
51
  # rubocop:disable Metrics/MethodLength
52
- # rubocop:disable Layout/LineEndStringConcatenationIndentation
53
52
  private def generate_file_contents
54
53
  file_contents = ''.dup
55
54
 
@@ -76,7 +75,6 @@ module GitHelper
76
75
  file_contents.strip
77
76
  end
78
77
  # rubocop:enable Metrics/MethodLength
79
- # rubocop:enable Layout/LineEndStringConcatenationIndentation
80
78
 
81
79
  private def ask_question(prompt, secret: false)
82
80
  highline.ask(prompt, { required: true, secret: secret })
data/lib/git_helper/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module GitHelper
4
- VERSION = '3.5.0'
4
+ VERSION = '3.5.1'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git_helper
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.0
4
+ version: 3.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Emma Sax
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-06 00:00:00.000000000 Z
11
+ date: 2021-09-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: gitlab
@@ -66,20 +66,6 @@ dependencies:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '4.18'
69
- - !ruby/object:Gem::Dependency
70
- name: psych
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - "<"
74
- - !ruby/object:Gem::Version
75
- version: '4'
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "<"
81
- - !ruby/object:Gem::Version
82
- version: '4'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: bundler
85
71
  requirement: !ruby/object:Gem::Requirement
@@ -230,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
230
216
  - !ruby/object:Gem::Version
231
217
  version: '0'
232
218
  requirements: []
233
- rubygems_version: 3.2.15
219
+ rubygems_version: 3.2.22
234
220
  signing_key:
235
221
  specification_version: 4
236
222
  summary: A set of GitHub and GitLab workflow scripts