user-choices 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile.hoe CHANGED
@@ -13,7 +13,7 @@ Hoe.new("user-choices", UserChoices::Version) do |p|
13
13
  p.description = "Unified interface to command-line, environment, and configuration files."
14
14
  p.summary = p.description
15
15
  p.email = "marick@exampler.com"
16
- p.extra_deps = [['xmp-simple', '>= 1.0.11'],
16
+ p.extra_deps = [['xml-simple', '>= 1.0.11'],
17
17
  ['s4t-utils', '>= 1.0.2'],
18
18
  ['extensions', '>= 0.6.0'], # for testing
19
19
  ['builder' '>= 2.1.2']] # for testing
@@ -14,7 +14,7 @@
14
14
  <p style="text-align: center"><a href="http://www.exampler.com/blog/" title="Exploration Through Example - Brian Marick's Blog">Brian Marick</a>, <a href="http://www.exampler.com" title="Exampler Consulting">Exampler Consulting</a></p>
15
15
 
16
16
  <p>
17
- Suppose you have a command-line application that uses some number of, oh, let's say "connections". Most of the time, a user will want the same number of connections, so you'll let them set a personal default in a <em>configuration file</em>. Sometimes they want to change the default. Maybe they'll want a one-time change; for that, a <em>command-line option</em> is best. But sometimes they'll want to make the change for an entire login session; for that, changing an <em>environment variable</em> is most convenient.
17
+ Suppose you have a command-line application that uses some number of, oh, let's say "connections". Most of the time, a user will want the same number of connections, so you'll let them set a personal default in a <em>configuration file</em>. Sometimes they want to change the default. Maybe they'll want a one-time change; for that, a <em>command-line option</em> is best. But sometimes they'll want to make the change for an entire login session; for that, setting an <em>environment variable</em> is most convenient.
18
18
  </p>
19
19
  <p>
20
20
  The User-Choices gem gives your code a unified interface to all those <em>sources</em>. Your code can obey the user's choices without having to bother (much) about how she made them.
@@ -1,3 +1,3 @@
1
1
  module UserChoices
2
- Version = '1.1.0'
2
+ Version = '1.1.1'
3
3
  end
data/user-choices.tmproj CHANGED
@@ -3,7 +3,7 @@
3
3
  <plist version="1.0">
4
4
  <dict>
5
5
  <key>currentDocument</key>
6
- <string>homepage/tutorial.html</string>
6
+ <string>lib/user-choices/arglist-strategies.rb</string>
7
7
  <key>documents</key>
8
8
  <array>
9
9
  <dict>
@@ -21,273 +21,301 @@
21
21
  <integer>246</integer>
22
22
  <key>metaData</key>
23
23
  <dict>
24
- <key>Manifest.txt</key>
24
+ <key>LICENSE.txt</key>
25
25
  <dict>
26
26
  <key>caret</key>
27
27
  <dict>
28
28
  <key>column</key>
29
- <integer>0</integer>
29
+ <integer>8</integer>
30
30
  <key>line</key>
31
- <integer>35</integer>
31
+ <integer>14</integer>
32
32
  </dict>
33
33
  <key>firstVisibleColumn</key>
34
34
  <integer>0</integer>
35
35
  <key>firstVisibleLine</key>
36
- <integer>2</integer>
36
+ <integer>0</integer>
37
37
  </dict>
38
- <key>Rakefile</key>
38
+ <key>Manifest.txt</key>
39
39
  <dict>
40
40
  <key>caret</key>
41
41
  <dict>
42
42
  <key>column</key>
43
43
  <integer>0</integer>
44
44
  <key>line</key>
45
- <integer>0</integer>
45
+ <integer>4</integer>
46
46
  </dict>
47
47
  <key>firstVisibleColumn</key>
48
48
  <integer>0</integer>
49
49
  <key>firstVisibleLine</key>
50
50
  <integer>0</integer>
51
51
  </dict>
52
- <key>Rakefile.hoe</key>
52
+ <key>README.txt</key>
53
53
  <dict>
54
54
  <key>caret</key>
55
55
  <dict>
56
56
  <key>column</key>
57
- <integer>62</integer>
57
+ <integer>89</integer>
58
58
  <key>line</key>
59
- <integer>17</integer>
59
+ <integer>0</integer>
60
60
  </dict>
61
61
  <key>firstVisibleColumn</key>
62
62
  <integer>0</integer>
63
63
  <key>firstVisibleLine</key>
64
64
  <integer>0</integer>
65
65
  </dict>
66
- <key>examples/README.txt</key>
66
+ <key>Rakefile</key>
67
67
  <dict>
68
68
  <key>caret</key>
69
69
  <dict>
70
70
  <key>column</key>
71
71
  <integer>0</integer>
72
72
  <key>line</key>
73
- <integer>133</integer>
73
+ <integer>0</integer>
74
74
  </dict>
75
75
  <key>firstVisibleColumn</key>
76
76
  <integer>0</integer>
77
77
  <key>firstVisibleLine</key>
78
- <integer>100</integer>
78
+ <integer>0</integer>
79
79
  </dict>
80
- <key>examples/command-line.rb</key>
80
+ <key>Rakefile.hoe</key>
81
81
  <dict>
82
82
  <key>caret</key>
83
83
  <dict>
84
84
  <key>column</key>
85
- <integer>5</integer>
85
+ <integer>62</integer>
86
86
  <key>line</key>
87
- <integer>19</integer>
87
+ <integer>17</integer>
88
88
  </dict>
89
89
  <key>firstVisibleColumn</key>
90
90
  <integer>0</integer>
91
91
  <key>firstVisibleLine</key>
92
- <integer>11</integer>
92
+ <integer>0</integer>
93
93
  </dict>
94
- <key>examples/default-values.rb</key>
94
+ <key>examples/older/command-line.rb</key>
95
95
  <dict>
96
96
  <key>caret</key>
97
97
  <dict>
98
98
  <key>column</key>
99
- <integer>56</integer>
99
+ <integer>48</integer>
100
100
  <key>line</key>
101
- <integer>28</integer>
101
+ <integer>4</integer>
102
102
  </dict>
103
+ <key>columnSelection</key>
104
+ <false/>
103
105
  <key>firstVisibleColumn</key>
104
106
  <integer>0</integer>
105
107
  <key>firstVisibleLine</key>
106
- <integer>3</integer>
108
+ <integer>0</integer>
109
+ <key>selectFrom</key>
110
+ <dict>
111
+ <key>column</key>
112
+ <integer>55</integer>
113
+ <key>line</key>
114
+ <integer>4</integer>
115
+ </dict>
116
+ <key>selectTo</key>
117
+ <dict>
118
+ <key>column</key>
119
+ <integer>48</integer>
120
+ <key>line</key>
121
+ <integer>4</integer>
122
+ </dict>
107
123
  </dict>
108
- <key>examples/multiple-sources.rb</key>
124
+ <key>examples/older/default-values.rb</key>
109
125
  <dict>
110
126
  <key>caret</key>
111
127
  <dict>
112
128
  <key>column</key>
113
- <integer>3</integer>
129
+ <integer>55</integer>
114
130
  <key>line</key>
115
- <integer>29</integer>
131
+ <integer>4</integer>
116
132
  </dict>
117
133
  <key>firstVisibleColumn</key>
118
134
  <integer>0</integer>
119
135
  <key>firstVisibleLine</key>
120
- <integer>9</integer>
136
+ <integer>0</integer>
121
137
  </dict>
122
- <key>examples/postprocess.rb</key>
138
+ <key>examples/older/multiple-sources.rb</key>
123
139
  <dict>
124
140
  <key>caret</key>
125
141
  <dict>
126
142
  <key>column</key>
127
- <integer>62</integer>
143
+ <integer>55</integer>
128
144
  <key>line</key>
129
- <integer>28</integer>
145
+ <integer>4</integer>
130
146
  </dict>
131
147
  <key>firstVisibleColumn</key>
132
148
  <integer>0</integer>
133
149
  <key>firstVisibleLine</key>
134
- <integer>12</integer>
150
+ <integer>0</integer>
135
151
  </dict>
136
- <key>examples/switches.rb</key>
152
+ <key>examples/older/postprocess.rb</key>
137
153
  <dict>
138
154
  <key>caret</key>
139
155
  <dict>
140
156
  <key>column</key>
141
- <integer>43</integer>
157
+ <integer>55</integer>
142
158
  <key>line</key>
143
- <integer>33</integer>
159
+ <integer>4</integer>
144
160
  </dict>
145
161
  <key>firstVisibleColumn</key>
146
162
  <integer>0</integer>
147
163
  <key>firstVisibleLine</key>
148
- <integer>15</integer>
164
+ <integer>0</integer>
149
165
  </dict>
150
- <key>examples/tutorial1.rb</key>
166
+ <key>examples/older/switches.rb</key>
151
167
  <dict>
152
168
  <key>caret</key>
153
169
  <dict>
154
170
  <key>column</key>
155
- <integer>14</integer>
171
+ <integer>55</integer>
156
172
  <key>line</key>
157
- <integer>9</integer>
173
+ <integer>4</integer>
158
174
  </dict>
159
175
  <key>firstVisibleColumn</key>
160
176
  <integer>0</integer>
161
177
  <key>firstVisibleLine</key>
162
178
  <integer>0</integer>
163
179
  </dict>
164
- <key>examples/tutorial2.rb</key>
180
+ <key>examples/older/two-args.rb</key>
165
181
  <dict>
166
182
  <key>caret</key>
167
183
  <dict>
168
184
  <key>column</key>
169
- <integer>27</integer>
185
+ <integer>55</integer>
170
186
  <key>line</key>
171
- <integer>24</integer>
187
+ <integer>4</integer>
172
188
  </dict>
173
189
  <key>firstVisibleColumn</key>
174
190
  <integer>0</integer>
175
191
  <key>firstVisibleLine</key>
176
- <integer>19</integer>
192
+ <integer>0</integer>
177
193
  </dict>
178
- <key>examples/tutorial3.rb</key>
194
+ <key>examples/older/types.rb</key>
179
195
  <dict>
180
196
  <key>caret</key>
181
197
  <dict>
182
198
  <key>column</key>
183
- <integer>29</integer>
199
+ <integer>55</integer>
184
200
  <key>line</key>
185
- <integer>37</integer>
201
+ <integer>4</integer>
186
202
  </dict>
187
203
  <key>firstVisibleColumn</key>
188
204
  <integer>0</integer>
189
205
  <key>firstVisibleLine</key>
190
- <integer>8</integer>
206
+ <integer>0</integer>
191
207
  </dict>
192
- <key>examples/tutorial4.rb</key>
208
+ <key>examples/tutorial/index.html</key>
193
209
  <dict>
194
210
  <key>caret</key>
195
211
  <dict>
196
212
  <key>column</key>
197
- <integer>0</integer>
213
+ <integer>466</integer>
198
214
  <key>line</key>
199
- <integer>14</integer>
215
+ <integer>16</integer>
200
216
  </dict>
201
217
  <key>firstVisibleColumn</key>
202
218
  <integer>0</integer>
203
219
  <key>firstVisibleLine</key>
204
220
  <integer>0</integer>
205
221
  </dict>
206
- <key>examples/tutorial5.rb</key>
222
+ <key>examples/tutorial/tutorial1.rb</key>
207
223
  <dict>
208
224
  <key>caret</key>
209
225
  <dict>
210
226
  <key>column</key>
211
- <integer>0</integer>
227
+ <integer>12</integer>
212
228
  <key>line</key>
213
- <integer>30</integer>
229
+ <integer>14</integer>
214
230
  </dict>
215
- <key>columnSelection</key>
216
- <false/>
217
231
  <key>firstVisibleColumn</key>
218
232
  <integer>0</integer>
219
233
  <key>firstVisibleLine</key>
220
- <integer>10</integer>
221
- <key>selectFrom</key>
234
+ <integer>6</integer>
235
+ </dict>
236
+ <key>examples/tutorial/tutorial2.rb</key>
237
+ <dict>
238
+ <key>caret</key>
222
239
  <dict>
223
240
  <key>column</key>
224
- <integer>0</integer>
241
+ <integer>55</integer>
225
242
  <key>line</key>
226
- <integer>25</integer>
243
+ <integer>12</integer>
227
244
  </dict>
228
- <key>selectTo</key>
245
+ <key>firstVisibleColumn</key>
246
+ <integer>0</integer>
247
+ <key>firstVisibleLine</key>
248
+ <integer>0</integer>
249
+ </dict>
250
+ <key>examples/tutorial/tutorial3.rb</key>
251
+ <dict>
252
+ <key>caret</key>
229
253
  <dict>
230
254
  <key>column</key>
231
- <integer>0</integer>
255
+ <integer>55</integer>
232
256
  <key>line</key>
233
- <integer>30</integer>
257
+ <integer>12</integer>
234
258
  </dict>
259
+ <key>firstVisibleColumn</key>
260
+ <integer>0</integer>
261
+ <key>firstVisibleLine</key>
262
+ <integer>0</integer>
235
263
  </dict>
236
- <key>examples/tutorial6.rb</key>
264
+ <key>examples/tutorial/tutorial4.rb</key>
237
265
  <dict>
238
266
  <key>caret</key>
239
267
  <dict>
240
268
  <key>column</key>
241
- <integer>0</integer>
269
+ <integer>55</integer>
242
270
  <key>line</key>
243
- <integer>25</integer>
271
+ <integer>12</integer>
244
272
  </dict>
245
273
  <key>firstVisibleColumn</key>
246
274
  <integer>0</integer>
247
275
  <key>firstVisibleLine</key>
248
- <integer>10</integer>
276
+ <integer>0</integer>
249
277
  </dict>
250
- <key>examples/two-args.rb</key>
278
+ <key>examples/tutorial/tutorial5.rb</key>
251
279
  <dict>
252
280
  <key>caret</key>
253
281
  <dict>
254
282
  <key>column</key>
255
- <integer>36</integer>
283
+ <integer>55</integer>
256
284
  <key>line</key>
257
- <integer>14</integer>
285
+ <integer>11</integer>
258
286
  </dict>
259
287
  <key>firstVisibleColumn</key>
260
288
  <integer>0</integer>
261
289
  <key>firstVisibleLine</key>
262
- <integer>3</integer>
290
+ <integer>0</integer>
263
291
  </dict>
264
- <key>examples/types.rb</key>
292
+ <key>examples/tutorial/tutorial6.rb</key>
265
293
  <dict>
266
294
  <key>caret</key>
267
295
  <dict>
268
296
  <key>column</key>
269
- <integer>63</integer>
297
+ <integer>55</integer>
270
298
  <key>line</key>
271
- <integer>43</integer>
299
+ <integer>11</integer>
272
300
  </dict>
273
301
  <key>firstVisibleColumn</key>
274
302
  <integer>0</integer>
275
303
  <key>firstVisibleLine</key>
276
- <integer>32</integer>
304
+ <integer>0</integer>
277
305
  </dict>
278
- <key>homepage/tutorial.html</key>
306
+ <key>examples/tutorial/tutorial7.rb</key>
279
307
  <dict>
280
308
  <key>caret</key>
281
309
  <dict>
282
310
  <key>column</key>
283
- <integer>122</integer>
311
+ <integer>55</integer>
284
312
  <key>line</key>
285
- <integer>624</integer>
313
+ <integer>11</integer>
286
314
  </dict>
287
315
  <key>firstVisibleColumn</key>
288
- <integer>309</integer>
316
+ <integer>0</integer>
289
317
  <key>firstVisibleLine</key>
290
- <integer>617</integer>
318
+ <integer>0</integer>
291
319
  </dict>
292
320
  <key>lib/user-choices.rb</key>
293
321
  <dict>
@@ -315,7 +343,7 @@
315
343
  <key>firstVisibleColumn</key>
316
344
  <integer>0</integer>
317
345
  <key>firstVisibleLine</key>
318
- <integer>145</integer>
346
+ <integer>0</integer>
319
347
  </dict>
320
348
  <key>lib/user-choices/builder.rb</key>
321
349
  <dict>
@@ -420,14 +448,14 @@
420
448
  <key>caret</key>
421
449
  <dict>
422
450
  <key>column</key>
423
- <integer>49</integer>
451
+ <integer>0</integer>
424
452
  <key>line</key>
425
- <integer>21</integer>
453
+ <integer>23</integer>
426
454
  </dict>
427
455
  <key>firstVisibleColumn</key>
428
456
  <integer>0</integer>
429
457
  <key>firstVisibleLine</key>
430
- <integer>7</integer>
458
+ <integer>0</integer>
431
459
  </dict>
432
460
  <key>test/builder-tests.rb</key>
433
461
  <dict>
@@ -441,37 +469,21 @@
441
469
  <key>firstVisibleColumn</key>
442
470
  <integer>0</integer>
443
471
  <key>firstVisibleLine</key>
444
- <integer>85</integer>
472
+ <integer>516</integer>
445
473
  </dict>
446
- <key>test/command-line-tests.rb</key>
474
+ <key>test/command-line-source-tests.rb</key>
447
475
  <dict>
448
476
  <key>caret</key>
449
477
  <dict>
450
478
  <key>column</key>
451
- <integer>60</integer>
479
+ <integer>0</integer>
452
480
  <key>line</key>
453
- <integer>208</integer>
481
+ <integer>412</integer>
454
482
  </dict>
455
- <key>columnSelection</key>
456
- <false/>
457
483
  <key>firstVisibleColumn</key>
458
484
  <integer>0</integer>
459
485
  <key>firstVisibleLine</key>
460
- <integer>180</integer>
461
- <key>selectFrom</key>
462
- <dict>
463
- <key>column</key>
464
- <integer>53</integer>
465
- <key>line</key>
466
- <integer>208</integer>
467
- </dict>
468
- <key>selectTo</key>
469
- <dict>
470
- <key>column</key>
471
- <integer>60</integer>
472
- <key>line</key>
473
- <integer>208</integer>
474
- </dict>
486
+ <integer>390</integer>
475
487
  </dict>
476
488
  <key>test/conversion-tests.rb</key>
477
489
  <dict>
@@ -485,7 +497,7 @@
485
497
  <key>firstVisibleColumn</key>
486
498
  <integer>0</integer>
487
499
  <key>firstVisibleLine</key>
488
- <integer>95</integer>
500
+ <integer>103</integer>
489
501
  </dict>
490
502
  <key>test/set-standalone-test-paths.rb</key>
491
503
  <dict>
@@ -501,63 +513,65 @@
501
513
  <key>firstVisibleLine</key>
502
514
  <integer>0</integer>
503
515
  </dict>
504
- <key>test/user-choices-slowtests.rb</key>
516
+ <key>test/source-tests.rb</key>
505
517
  <dict>
506
518
  <key>caret</key>
507
519
  <dict>
508
520
  <key>column</key>
509
- <integer>25</integer>
521
+ <integer>0</integer>
510
522
  <key>line</key>
511
- <integer>254</integer>
523
+ <integer>0</integer>
512
524
  </dict>
513
525
  <key>firstVisibleColumn</key>
514
526
  <integer>0</integer>
515
527
  <key>firstVisibleLine</key>
516
- <integer>225</integer>
528
+ <integer>0</integer>
517
529
  </dict>
518
- <key>test/user-choices-tests.rb</key>
530
+ <key>test/user-choices-slowtests.rb</key>
519
531
  <dict>
520
532
  <key>caret</key>
521
533
  <dict>
522
534
  <key>column</key>
523
- <integer>0</integer>
535
+ <integer>50</integer>
524
536
  <key>line</key>
525
- <integer>0</integer>
537
+ <integer>113</integer>
526
538
  </dict>
527
539
  <key>firstVisibleColumn</key>
528
540
  <integer>0</integer>
529
541
  <key>firstVisibleLine</key>
530
- <integer>215</integer>
542
+ <integer>87</integer>
531
543
  </dict>
532
544
  </dict>
533
545
  <key>openDocuments</key>
534
546
  <array>
535
547
  <string>test/conversion-tests.rb</string>
536
- <string>test/user-choices-tests.rb</string>
537
548
  <string>test/set-standalone-test-paths.rb</string>
549
+ <string>test/source-tests.rb</string>
550
+ <string>examples/older/command-line.rb</string>
551
+ <string>examples/older/default-values.rb</string>
552
+ <string>examples/older/multiple-sources.rb</string>
553
+ <string>examples/older/postprocess.rb</string>
554
+ <string>examples/older/switches.rb</string>
555
+ <string>examples/older/two-args.rb</string>
556
+ <string>examples/older/types.rb</string>
557
+ <string>examples/tutorial/tutorial1.rb</string>
558
+ <string>examples/tutorial/tutorial2.rb</string>
559
+ <string>examples/tutorial/tutorial3.rb</string>
560
+ <string>examples/tutorial/tutorial4.rb</string>
561
+ <string>examples/tutorial/tutorial5.rb</string>
562
+ <string>examples/tutorial/tutorial6.rb</string>
563
+ <string>examples/tutorial/tutorial7.rb</string>
538
564
  <string>test/user-choices-slowtests.rb</string>
539
- <string>examples/tutorial5.rb</string>
540
- <string>homepage/tutorial.html</string>
541
- <string>examples/tutorial6.rb</string>
542
- <string>examples/README.txt</string>
543
- <string>test/command-line-tests.rb</string>
565
+ <string>examples/tutorial/index.html</string>
566
+ <string>LICENSE.txt</string>
567
+ <string>README.txt</string>
544
568
  <string>test/arglist-strategy-tests.rb</string>
545
569
  <string>Rakefile</string>
546
570
  <string>Rakefile.hoe</string>
547
- <string>examples/command-line.rb</string>
548
- <string>examples/default-values.rb</string>
549
571
  <string>lib/user-choices/command-line-source.rb</string>
550
- <string>examples/tutorial2.rb</string>
551
- <string>examples/tutorial3.rb</string>
552
- <string>examples/tutorial4.rb</string>
553
- <string>examples/tutorial1.rb</string>
554
- <string>examples/multiple-sources.rb</string>
555
- <string>examples/postprocess.rb</string>
556
- <string>examples/switches.rb</string>
557
- <string>examples/two-args.rb</string>
558
- <string>examples/types.rb</string>
559
572
  <string>lib/user-choices/builder.rb</string>
560
573
  <string>test/builder-tests.rb</string>
574
+ <string>test/command-line-source-tests.rb</string>
561
575
  <string>lib/user-choices/command.rb</string>
562
576
  <string>lib/user-choices.rb</string>
563
577
  <string>lib/user-choices/sources.rb</string>
@@ -570,6 +584,6 @@
570
584
  <key>showFileHierarchyDrawer</key>
571
585
  <true/>
572
586
  <key>windowFrame</key>
573
- <string>{{4, 29}, {854, 749}}</string>
587
+ <string>{{5, 0}, {861, 778}}</string>
574
588
  </dict>
575
589
  </plist>
metadata CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
3
3
  specification_version: 1
4
4
  name: user-choices
5
5
  version: !ruby/object:Gem::Version
6
- version: 1.1.0
7
- date: 2007-08-18 00:00:00 -04:00
6
+ version: 1.1.1
7
+ date: 2007-09-14 00:00:00 -05:00
8
8
  summary: Unified interface to command-line, environment, and configuration files.
9
9
  require_paths:
10
10
  - lib
@@ -92,7 +92,7 @@ requirements: []
92
92
 
93
93
  dependencies:
94
94
  - !ruby/object:Gem::Dependency
95
- name: xmp-simple
95
+ name: xml-simple
96
96
  version_requirement:
97
97
  version_requirements: !ruby/object:Gem::Version::Requirement
98
98
  requirements:
@@ -134,5 +134,5 @@ dependencies:
134
134
  requirements:
135
135
  - - ">="
136
136
  - !ruby/object:Gem::Version
137
- version: 1.2.2
137
+ version: 1.3.0
138
138
  version: