gitx 2.21.2 → 2.21.3.ci.135.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/cli/base_command.rb +4 -0
  3. data/lib/gitx/cli/start_command.rb +2 -2
  4. data/lib/gitx/extensions/thor.rb +1 -1
  5. data/lib/gitx/version.rb +1 -1
  6. data/spec/gitx/cli/start_command_spec.rb +10 -7
  7. metadata +44 -45
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: d3f7f503850cda2646ab4b288bc8a7417824723b
4
- data.tar.gz: 0c48b3257b9a2b3f4267a6e61cb581e88e3d6d8b
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZjAwMjAzMWRmZDE5ZTcwOTQyZTYxMzY4OWVkOTViYjE1MTkzYzE2Nw==
5
+ data.tar.gz: !binary |-
6
+ M2Y1YTcxYjhiMGVlNWFkZjRjZmNkNzZlZGE0OGZkMTE3MTlkY2M2Ng==
5
7
  SHA512:
6
- metadata.gz: 47be1b6703f23fec9dc32285512aa4832fb039fe8a2372fbabdce8fa397a0a2ec00b12b3eef987ef45a70a1907bc4527ff4dc4930c614be04f902a74093615e0
7
- data.tar.gz: 40713aa43e31407dde1b13d59c70bb317ef10d62ff99cd9488dcaee16e72ae5ea9a72ab8870ffafced72d565ecccb4ed951f7c40923599af45fd46ed4b7aade5
8
+ metadata.gz: !binary |-
9
+ MDdlNTE2ZDc0MGIzMDRiN2E1ZDI3MDI5OTFiZjRhN2EyNjJhNTIwOWYyYTk3
10
+ YTljMzhlMzBlZmM0ZTY2ZjgyMWI1MGQ0ZGVmOWZmYTdmNzBmMDEzNWU3MjEz
11
+ ZGYzNzk5NzY2ZDdhNjM0MWE1NmNkOWJjOTllZDUxMWVlZTRhZTU=
12
+ data.tar.gz: !binary |-
13
+ OTg0YmFhZjEzMThhOTUyYWE0ZmMyMGVlOWFkOTA4ZWVjMzY5ZTAzMmEyMzNh
14
+ OWVhNmQ5YjNlZjQxOTQ3ZGU4Yzk3Mzk5MjUyMDI0ODlkZmU1MTBhNTI4Yzc1
15
+ ZWViMDVlNDQ5ZDBjMTc5ZjhiMTdlNjdjY2JlODdjYWM0NmE3MzA=
data/lib/gitx/cli/base_command.rb CHANGED
@@ -26,6 +26,10 @@ module Gitx
26
26
  end
27
27
  end
28
28
 
29
+ def run_git_cmd(*cmd)
30
+ run_cmd('git', *cmd)
31
+ end
32
+
29
33
  def checkout_branch(branch_name)
30
34
  run_cmd "git checkout #{branch_name}"
31
35
  end
data/lib/gitx/cli/start_command.rb CHANGED
@@ -16,10 +16,10 @@ module Gitx
16
16
  end
17
17
 
18
18
  checkout_branch config.base_branch
19
- run_cmd 'git pull'
19
+ run_git_cmd 'pull'
20
20
  repo.create_branch branch_name, config.base_branch
21
21
  checkout_branch branch_name
22
- run_cmd(%Q(git commit -m "Starting work on #{branch_name} (Issue ##{options[:issue]})" --allow-empty)) if options[:issue]
22
+ run_git_cmd('commit', '--allow-empty', '--message', "Starting work on #{branch_name} (Issue ##{options[:issue]})") if options[:issue]
23
23
  end
24
24
 
25
25
  private
data/lib/gitx/extensions/thor.rb CHANGED
@@ -12,7 +12,7 @@ class Thor
12
12
 
13
13
  Open3.popen2e(*cmd) do |stdin, stdout_err, wait_thr|
14
14
  while line = stdout_err.gets
15
- say line, :yellow
15
+ say(line, :yellow) if options[:trace]
16
16
  output << line
17
17
  end
18
18
 
data/lib/gitx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gitx
2
- VERSION = '2.21.2'
2
+ VERSION = '2.21.3'
3
3
  end
data/spec/gitx/cli/start_command_spec.rb CHANGED
@@ -11,12 +11,15 @@ describe Gitx::Cli::StartCommand do
11
11
  end
12
12
  let(:cli) { described_class.new(args, options, config) }
13
13
  let(:repo) { cli.send(:repo) }
14
+ let(:exit_value) { double(:exit_value, success?: true) }
15
+ let(:thread) { double(:thread, value: exit_value) }
16
+ let(:stdoutput) { StringIO.new('') }
14
17
 
15
18
  describe '#start' do
16
19
  context 'when user inputs branch that is valid' do
17
20
  before do
18
21
  expect(cli).to receive(:checkout_branch).with('master').ordered
19
- expect(cli).to receive(:run_cmd).with('git pull').ordered
22
+ expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
20
23
  expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
21
24
  expect(cli).to receive(:checkout_branch).with('new-branch').ordered
22
25
 
@@ -31,7 +34,7 @@ describe Gitx::Cli::StartCommand do
31
34
  expect(cli).to receive(:ask).and_return('new-branch')
32
35
 
33
36
  expect(cli).to receive(:checkout_branch).with('master').ordered
34
- expect(cli).to receive(:run_cmd).with('git pull').ordered
37
+ expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
35
38
  expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
36
39
  expect(cli).to receive(:checkout_branch).with('new-branch').ordered
37
40
 
@@ -46,7 +49,7 @@ describe Gitx::Cli::StartCommand do
46
49
  expect(cli).to receive(:ask).and_return('new-branch')
47
50
 
48
51
  expect(cli).to receive(:checkout_branch).with('master').ordered
49
- expect(cli).to receive(:run_cmd).with('git pull').ordered
52
+ expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
50
53
  expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
51
54
  expect(cli).to receive(:checkout_branch).with('new-branch').ordered
52
55
 
@@ -64,7 +67,7 @@ describe Gitx::Cli::StartCommand do
64
67
  expect(cli).to receive(:ask).and_return('new-branch')
65
68
 
66
69
  expect(cli).to receive(:checkout_branch).with('master').ordered
67
- expect(cli).to receive(:run_cmd).with('git pull').ordered
70
+ expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
68
71
  expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
69
72
  expect(cli).to receive(:checkout_branch).with('new-branch').ordered
70
73
 
@@ -82,7 +85,7 @@ describe Gitx::Cli::StartCommand do
82
85
  expect(cli).to receive(:ask).and_return('new-branch')
83
86
 
84
87
  expect(cli).to receive(:checkout_branch).with('master').ordered
85
- expect(cli).to receive(:run_cmd).with('git pull').ordered
88
+ expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
86
89
  expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
87
90
  expect(cli).to receive(:checkout_branch).with('new-branch').ordered
88
91
 
@@ -100,10 +103,10 @@ describe Gitx::Cli::StartCommand do
100
103
  end
101
104
  before do
102
105
  expect(cli).to receive(:checkout_branch).with('master').ordered
103
- expect(cli).to receive(:run_cmd).with('git pull').ordered
106
+ expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
104
107
  expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
105
108
  expect(cli).to receive(:checkout_branch).with('new-branch').ordered
106
- expect(cli).to receive(:run_cmd).with('git commit -m "Starting work on new-branch (Issue #10)" --allow-empty').ordered
109
+ expect(Open3).to receive(:popen2e).with('git', 'commit', '--allow-empty', '--message', 'Starting work on new-branch (Issue #10)').and_yield(nil, stdoutput, thread).ordered
107
110
 
108
111
  cli.start 'new-branch'
109
112
  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.21.2
4
+ version: 2.21.3.ci.135.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: