geet 0.3.11 → 0.3.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.byebug_history +5 -0
- data/geet.gemspec +1 -1
- data/lib/geet/git/repository.rb +2 -2
- data/lib/geet/github/pr.rb +2 -2
- data/lib/geet/gitlab/pr.rb +16 -1
- data/lib/geet/services/merge_pr.rb +6 -6
- data/lib/geet/utils/git_client.rb +4 -0
- data/lib/geet/version.rb +1 -1
- data/spec/integration/merge_pr_spec.rb +22 -16
- data/spec/vcr_cassettes/create_issue.yml +2 -2
- data/spec/vcr_cassettes/github_com/create_pr.yml +2 -2
- data/spec/vcr_cassettes/github_com/create_pr_upstream.yml +1 -1
- data/spec/vcr_cassettes/github_com/create_pr_upstream_without_write_permissions.yml +1 -1
- data/spec/vcr_cassettes/github_com/list_issues_with_assignee.yml +3 -3
- data/spec/vcr_cassettes/github_com/merge_pr.yml +35 -34
- data/spec/vcr_cassettes/github_com/merge_pr_with_branch_deletion.yml +48 -45
- data/spec/vcr_cassettes/gitlab_com/merge_pr.yml +24 -24
- metadata +3 -2
|
@@ -25,18 +25,18 @@ http_interactions:
|
|
|
25
25
|
Server:
|
|
26
26
|
- nginx
|
|
27
27
|
Date:
|
|
28
|
-
-
|
|
28
|
+
- Mon, 25 Mar 2019 11:44:35 GMT
|
|
29
29
|
Content-Type:
|
|
30
30
|
- application/json
|
|
31
31
|
Content-Length:
|
|
32
|
-
- '
|
|
32
|
+
- '1188'
|
|
33
33
|
Cache-Control:
|
|
34
34
|
- max-age=0, private, must-revalidate
|
|
35
35
|
Etag:
|
|
36
|
-
- W/"
|
|
36
|
+
- W/"ed3d49f8811d744a6429bb3c90f615d6"
|
|
37
37
|
Link:
|
|
38
|
-
- <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?id=donaldduck%2Ftestproject&order_by=created_at&page=1&per_page=20&sort=desc&source_branch=mybranch&state=
|
|
39
|
-
rel="first", <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?id=donaldduck%2Ftestproject&order_by=created_at&page=1&per_page=20&sort=desc&source_branch=mybranch&state=
|
|
38
|
+
- <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?id=donaldduck%2Ftestproject&order_by=created_at&page=1&per_page=20&sort=desc&source_branch=mybranch&state=opened>;
|
|
39
|
+
rel="first", <https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests?id=donaldduck%2Ftestproject&order_by=created_at&page=1&per_page=20&sort=desc&source_branch=mybranch&state=opened>;
|
|
40
40
|
rel="last"
|
|
41
41
|
Vary:
|
|
42
42
|
- Origin
|
|
@@ -53,9 +53,9 @@ http_interactions:
|
|
|
53
53
|
X-Prev-Page:
|
|
54
54
|
- ''
|
|
55
55
|
X-Request-Id:
|
|
56
|
-
-
|
|
56
|
+
- cX2JhRXZHh3
|
|
57
57
|
X-Runtime:
|
|
58
|
-
- '0.
|
|
58
|
+
- '0.074870'
|
|
59
59
|
X-Total:
|
|
60
60
|
- '1'
|
|
61
61
|
X-Total-Pages:
|
|
@@ -69,18 +69,18 @@ http_interactions:
|
|
|
69
69
|
Ratelimit-Remaining:
|
|
70
70
|
- '599'
|
|
71
71
|
Ratelimit-Reset:
|
|
72
|
-
- '
|
|
72
|
+
- '1553514335'
|
|
73
73
|
Ratelimit-Resettime:
|
|
74
|
-
-
|
|
74
|
+
- Tue, 25 Mar 2019 11:45:35 GMT
|
|
75
75
|
body:
|
|
76
76
|
encoding: UTF-8
|
|
77
|
-
string: '[{"id":
|
|
78
|
-
Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"assignee":null,"source_project_id":1234569,"target_project_id":1234569,"labels":[],"work_in_progress":false,"milestone":null,"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"
|
|
77
|
+
string: '[{"id":12345690,"iid":4,"project_id":1234569,"title":"Delete pizza","description":"","state":"opened","created_at":"2019-03-25T11:44:15.881Z","updated_at":"2019-03-25T11:44:15.881Z","merged_by":null,"merged_at":null,"closed_by":null,"closed_at":null,"target_branch":"master","source_branch":"mybranch","user_notes_count":0,"upvotes":0,"downvotes":0,"author":{"id":1234561,"name":"Donald
|
|
78
|
+
Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"assignee":null,"source_project_id":1234569,"target_project_id":1234569,"labels":[],"work_in_progress":false,"milestone":null,"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"9a845eec03092a38707eaecaa0a1d71aa05a1bff","merge_commit_sha":null,"discussion_locked":null,"should_remove_source_branch":null,"force_remove_source_branch":false,"web_url":"https://gitlab.com/donaldduck/testproject/merge_requests/4","time_stats":{"time_estimate":0,"total_time_spent":0,"human_time_estimate":null,"human_total_time_spent":null},"squash":false,"approvals_before_merge":null}]'
|
|
79
79
|
http_version:
|
|
80
|
-
recorded_at:
|
|
80
|
+
recorded_at: Mon, 25 Mar 2019 11:44:35 GMT
|
|
81
81
|
- request:
|
|
82
82
|
method: put
|
|
83
|
-
uri: https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests/
|
|
83
|
+
uri: https://gitlab.com/api/v4/projects/donaldduck%2Ftestproject/merge_requests/4/merge
|
|
84
84
|
body:
|
|
85
85
|
encoding: UTF-8
|
|
86
86
|
string: ''
|
|
@@ -103,15 +103,15 @@ http_interactions:
|
|
|
103
103
|
Server:
|
|
104
104
|
- nginx
|
|
105
105
|
Date:
|
|
106
|
-
-
|
|
106
|
+
- Mon, 25 Mar 2019 11:44:37 GMT
|
|
107
107
|
Content-Type:
|
|
108
108
|
- application/json
|
|
109
109
|
Content-Length:
|
|
110
|
-
- '
|
|
110
|
+
- '1855'
|
|
111
111
|
Cache-Control:
|
|
112
112
|
- max-age=0, private, must-revalidate
|
|
113
113
|
Etag:
|
|
114
|
-
- W/"
|
|
114
|
+
- W/"0953f932a542fa60616d9cd2eb521226"
|
|
115
115
|
Vary:
|
|
116
116
|
- Origin
|
|
117
117
|
X-Content-Type-Options:
|
|
@@ -119,9 +119,9 @@ http_interactions:
|
|
|
119
119
|
X-Frame-Options:
|
|
120
120
|
- SAMEORIGIN
|
|
121
121
|
X-Request-Id:
|
|
122
|
-
-
|
|
122
|
+
- EtYFTByIBFa
|
|
123
123
|
X-Runtime:
|
|
124
|
-
- '1.
|
|
124
|
+
- '1.315189'
|
|
125
125
|
Strict-Transport-Security:
|
|
126
126
|
- max-age=31536000
|
|
127
127
|
Ratelimit-Limit:
|
|
@@ -131,14 +131,14 @@ http_interactions:
|
|
|
131
131
|
Ratelimit-Remaining:
|
|
132
132
|
- '598'
|
|
133
133
|
Ratelimit-Reset:
|
|
134
|
-
- '
|
|
134
|
+
- '1553514337'
|
|
135
135
|
Ratelimit-Resettime:
|
|
136
|
-
-
|
|
136
|
+
- Tue, 25 Mar 2019 11:45:37 GMT
|
|
137
137
|
body:
|
|
138
138
|
encoding: UTF-8
|
|
139
|
-
string: '{"id":
|
|
140
|
-
Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"
|
|
141
|
-
Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"
|
|
139
|
+
string: '{"id":12345690,"iid":4,"project_id":1234569,"title":"Delete pizza","description":"","state":"merged","created_at":"2019-03-25T11:44:15.881Z","updated_at":"2019-03-25T11:44:37.343Z","merged_by":{"id":1234561,"name":"Donald
|
|
140
|
+
Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"merged_at":"2019-03-25T11:44:37.381Z","closed_by":null,"closed_at":null,"target_branch":"master","source_branch":"mybranch","user_notes_count":0,"upvotes":0,"downvotes":0,"author":{"id":1234561,"name":"Donald
|
|
141
|
+
Duck","username":"donaldduck","state":"active","avatar_url":"https://secure.gravatar.com/avatar/0123456789abcdef05ea2797cb94a5b0?s=80\u0026d=identicon","web_url":"https://gitlab.com/donaldduck"},"assignee":null,"source_project_id":1234569,"target_project_id":1234569,"labels":[],"work_in_progress":false,"milestone":null,"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"9a845eec03092a38707eaecaa0a1d71aa05a1bff","merge_commit_sha":"f2bfcfaaad7211e42662978616ca655c5200f8e0","discussion_locked":null,"should_remove_source_branch":null,"force_remove_source_branch":false,"web_url":"https://gitlab.com/donaldduck/testproject/merge_requests/4","time_stats":{"time_estimate":0,"total_time_spent":0,"human_time_estimate":null,"human_total_time_spent":null},"squash":false,"subscribed":true,"changes_count":"1","latest_build_started_at":null,"latest_build_finished_at":null,"first_deployed_to_production_at":null,"pipeline":null,"diff_refs":{"base_sha":"619b12ce4162cf7bb30c5e64f860ba14318f3098","head_sha":"9a845eec03092a38707eaecaa0a1d71aa05a1bff","start_sha":"619b12ce4162cf7bb30c5e64f860ba14318f3098"},"merge_error":null,"user":{"can_merge":true},"approvals_before_merge":null}'
|
|
142
142
|
http_version:
|
|
143
|
-
recorded_at:
|
|
143
|
+
recorded_at: Mon, 25 Mar 2019 11:44:37 GMT
|
|
144
144
|
recorded_with: VCR 3.0.3
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: geet
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Saverio Miroddi
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-03-
|
|
11
|
+
date: 2019-03-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: simple_scripting
|
|
@@ -61,6 +61,7 @@ executables:
|
|
|
61
61
|
extensions: []
|
|
62
62
|
extra_rdoc_files: []
|
|
63
63
|
files:
|
|
64
|
+
- ".byebug_history"
|
|
64
65
|
- ".gitignore"
|
|
65
66
|
- ".rspec"
|
|
66
67
|
- ".rubocop.yml"
|