user-choices 1.1.5 → 1.1.6

data/History.txt

@@ -1,3 +1,6 @@
+Version 1.1.6
+  * Allow a :string type conversion (user request). It does nothing.
+
 Version 1.1.5
   * Improved example files so that they don't include old S4TUtils load-path
     setting. Not needed by the people who'll use them. 
@@ -41,4 +44,4 @@ Version 1.1.0
   * A tutorial.
  
 Version 1.0.0
-  * Version from _Everyday Scripting with Ruby_
+  * Version from _Everyday Scripting with Ruby_

data/Rakefile

@@ -4,13 +4,11 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'hoe'
-require 'lib/user-choices/version'
+$:.unshift(File.join(Dir.pwd, "lib"))
+require 'user-choices/version'
 
 PROJECT='user-choices'
 THIS_RELEASE=UserChoices::Version
-ROOT = "svn+ssh://marick@rubyforge.org/var/svn/#{PROJECT}"
-ALL_EXPORTS="#{ENV['HOME']}/tmp/exports"
-PROJECT_EXPORTS = "#{ALL_EXPORTS}/#{PROJECT}"
 
 
 Hoe.new(PROJECT, THIS_RELEASE) do |p|
@@ -40,60 +38,8 @@ task 'slow' do
   S4tUtils.run_particular_tests('test', 'slow')
 end
 
-def assert_in_exports(taskname)
-  unless Dir.pwd == PROJECT_EXPORTS
-    puts "Run task '#{taskname}' from export directory: " + PROJECT_EXPORTS
-    exit 1
-  end
-end
-
-desc "Upload all the web pages"
-task 'upload_pages' do | task |
-  assert_in_exports task.name
-  exec = "scp -r examples/tutorial/* marick@rubyforge.org:/var/www/gforge-projects/#{PROJECT}/"
-  puts exec
-  system(exec)
-end
-
-desc "Tag release with current version."
-task 'tag_release' do
-  from = "#{ROOT}/trunk"
-  to = "#{ROOT}/tags/rel-#{THIS_RELEASE}"
-  message = "Release #{THIS_RELEASE}"
-  exec = "svn copy -m '#{message}' #{from} #{to}"
-  puts exec
-  system(exec)
-end
-
-desc "Export to ~/tmp/exports/#{PROJECT}"
-task 'export' do 
-  Dir.chdir(ALL_EXPORTS) do
-    rm_rf PROJECT
-    exec = "svn export #{ROOT}/trunk #{PROJECT}"
-    puts exec
-    system exec
-  end
-end
-
-def step(name)
-  STDOUT.puts "** #{name} **"
-  STDOUT.puts `rake #{name}`
-  STDOUT.print 'OK? > '
-  exit if STDIN.readline =~ /[nN]/
-end
-
-desc "Complete release of everything - asks for confirmation after steps"
-# Because in Ruby 1.8.6, Rake doesn't notice subtask failures.
-task 'release_everything' do  
-  step 'check_manifest'
-  step 'test'
-  step 'export'
-  Dir.chdir("#{ALL_EXPORTS}/#{PROJECT}") do
-    puts "Working in #{Dir.pwd}"
-    step 'upload_pages'
-    step 'publish_docs'
-    ENV['VERSION'] = THIS_RELEASE
-    step 'release' 
-  end
-  step 'tag_release'
-end
+require 's4t-utils/hoelike'
+HoeLike.new(:project => PROJECT, :this_release => THIS_RELEASE,
+            :login => "marick@rubyforge.org",
+            :web_site_root => 'examples/tutorial', 
+            :export_root => "#{S4tUtils.find_home}/tmp/exports")

data/examples/tutorial/css/main.css

@@ -191,7 +191,7 @@ padding:15px 0;
 }
 
 #centerNav {
-padding-left:253px;
+padding-left:203px;
 }
 
 #headerNav {

data/examples/tutorial/index.html

@@ -24,6 +24,7 @@
 							<li id="current"><a href="index.html">Home</a></li>
 							<li><a href="http://user-choices.rubyforge.org/rdoc/">RDoc</a></li>
 							<li><a href="http://rubyforge.org/frs/?group_id=4192">Download</a></li>
+							<li><a href="http://rubyforge.org/mail/?group_id=4192">Mailing Lists</a></li>
 					</ul>
 					</div>
 			</div>
@@ -340,8 +341,19 @@ if $0 == __FILE__ <br />
 <h3><a name="keywordargs"/>3.1 Keyword arguments for <code>add_choice</code></a></h3>
 <ul>
 	<li><p>
-		The <b><font style="color: #800020;">:type</font></b> keyword describes type checking and conversion that should be done. In all cases, it's fine if the conversion has already been done (which is often the case when a default value is given). If no <font style="color: #800020;">:type</font> argument is given, the choice stays a string.
+		The <b><font style="color: #800020;">:type</font></b>
+		keyword describes type checking and conversion that
+		should be done. If no <font
+		style="color: #800020;">:type</font> argument is
+		given, the choice stays a string. 
 		</p>
+
+  <p>
+    Default choices are handled generously. Suppose a particular
+    choice is to be an integer. You can specify the default value as
+    either the string <code>"1"</code> (in which case it will be converted to an
+    integer) or the integer <code>1</code> (in which case it will be left alone). 
+  </p>
 		
 		<p>
 		A <code>StandardError</code> is raised if the conversion can't be done. 
@@ -360,6 +372,14 @@ if $0 == __FILE__ <br />
 				Convert the string into either <code>true</code> or <code>false</code>. The string must be one of "true" or "false" (case-insensitive).
 			</p></dd>
 
+			<dt><font style="color: #800020;">:type</font>
+			=> <i>:string</i></dt> 
+			<dd><p>
+			   Leave the string alone. Since that's
+			   the default behavior, this case is only for
+			   convenience. 
+			</p></dd>
+
 			<dt><font style="color: #800020;">:type</font> => <b><font style="color: #800020;">[:string]</font></b></dt>
 				
 			<dd><p>
@@ -371,6 +391,8 @@ if $0 == __FILE__ <br />
 				The value chosen must be one of the given strings. There's no conversion.
 			</p></dd>
 
+
+
 		</dl>
 	</li>
 

data/lib/user-choices/conversions.rb

@@ -36,7 +36,18 @@ module UserChoices
     def convert(value); value; end  # Some conversions are just for error-checking
     def does_length_check?; false; end
   end
-  
+
+  class NoOpConversion < Conversion # :nodoc:
+    def self.described_by?(conversion_tag)
+      conversion_tag == :string
+    end
+
+    def description; "a string"; end
+    def suitable?(actual); true; end
+    def convert(value); value; end
+  end
+
+
   class ConversionToInteger < Conversion # :nodoc:
     def self.described_by?(conversion_tag)
       conversion_tag == :integer

data/lib/user-choices/version.rb

@@ -1,3 +1,3 @@
 module UserChoices
-  Version = '1.1.5'
+  Version = '1.1.6'
 end

data/test/conversion-tests.rb

@@ -21,10 +21,11 @@ class TestDefaultsAndTypes < Test::Unit::TestCase
     Conversion.record_for(["one", "two"], start)
     Conversion.record_for({:length => 1}, start)
     Conversion.record_for({:length => 1..2}, start)
+    Conversion.record_for(:string, start)
     
     assert_equal([ConversionToInteger, ConversionToBoolean, 
                   SplittingConversion, ChoiceCheckingConversion,
-                  ExactLengthConversion, RangeLengthConversion],
+                  ExactLengthConversion, RangeLengthConversion, NoOpConversion],
                  start.collect { |c| c.class })
   end
 
@@ -33,7 +34,21 @@ class TestDefaultsAndTypes < Test::Unit::TestCase
     Conversion.record_for(nil, start)
     assert_equal([], start)
   end
-  
+
+  def test_string_conversion_checking
+    nop = Conversion.for(:string)
+    assert_true(nop.suitable?("hello"))
+    assert_true(nop.suitable?(1))   # Truly does no checking.
+    assert_equal('a string', nop.description)
+  end
+
+  def test_string_conversion
+    nop = Conversion.for(:string)
+    assert_equal("12", nop.convert("12"))
+  end
+
+
+
   def test_integer_conversion_checking
     c2i = Conversion.for(:integer)
     assert_true(c2i.suitable?("034"))

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: user-choices
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
-date: 2007-09-28 00:00:00 -05:00
+  version: 1.1.6
+date: 2007-11-19 00:00:00 -06:00
 summary: Unified interface to command-line, environment, and configuration files.
 require_paths: 
 - lib