fig 0.1.54 → 0.1.55

Sign up to get free protection for your applications and to get access to all the features.
data/Changes CHANGED
@@ -1,3 +1,8 @@
1
+ v0.1.55
2
+
3
+ - "include" of another package without specifying a version is now a warning
4
+ about its ability to work is dependent upon include ordering.
5
+
1
6
  v0.1.54
2
7
 
3
8
  - Emits an error when you've got an "include" of another package without
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.54
1
+ 0.1.55
@@ -66,21 +66,27 @@ module Fig::Command::Listing
66
66
  return
67
67
  end
68
68
 
69
- def display_dependencies_in_tree(package, config_names, indent = 0)
69
+ def display_dependencies_in_tree(base_package, config_names, indent = 0)
70
70
  config_names.each do
71
71
  |config_name|
72
72
 
73
73
  print ' ' * (indent * 4)
74
- puts package.to_s_with_config(config_name)
74
+ puts base_package.to_s_with_config(config_name)
75
75
 
76
- package.package_dependencies(config_name).each do
76
+ base_package.package_dependencies(config_name).each do
77
77
  |descriptor|
78
78
 
79
- display_dependencies_in_tree(
80
- @repository.get_package(descriptor.name, descriptor.version),
81
- [descriptor.config],
82
- indent + 1
83
- )
79
+ package = nil
80
+ if descriptor.name
81
+ package =
82
+ @repository.get_package(
83
+ descriptor.name, descriptor.version, false, :allow_any_version
84
+ )
85
+ else
86
+ package = base_package
87
+ end
88
+
89
+ display_dependencies_in_tree(package, [descriptor.config], indent + 1)
84
90
  end
85
91
  end
86
92
 
@@ -25,6 +25,14 @@ class Fig::PackageCache
25
25
  return versions[version]
26
26
  end
27
27
 
28
+ # Don't care which one, just gimme.
29
+ def get_any_version_of_package(name)
30
+ versions = @packages[name]
31
+ return if not versions
32
+
33
+ return versions.values.first()
34
+ end
35
+
28
36
  def remove_package(name, version)
29
37
  versions = @packages[name]
30
38
  return if not versions
@@ -56,7 +56,28 @@ module Fig
56
56
  return paths.reject { |path| path =~ %r< ^ #{METADATA_SUBDIRECTORY} / >xs }
57
57
  end
58
58
 
59
- def get_package(package_name, version_name, disable_updating = false)
59
+ def get_package(
60
+ package_name,
61
+ version_name,
62
+ disable_updating = false,
63
+ allow_any_version = false
64
+ )
65
+ if not version_name
66
+ if allow_any_version
67
+ package = @packages.get_any_version_of_package(package_name)
68
+ if package
69
+ Logging.warn(
70
+ "Picked version #{package.version_name} of #{package.package_name} at random."
71
+ )
72
+ return package
73
+ end
74
+ end
75
+
76
+ raise RepositoryError.new(
77
+ %Q<Cannot retrieve "#{package_name}" without a version.>
78
+ )
79
+ end
80
+
60
81
  package = @packages.get_package(package_name, version_name)
61
82
  return package if package
62
83
 
@@ -1,6 +1,5 @@
1
1
  require 'fig/logging'
2
2
  require 'fig/packagedescriptor'
3
- require 'fig/packageerror'
4
3
  require 'fig/statement'
5
4
 
6
5
  module Fig; end
@@ -15,13 +14,13 @@ class Fig::Statement::Include
15
14
  def initialize(descriptor, overrides, containing_package_name)
16
15
  if descriptor.name && ! descriptor.version
17
16
  message =
18
- %Q<Must specify a version in the package descriptor of "#{descriptor.name}" for an include statement>
17
+ %Q<No version in the package descriptor of "#{descriptor.name}" in an include statement>
19
18
  if containing_package_name
20
19
  message += %Q< in the .fig file for "#{containing_package_name}">
21
20
  end
22
- message += '.'
21
+ message += '. Whether or not the include statement will work is dependent upon the recursive dependency load order.'
23
22
 
24
- raise Fig::PackageError.new(message)
23
+ Fig::Logging.warn(message)
25
24
  end
26
25
 
27
26
  @descriptor = descriptor
@@ -89,6 +88,10 @@ class Fig::Statement::Include
89
88
  end
90
89
 
91
90
  def referenced_version_name(package)
91
+ if package_name()
92
+ return version_name()
93
+ end
94
+
92
95
  return version_name() || package.version_name()
93
96
  end
94
97
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fig
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.54
4
+ version: 0.1.55
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: libarchive-static
16
- requirement: &24818540 !ruby/object:Gem::Requirement
16
+ requirement: &15742480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.0.0
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *24818540
24
+ version_requirements: *15742480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: libarchive-static
27
- requirement: &24818040 !ruby/object:Gem::Requirement
27
+ requirement: &15758360 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *24818040
35
+ version_requirements: *15758360
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: highline
38
- requirement: &24817520 !ruby/object:Gem::Requirement
38
+ requirement: &15757860 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.6.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *24817520
46
+ version_requirements: *15757860
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: log4r
49
- requirement: &24817000 !ruby/object:Gem::Requirement
49
+ requirement: &15757360 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.5
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *24817000
57
+ version_requirements: *15757360
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: net-netrc
60
- requirement: &24816480 !ruby/object:Gem::Requirement
60
+ requirement: &15756840 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 0.2.2
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *24816480
68
+ version_requirements: *15756840
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: net-sftp
71
- requirement: &24815960 !ruby/object:Gem::Requirement
71
+ requirement: &15756320 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 2.0.4
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *24815960
79
+ version_requirements: *15756320
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: net-ssh
82
- requirement: &24815420 !ruby/object:Gem::Requirement
82
+ requirement: &15755800 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 2.0.15
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *24815420
90
+ version_requirements: *15755800
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: polyglot
93
- requirement: &24814880 !ruby/object:Gem::Requirement
93
+ requirement: &15755280 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.2.9
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *24814880
101
+ version_requirements: *15755280
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rdoc
104
- requirement: &24814360 !ruby/object:Gem::Requirement
104
+ requirement: &15754740 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '3.12'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *24814360
112
+ version_requirements: *15754740
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: json
115
- requirement: &24813840 !ruby/object:Gem::Requirement
115
+ requirement: &15754200 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 1.6.5
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *24813840
123
+ version_requirements: *15754200
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: treetop
126
- requirement: &24813320 !ruby/object:Gem::Requirement
126
+ requirement: &15753680 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 1.4.2
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *24813320
134
+ version_requirements: *15753680
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: ftp
137
- requirement: &24812820 !ruby/object:Gem::Requirement
137
+ requirement: &15753160 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0.69'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *24812820
145
+ version_requirements: *15753160
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: open4
148
- requirement: &24812320 !ruby/object:Gem::Requirement
148
+ requirement: &15752640 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 1.0.1
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *24812320
156
+ version_requirements: *15752640
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: rspec
159
- requirement: &24811840 !ruby/object:Gem::Requirement
159
+ requirement: &15752140 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '2.8'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *24811840
167
+ version_requirements: *15752140
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: libarchive-static
170
- requirement: &24811300 !ruby/object:Gem::Requirement
170
+ requirement: &15751640 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 1.0.0
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *24811300
178
+ version_requirements: *15751640
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: libarchive-static
181
- requirement: &24818940 !ruby/object:Gem::Requirement
181
+ requirement: &15751160 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 1.0.0
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *24818940
189
+ version_requirements: *15751160
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: highline
192
- requirement: &24818140 !ruby/object:Gem::Requirement
192
+ requirement: &15750620 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 1.6.2
198
198
  type: :runtime
199
199
  prerelease: false
200
- version_requirements: *24818140
200
+ version_requirements: *15750620
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: log4r
203
- requirement: &24817400 !ruby/object:Gem::Requirement
203
+ requirement: &15758200 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: 1.1.5
209
209
  type: :runtime
210
210
  prerelease: false
211
- version_requirements: *24817400
211
+ version_requirements: *15758200
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: net-netrc
214
- requirement: &24816580 !ruby/object:Gem::Requirement
214
+ requirement: &15757440 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: 0.2.2
220
220
  type: :runtime
221
221
  prerelease: false
222
- version_requirements: *24816580
222
+ version_requirements: *15757440
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: net-sftp
225
- requirement: &24815840 !ruby/object:Gem::Requirement
225
+ requirement: &15756700 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: 2.0.4
231
231
  type: :runtime
232
232
  prerelease: false
233
- version_requirements: *24815840
233
+ version_requirements: *15756700
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: net-ssh
236
- requirement: &24815000 !ruby/object:Gem::Requirement
236
+ requirement: &15755880 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: 2.0.15
242
242
  type: :runtime
243
243
  prerelease: false
244
- version_requirements: *24815000
244
+ version_requirements: *15755880
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: polyglot
247
- requirement: &24814220 !ruby/object:Gem::Requirement
247
+ requirement: &15755120 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
252
252
  version: 0.2.9
253
253
  type: :runtime
254
254
  prerelease: false
255
- version_requirements: *24814220
255
+ version_requirements: *15755120
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: rdoc
258
- requirement: &24813420 !ruby/object:Gem::Requirement
258
+ requirement: &15754300 !ruby/object:Gem::Requirement
259
259
  none: false
260
260
  requirements:
261
261
  - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
263
263
  version: '3.12'
264
264
  type: :runtime
265
265
  prerelease: false
266
- version_requirements: *24813420
266
+ version_requirements: *15754300
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: json
269
- requirement: &24812680 !ruby/object:Gem::Requirement
269
+ requirement: &15753520 !ruby/object:Gem::Requirement
270
270
  none: false
271
271
  requirements:
272
272
  - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
274
274
  version: 1.6.5
275
275
  type: :runtime
276
276
  prerelease: false
277
- version_requirements: *24812680
277
+ version_requirements: *15753520
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: treetop
280
- requirement: &24811940 !ruby/object:Gem::Requirement
280
+ requirement: &15752720 !ruby/object:Gem::Requirement
281
281
  none: false
282
282
  requirements:
283
283
  - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
285
285
  version: 1.4.2
286
286
  type: :runtime
287
287
  prerelease: false
288
- version_requirements: *24811940
288
+ version_requirements: *15752720
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: ftp
291
- requirement: &24809300 !ruby/object:Gem::Requirement
291
+ requirement: &15751980 !ruby/object:Gem::Requirement
292
292
  none: false
293
293
  requirements:
294
294
  - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
296
296
  version: '0.69'
297
297
  type: :runtime
298
298
  prerelease: false
299
- version_requirements: *24809300
299
+ version_requirements: *15751980
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: open4
302
- requirement: &24808520 !ruby/object:Gem::Requirement
302
+ requirement: &15751240 !ruby/object:Gem::Requirement
303
303
  none: false
304
304
  requirements:
305
305
  - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
307
307
  version: 1.0.1
308
308
  type: :development
309
309
  prerelease: false
310
- version_requirements: *24808520
310
+ version_requirements: *15751240
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: rspec
313
- requirement: &24807920 !ruby/object:Gem::Requirement
313
+ requirement: &15749240 !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
316
  - - ! '>='
@@ -318,7 +318,7 @@ dependencies:
318
318
  version: '2.8'
319
319
  type: :development
320
320
  prerelease: false
321
- version_requirements: *24807920
321
+ version_requirements: *15749240
322
322
  description: Fig is a utility for configuring environments and managing dependencies
323
323
  across a team of developers. Given a list of packages and a command to run, Fig
324
324
  builds environment variables named in those packages (e.g., CLASSPATH), then executes