gitx 2.14.1 → 2.14.2.ci.70.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +13 -5
- data/lib/gitx/configuration.rb +14 -8
- data/lib/gitx/defaults.yml +13 -0
- data/lib/gitx/version.rb +1 -1
- data/spec/gitx/cli/base_command_spec.rb +4 -1
- metadata +45 -45
checksums.yaml
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
|
|
2
|
+
!binary "U0hBMQ==":
|
|
3
|
+
metadata.gz: !binary |-
|
|
4
|
+
MGU4NzQwZWM3ZDMwZjI5MGNhOTZlYTg3MDBlMDQyMDAxNjkxN2Y4Nw==
|
|
5
|
+
data.tar.gz: !binary |-
|
|
6
|
+
YWZkMGExMDc0YjY2NDE4ZGVjOGJiMmM0NzZkYzMyOTQwMzAxZDkyNA==
|
|
5
7
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
|
|
8
|
+
metadata.gz: !binary |-
|
|
9
|
+
ODg3Mjg0ZGM5MDIzNWU0YWJmNDBkYmQyNmIzYTM1MGU3N2NhNGNjM2ExZTE2
|
|
10
|
+
OTQ2NWU1MTRjYzg4MGM3YmQ4NjJiMWQ3YzNlMjlhYWViMDEwM2JhNTFlOWRi
|
|
11
|
+
MjFlYTFkZjM4NDU2NmZkMmRkYmFhODFlNzFjZTRkMmFhODBiYzI=
|
|
12
|
+
data.tar.gz: !binary |-
|
|
13
|
+
MGY0N2JkMDYwOTE3NjhlNGI1MzY2MGRjYjhlMmU2NGQ3ODQ3MDM2NTcwZDhm
|
|
14
|
+
MmRlM2QzYmI3OWEyYTJkZDk3YTY4ZmM5MGFhNjgwNjQyZTlkMWY1MGVjZDUy
|
|
15
|
+
M2RlNGFhOTExMGZlZTQ3ZTdkNTFhNWY1ZDM5M2Q4NGNiNTg1N2M=
|
data/lib/gitx/configuration.rb
CHANGED
|
@@ -2,19 +2,14 @@ require 'yaml'
|
|
|
2
2
|
|
|
3
3
|
module Gitx
|
|
4
4
|
class Configuration
|
|
5
|
-
DEFAULT_CONFIG = {
|
|
6
|
-
'aggregate_branches' => %w( staging prototype ),
|
|
7
|
-
'reserved_branches' => %w( HEAD master next_release staging prototype ),
|
|
8
|
-
'taggable_branches' => %w( master staging )
|
|
9
|
-
}
|
|
10
5
|
CONFIG_FILE = '.gitx.yml'
|
|
11
6
|
|
|
12
7
|
attr_reader :config
|
|
13
8
|
|
|
14
9
|
def initialize(root_dir)
|
|
15
|
-
@config = Thor::CoreExt::HashWithIndifferentAccess.new
|
|
16
|
-
|
|
17
|
-
@config.merge!(
|
|
10
|
+
@config = Thor::CoreExt::HashWithIndifferentAccess.new
|
|
11
|
+
@config.merge!(load_config(File.join(__dir__, 'defaults.yml')))
|
|
12
|
+
@config.merge!(load_config(File.join(root_dir, CONFIG_FILE)))
|
|
18
13
|
end
|
|
19
14
|
|
|
20
15
|
def aggregate_branches
|
|
@@ -40,5 +35,16 @@ module Gitx
|
|
|
40
35
|
def taggable_branch?(branch)
|
|
41
36
|
taggable_branches.include?(branch)
|
|
42
37
|
end
|
|
38
|
+
|
|
39
|
+
private
|
|
40
|
+
|
|
41
|
+
# load configuration file
|
|
42
|
+
def load_config(path)
|
|
43
|
+
if File.exist?(path)
|
|
44
|
+
::YAML.load_file(path)
|
|
45
|
+
else
|
|
46
|
+
{}
|
|
47
|
+
end
|
|
48
|
+
end
|
|
43
49
|
end
|
|
44
50
|
end
|
data/lib/gitx/version.rb
CHANGED
|
@@ -13,8 +13,11 @@ describe Gitx::Cli::BaseCommand do
|
|
|
13
13
|
let(:repo) { cli.send(:repo) }
|
|
14
14
|
|
|
15
15
|
describe 'without custom .gitx.yml config file' do
|
|
16
|
+
before do
|
|
17
|
+
expect(repo).to receive(:workdir).and_return(temp_dir)
|
|
18
|
+
end
|
|
16
19
|
it 'provides default options' do
|
|
17
|
-
expect(cli.send(:config).config).to eq
|
|
20
|
+
expect(cli.send(:config).config).to eq ::YAML.load_file(File.join(__dir__, '../../../lib/gitx/defaults.yml'))
|
|
18
21
|
end
|
|
19
22
|
end
|
|
20
23
|
|
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.14.1
|
|
4
|
+
version: 2.14.2.ci.70.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: 2015-08-
|
|
11
|
+
date: 2015-08-28 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.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,12 +251,12 @@ executables:
|
|
|
251
251
|
extensions: []
|
|
252
252
|
extra_rdoc_files: []
|
|
253
253
|
files:
|
|
254
|
-
-
|
|
255
|
-
-
|
|
256
|
-
-
|
|
257
|
-
-
|
|
258
|
-
-
|
|
259
|
-
-
|
|
254
|
+
- .gitignore
|
|
255
|
+
- .hound.yml
|
|
256
|
+
- .rspec
|
|
257
|
+
- .rubocop.yml
|
|
258
|
+
- .ruby-version
|
|
259
|
+
- .travis.yml
|
|
260
260
|
- CONTRIBUTING.md
|
|
261
261
|
- Gemfile
|
|
262
262
|
- Guardfile
|
|
@@ -287,6 +287,7 @@ files:
|
|
|
287
287
|
- lib/gitx/cli/track_command.rb
|
|
288
288
|
- lib/gitx/cli/update_command.rb
|
|
289
289
|
- lib/gitx/configuration.rb
|
|
290
|
+
- lib/gitx/defaults.yml
|
|
290
291
|
- lib/gitx/extensions/string.rb
|
|
291
292
|
- lib/gitx/extensions/thor.rb
|
|
292
293
|
- lib/gitx/github.rb
|
|
@@ -324,17 +325,17 @@ require_paths:
|
|
|
324
325
|
- lib
|
|
325
326
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
326
327
|
requirements:
|
|
327
|
-
- -
|
|
328
|
+
- - ! '>='
|
|
328
329
|
- !ruby/object:Gem::Version
|
|
329
330
|
version: '0'
|
|
330
331
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
331
332
|
requirements:
|
|
332
|
-
- -
|
|
333
|
+
- - ! '>'
|
|
333
334
|
- !ruby/object:Gem::Version
|
|
334
|
-
version:
|
|
335
|
+
version: 1.3.1
|
|
335
336
|
requirements: []
|
|
336
337
|
rubyforge_project:
|
|
337
|
-
rubygems_version: 2.4.
|
|
338
|
+
rubygems_version: 2.4.5
|
|
338
339
|
signing_key:
|
|
339
340
|
specification_version: 4
|
|
340
341
|
summary: Utility scripts for Git to increase productivity for common operations
|
|
@@ -362,4 +363,3 @@ test_files:
|
|
|
362
363
|
- spec/support/timecop.rb
|
|
363
364
|
- spec/support/vcr.rb
|
|
364
365
|
- spec/support/webmock.rb
|
|
365
|
-
has_rdoc:
|