git_helper 3.1.2 → 3.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +8 -7
- data/Guardfile +1 -1
- data/lib/git_helper/local_code.rb +1 -1
- data/lib/git_helper/version.rb +1 -1
- data/plugins.zip +0 -0
- data/spec/git_helper/change_remote_spec.rb +1 -0
- data/spec/git_helper/code_request_spec.rb +1 -0
- data/spec/git_helper/local_code_spec.rb +1 -0
- data/spec/git_helper/merge_request_spec.rb +15 -5
- data/spec/git_helper/new_branch_spec.rb +1 -0
- data/spec/git_helper/pull_request_spec.rb +5 -4
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f85140fd3f9789ce420906994b5918e2fbb1318691829977c5234dbbb6be4867
|
4
|
+
data.tar.gz: 63cf9ee23e0d32e829c738feb4fcc5d195c034cd814e4ed1af109ff10984be6d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e28dcdae4082f67e060fa3aa2f31e600103a6abc50daa8f0b349034aaed9cbdfed0231ed1b9a75374483e2a37753b2482905d82c3150210af8e567ea3e6b2ac4
|
7
|
+
data.tar.gz: 3bc7be22d5bd115e7cd1d565cc0814d181f4ded6826d4aee8e58d0ba05a4d2fb773fbfa2486fab144a05780b60f846bd524ad408758677c9fad4776196931481
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
git_helper (3.
|
4
|
+
git_helper (3.1.3)
|
5
5
|
gitlab (~> 4.16)
|
6
6
|
gli (~> 2.13)
|
7
7
|
highline (~> 2.0)
|
@@ -15,15 +15,15 @@ GEM
|
|
15
15
|
coderay (1.1.3)
|
16
16
|
concurrent-ruby (1.1.7)
|
17
17
|
diff-lcs (1.4.4)
|
18
|
-
faker (2.
|
18
|
+
faker (2.15.1)
|
19
19
|
i18n (>= 1.6, < 2)
|
20
20
|
faraday (1.1.0)
|
21
21
|
multipart-post (>= 1.2, < 3)
|
22
22
|
ruby2_keywords
|
23
23
|
ffi (1.13.1)
|
24
24
|
formatador (0.2.5)
|
25
|
-
gitlab (4.
|
26
|
-
httparty (~> 0.
|
25
|
+
gitlab (4.17.0)
|
26
|
+
httparty (~> 0.18)
|
27
27
|
terminal-table (~> 1.5, >= 1.5.1)
|
28
28
|
gli (2.19.2)
|
29
29
|
guard (2.16.2)
|
@@ -46,7 +46,7 @@ GEM
|
|
46
46
|
multi_xml (>= 0.5.2)
|
47
47
|
i18n (1.8.5)
|
48
48
|
concurrent-ruby (~> 1.0)
|
49
|
-
listen (3.
|
49
|
+
listen (3.3.3)
|
50
50
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
51
51
|
rb-inotify (~> 0.9, >= 0.9.10)
|
52
52
|
lumberjack (1.2.8)
|
@@ -96,9 +96,10 @@ GEM
|
|
96
96
|
|
97
97
|
PLATFORMS
|
98
98
|
ruby
|
99
|
+
x86_64-darwin-19
|
99
100
|
|
100
101
|
DEPENDENCIES
|
101
|
-
bundler (~> 2.
|
102
|
+
bundler (~> 2.2)
|
102
103
|
faker
|
103
104
|
git_helper!
|
104
105
|
guard-rspec (~> 4.3)
|
@@ -106,4 +107,4 @@ DEPENDENCIES
|
|
106
107
|
rspec (~> 3.9)
|
107
108
|
|
108
109
|
BUNDLED WITH
|
109
|
-
2.
|
110
|
+
2.2.0
|
data/Guardfile
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
guard :rspec, cmd: 'bundle exec rspec', all_on_start: true
|
1
|
+
guard :rspec, cmd: 'bundle exec rspec', all_on_start: true do
|
2
2
|
watch(%r{^spec/.+_spec\.rb$})
|
3
3
|
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
|
4
4
|
watch('spec/spec_helper.rb') { 'spec' }
|
data/lib/git_helper/version.rb
CHANGED
data/plugins.zip
CHANGED
Binary file
|
@@ -13,6 +13,7 @@ describe GitHelper::CodeRequest do
|
|
13
13
|
before do
|
14
14
|
allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
|
15
15
|
allow(GitHelper::HighlineCli).to receive(:new).and_return(highline_cli)
|
16
|
+
allow(subject).to receive(:puts)
|
16
17
|
end
|
17
18
|
|
18
19
|
describe '#create' do
|
@@ -70,6 +70,7 @@ describe GitHelper::LocalCode do
|
|
70
70
|
|
71
71
|
describe '#change_remote' do
|
72
72
|
it 'should return a string' do
|
73
|
+
allow(subject).to receive(:`).and_return(Faker::Lorem.word)
|
73
74
|
expect(subject.change_remote(Faker::Lorem.word, Faker::Internet.url)).to be_a(String)
|
74
75
|
end
|
75
76
|
end
|
@@ -6,6 +6,15 @@ describe GitHelper::GitLabMergeRequest do
|
|
6
6
|
let(:highline_cli) { double(:highline_cli) }
|
7
7
|
let(:gitlab_client_client) { double(:gitlab_client_client, project: :project, merge_request: :merge_request, create_merge_request: :created) }
|
8
8
|
let(:gitlab_client) { double(:gitlab_client, client: gitlab_client_client) }
|
9
|
+
let(:diff_refs) { double(:diff_refs, base_sha: :base, head_sha: :head) }
|
10
|
+
|
11
|
+
let(:merge_request) do
|
12
|
+
double(:merge_request,
|
13
|
+
diff_refs: diff_refs,
|
14
|
+
web_url: Faker::Internet.url,
|
15
|
+
merge_commit_sha: Faker::Internet.password
|
16
|
+
)
|
17
|
+
end
|
9
18
|
|
10
19
|
let(:options) do
|
11
20
|
{
|
@@ -20,6 +29,7 @@ describe GitHelper::GitLabMergeRequest do
|
|
20
29
|
|
21
30
|
before do
|
22
31
|
allow(GitHelper::GitLabClient).to receive(:new).and_return(gitlab_client)
|
32
|
+
allow(subject).to receive(:puts)
|
23
33
|
end
|
24
34
|
|
25
35
|
describe '#create' do
|
@@ -27,7 +37,7 @@ describe GitHelper::GitLabMergeRequest do
|
|
27
37
|
allow(subject).to receive(:squash_merge_request).and_return(true)
|
28
38
|
allow(subject).to receive(:remove_source_branch).and_return(false)
|
29
39
|
allow(subject).to receive(:new_mr_body).and_return('')
|
30
|
-
expect(gitlab_client_client).to receive(:create_merge_request)
|
40
|
+
expect(gitlab_client_client).to receive(:create_merge_request).and_return(merge_request)
|
31
41
|
subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
|
32
42
|
end
|
33
43
|
|
@@ -35,7 +45,7 @@ describe GitHelper::GitLabMergeRequest do
|
|
35
45
|
expect(subject).to receive(:squash_merge_request).and_return(true)
|
36
46
|
expect(subject).to receive(:remove_source_branch).and_return(false)
|
37
47
|
expect(subject).to receive(:new_mr_body).and_return('')
|
38
|
-
allow(gitlab_client_client).to receive(:create_merge_request)
|
48
|
+
allow(gitlab_client_client).to receive(:create_merge_request).and_return(merge_request)
|
39
49
|
subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
|
40
50
|
end
|
41
51
|
|
@@ -52,14 +62,14 @@ describe GitHelper::GitLabMergeRequest do
|
|
52
62
|
it 'should call the gitlab client to merge' do
|
53
63
|
allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
|
54
64
|
allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
|
55
|
-
expect(gitlab_client_client).to receive(:accept_merge_request)
|
65
|
+
expect(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
|
56
66
|
subject.merge
|
57
67
|
end
|
58
68
|
|
59
69
|
it 'should call various other methods' do
|
60
70
|
expect(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title')).at_least(:once)
|
61
71
|
expect(subject).to receive(:mr_id).and_return(Faker::Number.number).at_least(:once)
|
62
|
-
allow(gitlab_client_client).to receive(:accept_merge_request)
|
72
|
+
allow(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
|
63
73
|
subject.merge
|
64
74
|
end
|
65
75
|
|
@@ -73,7 +83,7 @@ describe GitHelper::GitLabMergeRequest do
|
|
73
83
|
it 'should try to merge multiple times if the first merge errors' do
|
74
84
|
allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
|
75
85
|
allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
|
76
|
-
expect(gitlab_client_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil)).exactly(2).times
|
86
|
+
expect(gitlab_client_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil, merge_error: Faker::Lorem.word)).exactly(2).times
|
77
87
|
expect(subject.merge).to eq(nil)
|
78
88
|
end
|
79
89
|
end
|
@@ -11,6 +11,7 @@ describe GitHelper::NewBranch do
|
|
11
11
|
before do
|
12
12
|
allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
|
13
13
|
allow(GitHelper::HighlineCli).to receive(:new).and_return(cli)
|
14
|
+
allow(subject).to receive(:puts)
|
14
15
|
end
|
15
16
|
|
16
17
|
it 'should call GitHelper::LocalCode' do
|
@@ -20,18 +20,19 @@ describe GitHelper::GitHubPullRequest do
|
|
20
20
|
|
21
21
|
before do
|
22
22
|
allow(GitHelper::OctokitClient).to receive(:new).and_return(octokit_client)
|
23
|
+
allow(subject).to receive(:puts)
|
23
24
|
end
|
24
25
|
|
25
26
|
describe '#create' do
|
26
27
|
it 'should call the octokit client to create' do
|
27
28
|
allow(subject).to receive(:new_pr_body).and_return('')
|
28
|
-
expect(octokit_client_client).to receive(:create_pull_request)
|
29
|
+
expect(octokit_client_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
|
29
30
|
subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
|
30
31
|
end
|
31
32
|
|
32
33
|
it 'should call various other methods' do
|
33
34
|
expect(subject).to receive(:new_pr_body).and_return('').at_least(:once)
|
34
|
-
allow(octokit_client_client).to receive(:create_pull_request)
|
35
|
+
allow(octokit_client_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
|
35
36
|
subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
|
36
37
|
end
|
37
38
|
|
@@ -47,7 +48,7 @@ describe GitHelper::GitHubPullRequest do
|
|
47
48
|
allow(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word))
|
48
49
|
allow(subject).to receive(:merge_method).and_return('rebase')
|
49
50
|
allow(subject).to receive(:pr_id).and_return(Faker::Number.number)
|
50
|
-
expect(octokit_client_client).to receive(:merge_pull_request)
|
51
|
+
expect(octokit_client_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
|
51
52
|
subject.merge
|
52
53
|
end
|
53
54
|
|
@@ -55,7 +56,7 @@ describe GitHelper::GitHubPullRequest do
|
|
55
56
|
expect(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word)).at_least(:once)
|
56
57
|
expect(subject).to receive(:merge_method).and_return('rebase').at_least(:once)
|
57
58
|
expect(subject).to receive(:pr_id).and_return(Faker::Number.number).at_least(:once)
|
58
|
-
allow(octokit_client_client).to receive(:merge_pull_request)
|
59
|
+
allow(octokit_client_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
|
59
60
|
subject.merge
|
60
61
|
end
|
61
62
|
|
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.1.
|
4
|
+
version: 3.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Emma Sax
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-12-
|
11
|
+
date: 2020-12-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gitlab
|
@@ -72,14 +72,14 @@ dependencies:
|
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '2.
|
75
|
+
version: '2.2'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '2.
|
82
|
+
version: '2.2'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: faker
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|