gitx 2.23.1 → 2.23.2.ci.182.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +13 -5
  2. data/.ruby-version +1 -1
  3. data/lib/gitx/cli/cleanup_command.rb +9 -2
  4. data/lib/gitx/version.rb +1 -1
  5. data/spec/gitx/cli/cleanup_command_spec.rb +24 -1
  6. data/spec/gitx/cli/review_command_spec.rb +6 -3
  7. metadata +45 -46
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 0cbd230a5dc27d7c72f6cb4b2c231d61d7b95ae8
4
- data.tar.gz: e91d40448322d6a180a22f98132a8f7819932a93
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ YWQzZjc1ZjM0YzhiMGY0ZGIwNGYzYmM5NWJlYjEyY2VhOTkzOGFkOQ==
5
+ data.tar.gz: !binary |-
6
+ Y2JhNGFmMjYxNWIzYzdkZDNmNzQxOTUyNWE2MDcyN2Y3NTVhZTg2Mg==
5
7
  SHA512:
6
- metadata.gz: eb534f11d45c83b82c1b998aeeaadcf4020a747c0c8e49603d2ea00dd72ad5ecf8f8b28bdd34395d0255bbb6181126a90454e86d82ab7fa12423766a0e90e3e2
7
- data.tar.gz: b05ab739c6b6b2a08a10affd7be46f8dd83769825f04ba0e02744ae59910a4573ffca7d93a5d8f70be240ce35faccaf639019279ecbfb8140039671fe3cb278f
8
+ metadata.gz: !binary |-
9
+ NTEzYWFjZmFlNGVlNGY4MzNjMDI2Njk1N2QyY2E3MTc5YzQyOTJlYzQ5NTFj
10
+ ZjBjOTYwOTdkZmFkYjMxMjcxNzliOGYyMDU1MDQzZmQ1OTkxMzk4NjA3NzQy
11
+ MjE0OWRiN2Y5NjMyZmQ5M2FkNGQxYjVjYzEzMzFhZWZkZDk4ZTM=
12
+ data.tar.gz: !binary |-
13
+ ZmQ4MjNhMjAzY2MxY2FjNzc2M2QzYTk2ODQ3ZjNlOGUzZDVjZWIxMDNlYWM5
14
+ MjRiMTI0NmNkYjE3MmEyMDJiMzllNTcyYWQwYWIxZTU2MWY1NmZkYzhlODdk
15
+ MjY1YTNkOTEwMDJlMTI1MjI4YTJhYWY3MmI2ZDliOGFlZGYzNDE=
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.2.0
1
+ 2.2.3
data/lib/gitx/cli/cleanup_command.rb CHANGED
@@ -29,11 +29,18 @@ module Gitx
29
29
  # @return list of branches that have been merged
30
30
  # filter out reserved and aggregate branches
31
31
  def filtered_merged_branches(source)
32
- merged_branches(source).reject do |branch|
33
- config.reserved_branches.include?(branch) || config.aggregate_branch?(branch)
32
+ merged_branches(source).select do |branch|
33
+ deletable_branch?(branch)
34
34
  end
35
35
  end
36
36
 
37
+ def deletable_branch?(branch)
38
+ return false if config.reserved_branches.include?(branch)
39
+ return false if config.aggregate_branch?(branch)
40
+ return false if config.base_branch == branch
41
+ true
42
+ end
43
+
37
44
  # @return list of branches that have been merged
38
45
  # see http://stackoverflow.com/questions/26804024/git-branch-merged-sha-via-rugged-libgit2-bindings
39
46
  def merged_branches(source)
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.23.1'.freeze
2
+ VERSION = '2.23.2'.freeze
3
3
  end
data/spec/gitx/cli/cleanup_command_spec.rb CHANGED
@@ -69,7 +69,7 @@ describe Gitx::Cli::CleanupCommand do
69
69
  should meet_expectations
70
70
  end
71
71
  end
72
- context 'when mreged remote branches with slash exist' do
72
+ context 'when merged remote branches with slash exist' do
73
73
  let(:remote_branches) do
74
74
  [
75
75
  double(:branch, name: 'origin/merged-remote-feature/review', resolve: reference)
@@ -89,5 +89,28 @@ describe Gitx::Cli::CleanupCommand do
89
89
  should meet_expectations
90
90
  end
91
91
  end
92
+ context 'when merged branch includes the base_branch' do
93
+ let(:base_branch) { 'custom-base-branch' }
94
+ let(:remote_branches) do
95
+ [
96
+ double(:branch, name: "origin/#{base_branch}", resolve: reference)
97
+ ]
98
+ end
99
+ before do
100
+ configuration = cli.send(:config)
101
+ configuration.config[:base_branch] = base_branch
102
+ allow(cli).to receive(:say)
103
+
104
+ expect(executor).to receive(:execute).with('git', 'checkout', base_branch).ordered
105
+ expect(executor).to receive(:execute).with('git', 'pull').ordered
106
+ expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
107
+ expect(executor).to_not receive(:execute).with('git', 'push', 'origin', '--delete', base_branch)
108
+
109
+ cli.cleanup
110
+ end
111
+ it 'does not delete remote branch' do
112
+ should meet_expectations
113
+ end
114
+ end
92
115
  end
93
116
  end
data/spec/gitx/cli/review_command_spec.rb CHANGED
@@ -273,7 +273,8 @@ describe Gitx::Cli::ReviewCommand do
273
273
  let(:github_password) { 'secretz' }
274
274
  let(:authorization_token) { '123981239123' }
275
275
  before do
276
- stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations')
276
+ stub_request(:post, 'https://api.github.com/authorizations')
277
+ .with(basic_auth: ['ryan@codecrate.com', 'secretz'])
277
278
  .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
278
279
 
279
280
  expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password)
@@ -296,7 +297,8 @@ describe Gitx::Cli::ReviewCommand do
296
297
  let(:github_password) { 'secretz' }
297
298
  let(:authorization_token) { '123981239123' }
298
299
  before do
299
- stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations')
300
+ stub_request(:post, 'https://api.github.com/authorizations')
301
+ .with(basic_auth: ['ryan@codecrate.com', 'secretz'])
300
302
  .to_return(status: 401, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
301
303
  .then
302
304
  .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
@@ -343,7 +345,8 @@ describe Gitx::Cli::ReviewCommand do
343
345
  let(:authorization_token) { '123981239123' }
344
346
  let(:two_factor_auth_token) { '456456' }
345
347
  before do
346
- stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations')
348
+ stub_request(:post, 'https://api.github.com/authorizations')
349
+ .with(basic_auth: ['ryan@codecrate.com', 'secretz'])
347
350
  .with(headers: { 'X-GitHub-OTP' => two_factor_auth_token })
348
351
  .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
349
352
 
metadata CHANGED
@@ -1,237 +1,237 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitx
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.23.1
4
+ version: 2.23.2.ci.182.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-18 00:00:00.000000000 Z
11
+ date: 2016-05-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
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.24.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.24.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
@@ -328,17 +328,17 @@ require_paths:
328
328
  - lib
329
329
  required_ruby_version: !ruby/object:Gem::Requirement
330
330
  requirements:
331
- - - ">="
331
+ - - ! '>='
332
332
  - !ruby/object:Gem::Version
333
333
  version: '0'
334
334
  required_rubygems_version: !ruby/object:Gem::Requirement
335
335
  requirements:
336
- - - ">="
336
+ - - ! '>'
337
337
  - !ruby/object:Gem::Version
338
- version: '0'
338
+ version: 1.3.1
339
339
  requirements: []
340
340
  rubyforge_project:
341
- rubygems_version: 2.4.8
341
+ rubygems_version: 2.4.5
342
342
  signing_key:
343
343
  specification_version: 4
344
344
  summary: Utility scripts for Git to increase productivity for common operations
@@ -367,4 +367,3 @@ test_files:
367
367
  - spec/support/timecop.rb
368
368
  - spec/support/vcr.rb
369
369
  - spec/support/webmock.rb
370
- has_rdoc: