git_reflow 0.8.9 → 0.9.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. checksums.yaml +5 -5
  2. data/.github/workflows/multi-ruby-tests.yml +33 -0
  3. data/.gitignore +1 -0
  4. data/.rubocop.yml +2 -0
  5. data/.ruby-version +1 -0
  6. data/Appraisals +1 -6
  7. data/CHANGELOG.md +466 -348
  8. data/Gemfile.lock +99 -72
  9. data/LICENSE +20 -20
  10. data/README.md +481 -0
  11. data/Rakefile +15 -8
  12. data/Workflow +3 -0
  13. data/_config.yml +1 -0
  14. data/bin/console +7 -7
  15. data/bin/setup +6 -6
  16. data/exe/git-reflow +20 -36
  17. data/git_reflow.gemspec +26 -30
  18. data/lib/git_reflow.rb +3 -15
  19. data/lib/git_reflow/config.rb +48 -13
  20. data/lib/git_reflow/git_helpers.rb +69 -22
  21. data/lib/git_reflow/git_server.rb +63 -63
  22. data/lib/git_reflow/git_server/base.rb +68 -68
  23. data/lib/git_reflow/git_server/bit_bucket.rb +101 -101
  24. data/lib/git_reflow/git_server/bit_bucket/pull_request.rb +84 -84
  25. data/lib/git_reflow/git_server/git_hub.rb +53 -41
  26. data/lib/git_reflow/git_server/git_hub/pull_request.rb +16 -14
  27. data/lib/git_reflow/git_server/pull_request.rb +4 -2
  28. data/lib/git_reflow/merge_error.rb +9 -9
  29. data/lib/git_reflow/rspec.rb +3 -2
  30. data/lib/git_reflow/rspec/command_line_helpers.rb +23 -6
  31. data/lib/git_reflow/rspec/stub_helpers.rb +13 -13
  32. data/lib/git_reflow/rspec/workflow_helpers.rb +18 -0
  33. data/lib/git_reflow/sandbox.rb +16 -6
  34. data/lib/git_reflow/version.rb +1 -1
  35. data/lib/git_reflow/workflow.rb +304 -9
  36. data/lib/git_reflow/workflows/FlatMergeWorkflow +38 -0
  37. data/lib/git_reflow/workflows/core.rb +364 -238
  38. data/spec/fixtures/authentication_failure.json +3 -0
  39. data/spec/fixtures/awesome_workflow.rb +3 -7
  40. data/spec/fixtures/git/git_config +7 -7
  41. data/spec/fixtures/issues/comment.json.erb +27 -27
  42. data/spec/fixtures/issues/comments.json +29 -29
  43. data/spec/fixtures/issues/comments.json.erb +15 -15
  44. data/spec/fixtures/pull_requests/comment.json.erb +45 -45
  45. data/spec/fixtures/pull_requests/comments.json +47 -47
  46. data/spec/fixtures/pull_requests/comments.json.erb +15 -15
  47. data/spec/fixtures/pull_requests/commits.json +29 -29
  48. data/spec/fixtures/pull_requests/external_pull_request.json +145 -145
  49. data/spec/fixtures/pull_requests/pull_request.json +142 -142
  50. data/spec/fixtures/pull_requests/pull_request.json.erb +142 -142
  51. data/spec/fixtures/pull_requests/pull_request_branch_nonexistent_error.json +32 -0
  52. data/spec/fixtures/pull_requests/pull_request_exists_error.json +32 -32
  53. data/spec/fixtures/pull_requests/pull_requests.json +136 -136
  54. data/spec/fixtures/repositories/commit.json +53 -53
  55. data/spec/fixtures/repositories/commit.json.erb +53 -53
  56. data/spec/fixtures/repositories/commits.json.erb +13 -13
  57. data/spec/fixtures/repositories/statuses.json +31 -31
  58. data/spec/fixtures/users/user.json +32 -0
  59. data/spec/lib/git_reflow/git_helpers_spec.rb +115 -12
  60. data/spec/lib/git_reflow/git_server/bit_bucket_spec.rb +81 -81
  61. data/spec/lib/git_reflow/git_server/git_hub/pull_request_spec.rb +10 -10
  62. data/spec/lib/git_reflow/git_server/git_hub_spec.rb +77 -3
  63. data/spec/lib/git_reflow/git_server/pull_request_spec.rb +9 -3
  64. data/spec/lib/git_reflow/git_server_spec.rb +101 -101
  65. data/spec/lib/git_reflow/sandbox_spec.rb +1 -1
  66. data/spec/lib/git_reflow/workflow_spec.rb +304 -59
  67. data/spec/lib/git_reflow/workflows/core_spec.rb +225 -67
  68. data/spec/lib/git_reflow/workflows/flat_merge_spec.rb +71 -59
  69. data/spec/lib/git_reflow_spec.rb +2 -25
  70. data/spec/spec_helper.rb +3 -0
  71. data/spec/support/fixtures.rb +54 -54
  72. data/spec/support/github_helpers.rb +99 -109
  73. data/spec/support/mock_pull_request.rb +17 -17
  74. data/spec/support/web_mocks.rb +39 -39
  75. metadata +51 -74
  76. data/README.rdoc +0 -461
  77. data/circle.yml +0 -26
  78. data/lib/git_reflow/commands/deliver.rb +0 -10
  79. data/lib/git_reflow/commands/refresh.rb +0 -20
  80. data/lib/git_reflow/commands/review.rb +0 -13
  81. data/lib/git_reflow/commands/setup.rb +0 -11
  82. data/lib/git_reflow/commands/stage.rb +0 -9
  83. data/lib/git_reflow/commands/start.rb +0 -18
  84. data/lib/git_reflow/commands/status.rb +0 -7
  85. data/lib/git_reflow/os_detector.rb +0 -23
  86. data/lib/git_reflow/workflows/flat_merge.rb +0 -10
  87. data/spec/fixtures/workflow_with_super.rb +0 -8
data/spec/support/mock_pull_request.rb CHANGED
@@ -1,17 +1,17 @@
1
- class MockPullRequest < GitReflow::GitServer::PullRequest
2
- DESCRIPTION = "Bingo! Unity."
3
- HTML_URL = "https://github.com/reenhanced/gitreflow/pulls/0"
4
- FEATURE_BRANCH_NAME = "feature_branch"
5
- BASE_BRANCH_NAME = "base"
6
- NUMBER = 0
7
-
8
- def initialize(attributes = Struct.new(:description, :html_url, :feature_branch_name, :base_branch_name, :number).new)
9
- self.description = attributes.description || DESCRIPTION
10
- self.html_url = attributes.html_url || HTML_URL
11
- self.feature_branch_name = attributes.feature_branch_name || FEATURE_BRANCH_NAME
12
- self.base_branch_name = attributes.base_branch_name || BASE_BRANCH_NAME
13
- self.build = Build.new
14
- self.number = attributes.number || NUMBER
15
- self.source_object = attributes
16
- end
17
- end
1
+ class MockPullRequest < GitReflow::GitServer::PullRequest
2
+ DESCRIPTION = "Bingo! Unity."
3
+ HTML_URL = "https://github.com/reenhanced/gitreflow/pulls/0"
4
+ FEATURE_BRANCH_NAME = "feature_branch"
5
+ BASE_BRANCH_NAME = "base"
6
+ NUMBER = 0
7
+
8
+ def initialize(attributes = Struct.new(:description, :html_url, :feature_branch_name, :base_branch_name, :number).new)
9
+ self.description = attributes.description || DESCRIPTION
10
+ self.html_url = attributes.html_url || HTML_URL
11
+ self.feature_branch_name = attributes.feature_branch_name || FEATURE_BRANCH_NAME
12
+ self.base_branch_name = attributes.base_branch_name || BASE_BRANCH_NAME
13
+ self.build = Build.new
14
+ self.number = attributes.number || NUMBER
15
+ self.source_object = attributes
16
+ end
17
+ end
data/spec/support/web_mocks.rb CHANGED
@@ -1,39 +1,39 @@
1
- def stub_get(path, endpoint = GitReflow.git_server.class.api_endpoint)
2
- stub_request(:get, endpoint + path)
3
- end
4
-
5
- def stub_post(path, endpoint = GitReflow.git_server.class.api_endpoint)
6
- stub_request(:post, endpoint + path)
7
- end
8
-
9
- def stub_patch(path, endpoint = Github.endpoint.to_s)
10
- stub_request(:patch, endpoint + path)
11
- end
12
-
13
- def stub_put(path, endpoint = Github.endpoint.to_s)
14
- stub_request(:put, endpoint + path)
15
- end
16
-
17
- def stub_delete(path, endpoint = Github.endpoint.to_s)
18
- stub_request(:delete, endpoint + path)
19
- end
20
-
21
- def a_get(path, endpoint = Github.endpoint.to_s)
22
- a_request(:get, endpoint + path)
23
- end
24
-
25
- def a_post(path, endpoint = Github.endpoint.to_s)
26
- a_request(:post, endpoint + path)
27
- end
28
-
29
- def a_patch(path, endpoint = Github.endpoint.to_s)
30
- a_request(:patch, endpoint + path)
31
- end
32
-
33
- def a_put(path, endpoint = Github.endpoint)
34
- a_request(:put, endpoint + path)
35
- end
36
-
37
- def a_delete(path, endpoint = Github.endpoint)
38
- a_request(:delete, endpoint + path)
39
- end
1
+ def stub_get(path, endpoint = GitReflow.git_server.class.api_endpoint)
2
+ stub_request(:get, endpoint + path)
3
+ end
4
+
5
+ def stub_post(path, endpoint = GitReflow.git_server.class.api_endpoint)
6
+ stub_request(:post, endpoint + path)
7
+ end
8
+
9
+ def stub_patch(path, endpoint = Github.endpoint.to_s)
10
+ stub_request(:patch, endpoint + path)
11
+ end
12
+
13
+ def stub_put(path, endpoint = Github.endpoint.to_s)
14
+ stub_request(:put, endpoint + path)
15
+ end
16
+
17
+ def stub_delete(path, endpoint = Github.endpoint.to_s)
18
+ stub_request(:delete, endpoint + path)
19
+ end
20
+
21
+ def a_get(path, endpoint = Github.endpoint.to_s)
22
+ a_request(:get, endpoint + path)
23
+ end
24
+
25
+ def a_post(path, endpoint = Github.endpoint.to_s)
26
+ a_request(:post, endpoint + path)
27
+ end
28
+
29
+ def a_patch(path, endpoint = Github.endpoint.to_s)
30
+ a_request(:patch, endpoint + path)
31
+ end
32
+
33
+ def a_put(path, endpoint = Github.endpoint)
34
+ a_request(:put, endpoint + path)
35
+ end
36
+
37
+ def a_delete(path, endpoint = Github.endpoint)
38
+ a_request(:delete, endpoint + path)
39
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git_reflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.9
4
+ version: 0.9.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2017-04-26 00:00:00.000000000 Z
13
+ date: 2020-06-02 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: appraisal
@@ -18,30 +18,30 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 2.1.0
21
+ version: 2.2.0
22
22
  type: :development
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 2.1.0
28
+ version: 2.2.0
29
29
  - !ruby/object:Gem::Dependency
30
- name: bundler
30
+ name: chronic
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - "~>"
33
+ - - ">="
34
34
  - !ruby/object:Gem::Version
35
- version: '1.12'
35
+ version: '0'
36
36
  type: :development
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - "~>"
40
+ - - ">="
41
41
  - !ruby/object:Gem::Version
42
- version: '1.12'
42
+ version: '0'
43
43
  - !ruby/object:Gem::Dependency
44
- name: chronic
44
+ name: github_changelog_generator
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - ">="
@@ -74,14 +74,14 @@ dependencies:
74
74
  requirements:
75
75
  - - "~>"
76
76
  - !ruby/object:Gem::Version
77
- version: '11.0'
77
+ version: 13.0.1
78
78
  type: :development
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - "~>"
83
83
  - !ruby/object:Gem::Version
84
- version: '11.0'
84
+ version: 13.0.1
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: rdoc
87
87
  requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
102
102
  requirements:
103
103
  - - "~>"
104
104
  - !ruby/object:Gem::Version
105
- version: 3.4.0
105
+ version: '3.9'
106
106
  type: :development
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
110
  - - "~>"
111
111
  - !ruby/object:Gem::Version
112
- version: 3.4.0
112
+ version: '3.9'
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: webmock
115
115
  requirement: !ruby/object:Gem::Requirement
@@ -130,149 +130,125 @@ dependencies:
130
130
  requirements:
131
131
  - - '='
132
132
  - !ruby/object:Gem::Version
133
- version: 1.3.0
133
+ version: '1.4'
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
138
  - - '='
139
139
  - !ruby/object:Gem::Version
140
- version: 1.3.0
140
+ version: '1.4'
141
141
  - !ruby/object:Gem::Dependency
142
- name: colorize
142
+ name: bundler
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
145
  - - ">="
146
146
  - !ruby/object:Gem::Version
147
- version: 0.7.0
147
+ version: 1.10.0
148
148
  type: :runtime
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
152
  - - ">="
153
153
  - !ruby/object:Gem::Version
154
- version: 0.7.0
154
+ version: 1.10.0
155
155
  - !ruby/object:Gem::Dependency
156
- name: gli
156
+ name: codenamev_bitbucket_api
157
157
  requirement: !ruby/object:Gem::Requirement
158
158
  requirements:
159
159
  - - '='
160
160
  - !ruby/object:Gem::Version
161
- version: 2.15.0
161
+ version: 0.4.1
162
162
  type: :runtime
163
163
  prerelease: false
164
164
  version_requirements: !ruby/object:Gem::Requirement
165
165
  requirements:
166
166
  - - '='
167
167
  - !ruby/object:Gem::Version
168
- version: 2.15.0
168
+ version: 0.4.1
169
169
  - !ruby/object:Gem::Dependency
170
- name: highline
171
- requirement: !ruby/object:Gem::Requirement
172
- requirements:
173
- - - ">="
174
- - !ruby/object:Gem::Version
175
- version: '0'
176
- type: :runtime
177
- prerelease: false
178
- version_requirements: !ruby/object:Gem::Requirement
179
- requirements:
180
- - - ">="
181
- - !ruby/object:Gem::Version
182
- version: '0'
183
- - !ruby/object:Gem::Dependency
184
- name: httpclient
170
+ name: colorize
185
171
  requirement: !ruby/object:Gem::Requirement
186
172
  requirements:
187
173
  - - ">="
188
174
  - !ruby/object:Gem::Version
189
- version: '0'
175
+ version: 0.7.0
190
176
  type: :runtime
191
177
  prerelease: false
192
178
  version_requirements: !ruby/object:Gem::Requirement
193
179
  requirements:
194
180
  - - ">="
195
181
  - !ruby/object:Gem::Version
196
- version: '0'
182
+ version: 0.7.0
197
183
  - !ruby/object:Gem::Dependency
198
184
  name: github_api
199
185
  requirement: !ruby/object:Gem::Requirement
200
186
  requirements:
201
187
  - - '='
202
188
  - !ruby/object:Gem::Version
203
- version: 0.15.0
189
+ version: 0.18.2
204
190
  type: :runtime
205
191
  prerelease: false
206
192
  version_requirements: !ruby/object:Gem::Requirement
207
193
  requirements:
208
194
  - - '='
209
195
  - !ruby/object:Gem::Version
210
- version: 0.15.0
196
+ version: 0.18.2
211
197
  - !ruby/object:Gem::Dependency
212
- name: rack
198
+ name: highline
213
199
  requirement: !ruby/object:Gem::Requirement
214
200
  requirements:
215
201
  - - ">="
216
202
  - !ruby/object:Gem::Version
217
- version: '1.2'
218
- - - "<"
219
- - !ruby/object:Gem::Version
220
- version: '2'
203
+ version: '0'
221
204
  type: :runtime
222
205
  prerelease: false
223
206
  version_requirements: !ruby/object:Gem::Requirement
224
207
  requirements:
225
208
  - - ">="
226
209
  - !ruby/object:Gem::Version
227
- version: '1.2'
228
- - - "<"
229
- - !ruby/object:Gem::Version
230
- version: '2'
210
+ version: '0'
231
211
  - !ruby/object:Gem::Dependency
232
- name: reenhanced_bitbucket_api
212
+ name: httpclient
233
213
  requirement: !ruby/object:Gem::Requirement
234
214
  requirements:
235
- - - '='
215
+ - - ">="
236
216
  - !ruby/object:Gem::Version
237
- version: 0.3.2
217
+ version: '0'
238
218
  type: :runtime
239
219
  prerelease: false
240
220
  version_requirements: !ruby/object:Gem::Requirement
241
221
  requirements:
242
- - - '='
222
+ - - ">="
243
223
  - !ruby/object:Gem::Version
244
- version: 0.3.2
224
+ version: '0'
245
225
  description: Git Reflow manages your git workflow.
246
226
  email:
247
227
  - dev@reenhanced.com
248
228
  executables:
249
229
  - git-reflow
250
230
  extensions: []
251
- extra_rdoc_files:
252
- - README.rdoc
231
+ extra_rdoc_files: []
253
232
  files:
233
+ - ".github/workflows/multi-ruby-tests.yml"
254
234
  - ".gitignore"
235
+ - ".rubocop.yml"
236
+ - ".ruby-version"
255
237
  - Appraisals
256
238
  - CHANGELOG.md
257
239
  - Gemfile
258
240
  - Gemfile.lock
259
241
  - LICENSE
260
- - README.rdoc
242
+ - README.md
261
243
  - Rakefile
244
+ - Workflow
245
+ - _config.yml
262
246
  - bin/console
263
247
  - bin/setup
264
- - circle.yml
265
248
  - exe/git-reflow
266
249
  - git_reflow.gemspec
267
250
  - lib/git_reflow.rb
268
251
  - lib/git_reflow/base.rb
269
- - lib/git_reflow/commands/deliver.rb
270
- - lib/git_reflow/commands/refresh.rb
271
- - lib/git_reflow/commands/review.rb
272
- - lib/git_reflow/commands/setup.rb
273
- - lib/git_reflow/commands/stage.rb
274
- - lib/git_reflow/commands/start.rb
275
- - lib/git_reflow/commands/status.rb
276
252
  - lib/git_reflow/config.rb
277
253
  - lib/git_reflow/git_helpers.rb
278
254
  - lib/git_reflow/git_server.rb
@@ -284,15 +260,16 @@ files:
284
260
  - lib/git_reflow/git_server/pull_request.rb
285
261
  - lib/git_reflow/logger.rb
286
262
  - lib/git_reflow/merge_error.rb
287
- - lib/git_reflow/os_detector.rb
288
263
  - lib/git_reflow/rspec.rb
289
264
  - lib/git_reflow/rspec/command_line_helpers.rb
290
265
  - lib/git_reflow/rspec/stub_helpers.rb
266
+ - lib/git_reflow/rspec/workflow_helpers.rb
291
267
  - lib/git_reflow/sandbox.rb
292
268
  - lib/git_reflow/version.rb
293
269
  - lib/git_reflow/workflow.rb
270
+ - lib/git_reflow/workflows/FlatMergeWorkflow
294
271
  - lib/git_reflow/workflows/core.rb
295
- - lib/git_reflow/workflows/flat_merge.rb
272
+ - spec/fixtures/authentication_failure.json
296
273
  - spec/fixtures/awesome_workflow.rb
297
274
  - spec/fixtures/git/git_config
298
275
  - spec/fixtures/issues/comment.json.erb
@@ -305,6 +282,7 @@ files:
305
282
  - spec/fixtures/pull_requests/external_pull_request.json
306
283
  - spec/fixtures/pull_requests/pull_request.json
307
284
  - spec/fixtures/pull_requests/pull_request.json.erb
285
+ - spec/fixtures/pull_requests/pull_request_branch_nonexistent_error.json
308
286
  - spec/fixtures/pull_requests/pull_request_exists_error.json
309
287
  - spec/fixtures/pull_requests/pull_requests.json
310
288
  - spec/fixtures/pull_requests/review.json.erb
@@ -313,7 +291,7 @@ files:
313
291
  - spec/fixtures/repositories/commit.json.erb
314
292
  - spec/fixtures/repositories/commits.json.erb
315
293
  - spec/fixtures/repositories/statuses.json
316
- - spec/fixtures/workflow_with_super.rb
294
+ - spec/fixtures/users/user.json
317
295
  - spec/lib/git_reflow/config_spec.rb
318
296
  - spec/lib/git_reflow/git_helpers_spec.rb
319
297
  - spec/lib/git_reflow/git_server/bit_bucket_spec.rb
@@ -343,8 +321,6 @@ post_install_message: |-
343
321
  rdoc_options:
344
322
  - "--title"
345
323
  - git_reflow
346
- - "--main"
347
- - README.rdoc
348
324
  - "-ri"
349
325
  require_paths:
350
326
  - lib
@@ -359,12 +335,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
359
335
  - !ruby/object:Gem::Version
360
336
  version: '0'
361
337
  requirements: []
362
- rubyforge_project:
363
- rubygems_version: 2.6.11
338
+ rubygems_version: 3.1.2
364
339
  signing_key:
365
340
  specification_version: 4
366
341
  summary: A better git process
367
342
  test_files:
343
+ - spec/fixtures/authentication_failure.json
368
344
  - spec/fixtures/awesome_workflow.rb
369
345
  - spec/fixtures/git/git_config
370
346
  - spec/fixtures/issues/comment.json.erb
@@ -377,6 +353,7 @@ test_files:
377
353
  - spec/fixtures/pull_requests/external_pull_request.json
378
354
  - spec/fixtures/pull_requests/pull_request.json
379
355
  - spec/fixtures/pull_requests/pull_request.json.erb
356
+ - spec/fixtures/pull_requests/pull_request_branch_nonexistent_error.json
380
357
  - spec/fixtures/pull_requests/pull_request_exists_error.json
381
358
  - spec/fixtures/pull_requests/pull_requests.json
382
359
  - spec/fixtures/pull_requests/review.json.erb
@@ -385,7 +362,7 @@ test_files:
385
362
  - spec/fixtures/repositories/commit.json.erb
386
363
  - spec/fixtures/repositories/commits.json.erb
387
364
  - spec/fixtures/repositories/statuses.json
388
- - spec/fixtures/workflow_with_super.rb
365
+ - spec/fixtures/users/user.json
389
366
  - spec/lib/git_reflow/config_spec.rb
390
367
  - spec/lib/git_reflow/git_helpers_spec.rb
391
368
  - spec/lib/git_reflow/git_server/bit_bucket_spec.rb