gitx 2.21.4 → 2.21.5.ci.151.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/lib/gitx/github.rb +1 -1
  3. data/lib/gitx/version.rb +1 -1
  4. data/spec/gitx/cli/integrate_command_spec.rb +1 -1
  5. data/spec/gitx/cli/release_command_spec.rb +1 -1
  6. data/spec/gitx/cli/review_command_spec.rb +2 -2
  7. metadata +44 -45
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: d622975c5afcafe5791e9e0b9dbae6fee810244d
4
- data.tar.gz: a6510f938edad25e3305de25b10313be9e6e52d1
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZDc2OTJlZmFhY2FhMDJjNjFjYTM0NDIxODkzYmNmMzZhZmM1NzNlYg==
5
+ data.tar.gz: !binary |-
6
+ YzU5NWYxZDIwNGUxYmExNWI1NTYxYmYzN2JmZWY3NDVjNWE3YWYxZg==
5
7
  SHA512:
6
- metadata.gz: 2169e08159695870b3558025a6c37d80da8ec502ccae1a5fcab13d7680c74f8cfd9a59cf23f87fea9e6d8ba1af8567712409619e4df8c70f1cea19a17980501a
7
- data.tar.gz: f7818f0867c24fc08b3a87826ded627e4f91f4ace47e9ace846fc541290f029c5290e41a27b86c7be8d63105099114b735463994446a55a8deb4458891d13c08
8
+ metadata.gz: !binary |-
9
+ NDNjMWNhZTU0MTk2ZWFmNWQwZjU3MGU3YzkzOGEzNjRlYzdiODUwZmM4M2Vj
10
+ MTE4MDJjYWIyMmQ2YzEwYWQ2ZDEwODcxNDE4YTA5ZjRhN2RhODNlOWI2NWY1
11
+ MDgyNjM4ZGFmMDIwMTAzODZhZDU3NTgyZDgzNDM4OTU3ZGIzYzE=
12
+ data.tar.gz: !binary |-
13
+ ZWEyMWQ5MTZkMzhmMjRhMzMwNDdhMGU1YmE4M2U4MjJkYWRlZTMxOGExNDUw
14
+ YjlmNDhiNGEzODQxNjg5NWYzNjVlODk4NTA0OGVmNzM2ZWJjZWM3YmZiZDdh
15
+ MTBmMTQxYzA3MTgwN2VjYjQ2ZGNiMmYzZmYyYjJiNGQyMGMxNjM=
data/lib/gitx/github.rb CHANGED
@@ -72,7 +72,7 @@ module Gitx
72
72
  end
73
73
 
74
74
  def pull_request_body(branch)
75
- changelog = run_git_cmd('log', "#{config.base_branch}...#{branch}", '--reverse', '--no-merges', "--pretty=format:'* %B'")
75
+ changelog = run_git_cmd('log', "origin/#{config.base_branch}...#{branch}", '--reverse', '--no-merges', "--pretty=format:* %B")
76
76
  description = options[:description]
77
77
 
78
78
  description_template = []
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.21.4'
2
+ VERSION = '2.21.5'
3
3
  end
data/spec/gitx/cli/integrate_command_spec.rb CHANGED
@@ -84,7 +84,7 @@ describe Gitx::Cli::IntegrateCommand do
84
84
  expect(executor).to receive(:execute).with('git', 'update').ordered
85
85
  expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
86
86
  expect(executor).to receive(:execute).with('git', 'update').ordered
87
- expect(executor).to receive(:execute).with('git', 'log', 'master...feature-branch', '--reverse', '--no-merges', "--pretty=format:'* %B'").and_return(changelog).ordered
87
+ expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', "--pretty=format:* %B").and_return(changelog).ordered
88
88
  expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
89
89
  expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
90
90
  expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
data/spec/gitx/cli/release_command_spec.rb CHANGED
@@ -152,7 +152,7 @@ describe Gitx::Cli::ReleaseCommand do
152
152
  expect(executor).to receive(:execute).with('git', 'update').ordered
153
153
  expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
154
154
  expect(executor).to receive(:execute).with('git', 'update').ordered
155
- expect(executor).to receive(:execute).with('git', 'log', 'master...feature-branch', '--reverse', '--no-merges', "--pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
155
+ expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', "--pretty=format:* %B").and_return('2013-01-01 did some stuff').ordered
156
156
  expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
157
157
  expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
158
158
  expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered
data/spec/gitx/cli/review_command_spec.rb CHANGED
@@ -46,7 +46,7 @@ describe Gitx::Cli::ReviewCommand do
46
46
  allow(cli).to receive(:authorization_token).and_return(authorization_token)
47
47
  expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
48
48
  expect(executor).to receive(:execute).with('git', 'update').ordered
49
- expect(executor).to receive(:execute).with('git', 'log', 'master...feature-branch', '--reverse', '--no-merges', "--pretty=format:'* %B'").and_return(changelog).ordered
49
+ expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', "--pretty=format:* %B").and_return(changelog).ordered
50
50
  expect(cli).to receive(:ask_editor).with(changelog, hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return('description')
51
51
 
52
52
  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' })
@@ -82,7 +82,7 @@ describe Gitx::Cli::ReviewCommand do
82
82
  allow(cli).to receive(:authorization_token).and_return(authorization_token)
83
83
  expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
84
84
  expect(executor).to receive(:execute).with('git', 'update').ordered
85
- expect(executor).to receive(:execute).with('git', 'log', 'master...feature-branch', '--reverse', '--no-merges', "--pretty=format:'* %B'").and_return(changelog).ordered
85
+ expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', "--pretty=format:* %B").and_return(changelog).ordered
86
86
  expect(cli).to receive(:ask_editor).with(changelog, hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return(pull_request_description)
87
87
 
88
88
  stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
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.21.4
4
+ version: 2.21.5.ci.151.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
@@ -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: