gitx 2.18.0 → 2.19.0.ci.112.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +13 -5
  2. data/lib/gitx/cli/integrate_command.rb +0 -6
  3. data/lib/gitx/version.rb +1 -1
  4. data/spec/gitx/cli/integrate_command_spec.rb +0 -21
  5. metadata +44 -45
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 7c5bcc794880b384854199310b6b730e200a80de
4
- data.tar.gz: 1b965ff6b91f32664916f1f5e2999259f6c94ecc
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZjA4NTlmYjQwNWJiZmJkNzVmZTYxZDI1MGVhNDQ5MjEyZTVlZjRiYw==
5
+ data.tar.gz: !binary |-
6
+ MGRjMGI1ZTBhY2U4M2RjN2U1ODgxZWQxMTczMDJlZmY2MGJiN2I3Nw==
5
7
  SHA512:
6
- metadata.gz: 4aa55086d46fd42882103b8d675caa96651288a49f4781242dca1c10f05ad570a069d7e297f5669c888cdb19409ca1bb8febf5345b73e57324de74754d4d7105
7
- data.tar.gz: 08ace7efaf75bcd14ce14b5d3d0b57ca97dc6d8675c0ec6105aad9e8a938688a280e6afb8e9a2dec7f7bec6e05138898c6a968d5471cccb2c357ede15584a410
8
+ metadata.gz: !binary |-
9
+ YmRlODlmNjFmMzYyNjgxY2NhNjM2ODliZWVkZjY0NjE3MmJjYjFmZTY5M2E4
10
+ YjU1OGY3ZmM2OTViN2E2Nzg4NDg2NTdkZDIzMWU1NjJiNDM1Y2FhZDAwOGQ5
11
+ M2Y1ZDVlNTNiNTdhMzE0YmFhYmIzNWJjNTA2MmFjNDIzYTk2MTM=
12
+ data.tar.gz: !binary |-
13
+ NTVkYzU1NjQ5MDE5MWY4YTc4YjA2MDU0ZDA4YzBiMGI0Y2UxMmNiMDVlZDJl
14
+ MjZjNmZiMGM4ZjRhYjkyYzNkZWM2NTIyODJjZjU1MDUxMTRlZWQzN2I4OGNl
15
+ MGZhYjBjODg5MjE2YjYwZGQwODgxOGU4YWNlYzYxMGY5N2QyMjI=
data/lib/gitx/cli/integrate_command.rb CHANGED
@@ -25,7 +25,6 @@ module Gitx
25
25
  pull_request = pull_request_for_branch(branch)
26
26
  integrate_branch(branch, integration_branch, pull_request) unless options[:resume]
27
27
  checkout_branch branch
28
- create_integrate_comment(pull_request) if pull_request
29
28
  end
30
29
 
31
30
  private
@@ -89,11 +88,6 @@ module Gitx
89
88
  repo.create_branch(target_branch, Gitx::BASE_BRANCH)
90
89
  run_cmd "git push origin #{target_branch}:#{target_branch}"
91
90
  end
92
-
93
- def create_integrate_comment(pull_request)
94
- comment = '[gitx] integrated into staging :twisted_rightwards_arrows:'
95
- github_client.add_comment(github_slug, pull_request.number, comment)
96
- end
97
91
  end
98
92
  end
99
93
  end
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.18.0'
2
+ VERSION = '2.19.0'
3
3
  end
data/spec/gitx/cli/integrate_command_spec.rb CHANGED
@@ -38,8 +38,6 @@ describe Gitx::Cli::IntegrateCommand do
38
38
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
39
39
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
40
40
 
41
- stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
42
-
43
41
  VCR.use_cassette('pull_request_does_exist_with_success_status') do
44
42
  cli.integrate
45
43
  end
@@ -47,10 +45,6 @@ describe Gitx::Cli::IntegrateCommand do
47
45
  it 'defaults to staging branch' do
48
46
  should meet_expectations
49
47
  end
50
- it 'posts comment to pull request' do
51
- expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
52
- .with(body: { body: '[gitx] integrated into staging :twisted_rightwards_arrows:' })
53
- end
54
48
  end
55
49
  context 'when current_branch == master' do
56
50
  let(:current_branch) { double('fake branch', name: 'master', head?: true) }
@@ -71,9 +65,6 @@ describe Gitx::Cli::IntegrateCommand do
71
65
  it 'does not create pull request' do
72
66
  expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
73
67
  end
74
- it 'does not post comment on pull request' do
75
- expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
76
- end
77
68
  end
78
69
  context 'when a pull request doesnt exist for the feature-branch' do
79
70
  let(:changelog) { '* made some fixes' }
@@ -101,7 +92,6 @@ describe Gitx::Cli::IntegrateCommand do
101
92
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
102
93
 
103
94
  stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
104
- stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(status: 201)
105
95
 
106
96
  VCR.use_cassette('pull_request_does_not_exist') do
107
97
  cli.integrate
@@ -110,10 +100,6 @@ describe Gitx::Cli::IntegrateCommand do
110
100
  it 'creates github pull request' do
111
101
  should meet_expectations
112
102
  end
113
- it 'creates github comment for integration' do
114
- expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
115
- .with(body: { body: '[gitx] integrated into staging :twisted_rightwards_arrows:' })
116
- end
117
103
  it 'runs expected commands' do
118
104
  should meet_expectations
119
105
  end
@@ -134,8 +120,6 @@ describe Gitx::Cli::IntegrateCommand do
134
120
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
135
121
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
136
122
 
137
- stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
138
-
139
123
  VCR.use_cassette('pull_request_does_exist_with_success_status') do
140
124
  cli.integrate
141
125
  end
@@ -156,8 +140,6 @@ describe Gitx::Cli::IntegrateCommand do
156
140
  expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
157
141
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
158
142
 
159
- stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
160
-
161
143
  VCR.use_cassette('pull_request_does_exist_with_success_status') do
162
144
  cli.integrate 'prototype'
163
145
  end
@@ -214,8 +196,6 @@ describe Gitx::Cli::IntegrateCommand do
214
196
  expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
215
197
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch')
216
198
 
217
- stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
218
-
219
199
  VCR.use_cassette('pull_request_does_exist_with_success_status') do
220
200
  cli.integrate
221
201
  end
@@ -239,7 +219,6 @@ describe Gitx::Cli::IntegrateCommand do
239
219
  expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
240
220
  expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
241
221
 
242
- stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
243
222
  VCR.use_cassette('pull_request_does_exist_with_success_status') do
244
223
  cli.integrate
245
224
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitx
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.18.0
4
+ version: 2.19.0.ci.112.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
@@ -14,224 +14,224 @@ dependencies:
14
14
  name: rugged
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.23.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.23.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: octokit
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
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
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - ! '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '3.0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '3.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - ! '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - ! '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: webmock
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '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
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: timecop
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - ! '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - ! '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: vcr
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - ! '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - ! '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: guard
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - ! '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - ! '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: guard-rspec
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - ! '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: coveralls
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - ! '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - ! '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: terminal-notifier
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - ! '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - ! '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: terminal-notifier-guard
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - ! '>='
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - ! '>='
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rubocop
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - ">="
227
+ - - ! '>='
228
228
  - !ruby/object:Gem::Version
229
229
  version: '0'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - ">="
234
+ - - ! '>='
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  description: Git eXtensions for improved development workflows
@@ -251,13 +251,13 @@ executables:
251
251
  extensions: []
252
252
  extra_rdoc_files: []
253
253
  files:
254
- - ".gitignore"
255
- - ".gitx.yml"
256
- - ".hound.yml"
257
- - ".rspec"
258
- - ".rubocop.yml"
259
- - ".ruby-version"
260
- - ".travis.yml"
254
+ - .gitignore
255
+ - .gitx.yml
256
+ - .hound.yml
257
+ - .rspec
258
+ - .rubocop.yml
259
+ - .ruby-version
260
+ - .travis.yml
261
261
  - CONTRIBUTING.md
262
262
  - Gemfile
263
263
  - Guardfile
@@ -326,17 +326,17 @@ require_paths:
326
326
  - lib
327
327
  required_ruby_version: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - ">="
329
+ - - ! '>='
330
330
  - !ruby/object:Gem::Version
331
331
  version: '0'
332
332
  required_rubygems_version: !ruby/object:Gem::Requirement
333
333
  requirements:
334
- - - ">="
334
+ - - ! '>'
335
335
  - !ruby/object:Gem::Version
336
- version: '0'
336
+ version: 1.3.1
337
337
  requirements: []
338
338
  rubyforge_project:
339
- rubygems_version: 2.4.8
339
+ rubygems_version: 2.4.5
340
340
  signing_key:
341
341
  specification_version: 4
342
342
  summary: Utility scripts for Git to increase productivity for common operations
@@ -364,4 +364,3 @@ test_files:
364
364
  - spec/support/timecop.rb
365
365
  - spec/support/vcr.rb
366
366
  - spec/support/webmock.rb
367
- has_rdoc: