user-choices 1.1.6 → 1.1.6.1

data/History.txt

@@ -1,3 +1,6 @@
+Version 1.1.6.1
+  * fix the old style tokens for 'case' statement from ':' to 'then' for Ruby 1.9
+
 Version 1.1.6
   * Allow a :string type conversion (user request). It does nothing.
 

data/README.txt

@@ -1 +1,3 @@
-The best introduction to user-choices is the tutorial[http://user-choices.rubyforge.org].
+= user-choices
+
+* The best introduction to user-choices is the tutorial[http://user-choices.rubyforge.org].

data/Rakefile

@@ -11,20 +11,21 @@ PROJECT='user-choices'
 THIS_RELEASE=UserChoices::Version
 
 
-Hoe.new(PROJECT, THIS_RELEASE) do |p|
-  p.rubyforge_name = PROJECT
-  p.changes = "See History.txt"
-  p.author = "Brian Marick"
-  p.description = "Unified interface to command-line, environment, and configuration files."
-  p.summary = p.description
-  p.email = "marick@exampler.com"
-  p.extra_deps = [['xml-simple', '>= 1.0.11'], 
+Hoe.spec(PROJECT) do |spec|
+  spec.rubyforge_name = PROJECT
+  spec.version = THIS_RELEASE
+  spec.changes = "See History.txt"
+  spec.author = "Brian Marick"
+  spec.description = "Unified interface to command-line, environment, and configuration files."
+  spec.summary = spec.description
+  spec.email = "marick@exampler.com"
+  spec.extra_deps = [['xml-simple', '>= 1.0.11'],
                   ['s4t-utils', '>= 1.0.3'],
                   ['builder', '>= 2.1.2']]        # for testing
-  p.test_globs = "test/**/*tests.rb"
-  p.rdoc_pattern = %r{README.txt|History.txt|lib/user-choices.rb|lib/user-choices/.+\.rb}
-  p.url = "http://user-choices.rubyforge.org"
-  p.remote_rdoc_dir = 'rdoc'
+  spec.test_globs = "test/**/*tests.rb"
+  spec.extra_rdoc_files = ['README.txt', 'History.txt']
+  spec.url = "http://user-choices.rubyforge.org"
+  spec.remote_rdoc_dir = 'rdoc'
 end
 
 require 's4t-utils/rake-task-helpers'

data/examples/tutorial/css/main.css

@@ -1,242 +1,242 @@
-#header {
-width:750px;
-height:150px;
-color:#fff;
-font-size:50px;
-letter-spacing:-2px;
-margin:0;
-}
-
-.highlight {
-color:#F1Ca3f;
-}
-
-#headerLeft {
-background-color:#eaeaea;
-height:150px;
-width:150px;
-float:left;
-background:url("von-foerster.jpg") no-repeat !important;
-}
-
-#headerRight {
-background-color:#78300A;
-color:#fff;
-height:150px;
-margin-left:155px;
-background:url("tvline.gif") repeat !important;
-}
-
-#headerRight h1 {
-padding-top:25px;
-padding-left:10px;
-font-size:1.2em;
-letter-spacing:-4px;
-line-height:.6em;
-margin:0;
-}
-
-#headerRight h2 {
-padding-top:15px;
-padding-left:10px;
-font-size:0.4em;
-letter-spacing:-1px;
-line-height:1.2em;
-margin:0;
-}
-
-body {
-font-family:verdana;
-font-size:12px;
-margin:0;
-padding:0;
-}
-
-#pageBody {
-background-color:orange;
-font-family:verdana;
-margin:0;
-padding:20px;
-}
-
-#inlineTOC {
-	float: right;
-	list-style: none;
-	background: #EBC851;
-	margin-left: 1em;
-	margin-bottom: 5pt;
-/*	include-source: url(inlinetoc.html);  */
-}
-
-#inlineTOC ul {
-	list-style-type: none;
-	padding-right: 1em;
-	padding-left: 1em;
-}
-
-#inlineTOC a {
-	font-weight:700;
-	color:#765;
-	text-decoration:none;
-}
-
-#inlineTOC A:hover {
-	color:#333;
-}
-
-
-
-#container {
-width:750px;
-height:auto;
-background-color:#FFF;
-margin:0 auto auto;
-padding:0;
-}
-
-#nav {
-width:80%;
-font-family:Verdana, sans-serif;
-margin:2em;
-padding:5px;
-}
-
-#nav ul,#nav li {
-display:inline;
-color:#339;
-font-weight:700;
-margin:0;
-padding:0;
-}
-
-#nav li a {
-height:25px;
-width:25px;
-background-color:red;
-border:1px solid #000;
-}
-
-#logo {
-background-color:#FFF;
-text-align:left;
-width:750px;
-height:auto;
-padding-bottom:10px;
-padding-left:5px;
-font-size:30px;
-}
-
-#content {
-margin-top:50px;
-font-size:14px;
-text-decoration:none;
-width:750px;
-height:auto;
-border-bottom:1px solid #eaeaea;
-line-height:160%;
-}
-
-#content h2 {
-color:#000;
-font-size:15px;
-padding-left:2px;
-}
-
-
-blockquote {
-background-color:#f2f2f2;
-width:auto;
-margin-left:25px;
-margin-right:25px;
-display:block;
-padding:0.5em 0.5em 0.5em 1em;
-}
-
-#footer {
-color:gray;
-font-size:10px;
-text-decoration:none;
-padding-top:5px;
-}
-
-img.right {
-float:right;
-margin-left:5px;
-padding:5px;
-}
-
-img.left {
-float:left;
-margin-right:5px;
-padding:5px;
-}
-
-img.center {
-	display: block;
-	margin-left: auto;
-	margin-right: auto
-}
-
-.normal {
-color:gray;
-text-decoration:none;
-}
-
-#outer-container {
-background-color:#fff;
-width:790px;
-border:1px solid #888;
-margin:auto;
-padding:15px 0;
-}
-
-#centerNav {
-padding-left:203px;
-}
-
-#headerNav {
-margin-top:5px;
-font-size:93%;
-background-color: #F1Ca3f;
-float:left;
-width:100%;
-line-height:normal;
-padding-bottom:-1px;
-}
-
-#headerNav UL {
-list-style-type:none;
-margin:0;
-padding:10px 10px 0;
-}
-
-#headerNav LI {
-background:url(left.gif) no-repeat left top;
-float:left;
-margin:0;
-padding:0 0 0 9px;
-}
-
-#headerNav A {
-display:block;
-font-weight:700;
-background:url(right.gif) no-repeat right top;
-color:#765;
-text-decoration:none;
-float:none;
-padding:5px 15px 4px 6px;
-}
-
-#headerNav A:hover {
-color:#333;
-}
-
-#headerNav #current {
-background-image:url(left_on.gif);
-}
-
-#headerNav #current A {
-background-image:url(right_on.gif);
-padding-bottom:5px;
-color:#333;
+#header {
+width:750px;
+height:150px;
+color:#fff;
+font-size:50px;
+letter-spacing:-2px;
+margin:0;
+}
+
+.highlight {
+color:#F1Ca3f;
+}
+
+#headerLeft {
+background-color:#eaeaea;
+height:150px;
+width:150px;
+float:left;
+background:url("von-foerster.jpg") no-repeat !important;
+}
+
+#headerRight {
+background-color:#78300A;
+color:#fff;
+height:150px;
+margin-left:155px;
+background:url("tvline.gif") repeat !important;
+}
+
+#headerRight h1 {
+padding-top:25px;
+padding-left:10px;
+font-size:1.2em;
+letter-spacing:-4px;
+line-height:.6em;
+margin:0;
+}
+
+#headerRight h2 {
+padding-top:15px;
+padding-left:10px;
+font-size:0.4em;
+letter-spacing:-1px;
+line-height:1.2em;
+margin:0;
+}
+
+body {
+font-family:verdana;
+font-size:12px;
+margin:0;
+padding:0;
+}
+
+#pageBody {
+background-color:orange;
+font-family:verdana;
+margin:0;
+padding:20px;
+}
+
+#inlineTOC {
+	float: right;
+	list-style: none;
+	background: #EBC851;
+	margin-left: 1em;
+	margin-bottom: 5pt;
+/*	include-source: url(inlinetoc.html);  */
+}
+
+#inlineTOC ul {
+	list-style-type: none;
+	padding-right: 1em;
+	padding-left: 1em;
+}
+
+#inlineTOC a {
+	font-weight:700;
+	color:#765;
+	text-decoration:none;
+}
+
+#inlineTOC A:hover {
+	color:#333;
+}
+
+
+
+#container {
+width:750px;
+height:auto;
+background-color:#FFF;
+margin:0 auto auto;
+padding:0;
+}
+
+#nav {
+width:80%;
+font-family:Verdana, sans-serif;
+margin:2em;
+padding:5px;
+}
+
+#nav ul,#nav li {
+display:inline;
+color:#339;
+font-weight:700;
+margin:0;
+padding:0;
+}
+
+#nav li a {
+height:25px;
+width:25px;
+background-color:red;
+border:1px solid #000;
+}
+
+#logo {
+background-color:#FFF;
+text-align:left;
+width:750px;
+height:auto;
+padding-bottom:10px;
+padding-left:5px;
+font-size:30px;
+}
+
+#content {
+margin-top:50px;
+font-size:14px;
+text-decoration:none;
+width:750px;
+height:auto;
+border-bottom:1px solid #eaeaea;
+line-height:160%;
+}
+
+#content h2 {
+color:#000;
+font-size:15px;
+padding-left:2px;
+}
+
+
+blockquote {
+background-color:#f2f2f2;
+width:auto;
+margin-left:25px;
+margin-right:25px;
+display:block;
+padding:0.5em 0.5em 0.5em 1em;
+}
+
+#footer {
+color:gray;
+font-size:10px;
+text-decoration:none;
+padding-top:5px;
+}
+
+img.right {
+float:right;
+margin-left:5px;
+padding:5px;
+}
+
+img.left {
+float:left;
+margin-right:5px;
+padding:5px;
+}
+
+img.center {
+	display: block;
+	margin-left: auto;
+	margin-right: auto
+}
+
+.normal {
+color:gray;
+text-decoration:none;
+}
+
+#outer-container {
+background-color:#fff;
+width:790px;
+border:1px solid #888;
+margin:auto;
+padding:15px 0;
+}
+
+#centerNav {
+padding-left:203px;
+}
+
+#headerNav {
+margin-top:5px;
+font-size:93%;
+background-color: #F1Ca3f;
+float:left;
+width:100%;
+line-height:normal;
+padding-bottom:-1px;
+}
+
+#headerNav UL {
+list-style-type:none;
+margin:0;
+padding:10px 10px 0;
+}
+
+#headerNav LI {
+background:url(left.gif) no-repeat left top;
+float:left;
+margin:0;
+padding:0 0 0 9px;
+}
+
+#headerNav A {
+display:block;
+font-weight:700;
+background:url(right.gif) no-repeat right top;
+color:#765;
+text-decoration:none;
+float:none;
+padding:5px 15px 4px 6px;
+}
+
+#headerNav A:hover {
+color:#333;
+}
+
+#headerNav #current {
+background-image:url(left_on.gif);
+}
+
+#headerNav #current A {
+background-image:url(right_on.gif);
+padding-bottom:5px;
+color:#333;
 }

data/examples/tutorial/index.html

@@ -373,7 +373,7 @@ if $0 == __FILE__ <br />
 			</p></dd>
 
 			<dt><font style="color: #800020;">:type</font>
-			=> <i>:string</i></dt> 
+			=> <b><font style="color: #800020;">:string</font></b></dt> 
 			<dd><p>
 			   Leave the string alone. Since that's
 			   the default behavior, this case is only for

data/lib/user-choices/arglist-strategies.rb

@@ -145,9 +145,9 @@ module UserChoices # :nodoc:
     
     def fill(arglist)
       case arglist.length
-      when 0: # This is not considered an error because another source
+      when 0 then # This is not considered an error because another source
               # might fill in the value.
-      when 1: @value_holder[@choice] = arglist[0]
+      when 1 then @value_holder[@choice] = arglist[0]
       else user_is_bewildered(arglist_arity_error(arglist.length, self.arity))
       end
     end

data/lib/user-choices/conversions.rb

@@ -78,7 +78,7 @@ module UserChoices
     
     def convert(value)
       case value
-      when String: eval(value.downcase)
+      when String then eval(value.downcase)
       else value
       end
     end
@@ -97,8 +97,8 @@ module UserChoices
     
     def convert(value)
       case value
-      when String: value.split(',')
-      when Array: value
+      when String then value.split(',')
+      when Array then value
       end
     end
     

data/lib/user-choices/sources.rb

@@ -60,7 +60,7 @@ module UserChoices   # :nodoc
     
     def pretty_value(value)
       case value
-      when Array: value.inspect
+      when Array then value.inspect
       else "'#{value}'"
       end
     end
@@ -262,8 +262,8 @@ module UserChoices   # :nodoc
 
     def ensure_element_is_string(collection, key)
       case collection[key]
-        when Hash: ensure_hash_values_are_strings(collection[key])
-        when Array: ensure_array_values_are_strings(collection[key])
+        when Hash then ensure_hash_values_are_strings(collection[key])
+        when Array then ensure_array_values_are_strings(collection[key])
         else collection[key] = collection[key].to_s
       end
     end

data/lib/user-choices/version.rb

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

metadata

@@ -1,33 +1,70 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: user-choices
 version: !ruby/object:Gem::Version 
-  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
-email: marick@exampler.com
-homepage: http://user-choices.rubyforge.org
-rubyforge_project: user-choices
-description: Unified interface to command-line, environment, and configuration files.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.1.6.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Brian Marick
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-01-15 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.11
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: s4t-utils
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.3
+    version: 
+description: Unified interface to command-line, environment, and configuration files.
+email: marick@exampler.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
+- examples/older/README.txt
+- examples/tutorial/css/LICENSE.txt
 files: 
 - History.txt
 - LICENSE.txt
@@ -76,6 +113,35 @@ files:
 - test/conversion-tests.rb
 - test/source-tests.rb
 - test/user-choices-slowtests.rb
+has_rdoc: true
+homepage: http://user-choices.rubyforge.org
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: user-choices
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Unified interface to command-line, environment, and configuration files.
 test_files: 
 - test/arglist-strategy-tests.rb
 - test/builder-tests.rb
@@ -83,56 +149,3 @@ test_files:
 - test/conversion-tests.rb
 - test/source-tests.rb
 - test/user-choices-slowtests.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-- examples/older/README.txt
-- examples/tutorial/css/LICENSE.txt
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: s4t-utils
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: