user-choices 1.1.4 → 1.1.5

data/History.txt

@@ -1,4 +1,10 @@
-Version 1.1.4 -- in progress
+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. 
+  * Example slowtests didn't set the libpath, so they used the gem version.
+  * Better release process Rakefile.
+
+Version 1.1.4
   * Enable better command_line documentation: ChoicesBuilder#add_help_line,
  	ChoicesBuilder#section, ChoicesBuilder#section_specific_to_script.
   * One Rakefile instead of two.

data/Manifest.txt

@@ -11,6 +11,16 @@ examples/older/postprocess.rb
 examples/older/switches.rb
 examples/older/two-args.rb
 examples/older/types.rb
+examples/tutorial/css/LICENSE.txt
+examples/tutorial/css/bg2.gif
+examples/tutorial/css/left.gif
+examples/tutorial/css/left_on.gif
+examples/tutorial/css/main.css
+examples/tutorial/css/right.gif
+examples/tutorial/css/right_on.gif
+examples/tutorial/css/tvline.gif
+examples/tutorial/css/von-foerster.jpg
+examples/tutorial/css/von-foerster2.jpg
 examples/tutorial/index.html
 examples/tutorial/tutorial1.rb
 examples/tutorial/tutorial2.rb

data/Rakefile

@@ -9,6 +9,9 @@ require 'lib/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|
   p.rubyforge_name = PROJECT
@@ -37,6 +40,21 @@ 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"
@@ -49,10 +67,33 @@ end
 
 desc "Export to ~/tmp/exports/#{PROJECT}"
 task 'export' do 
-  Dir.chdir("#{ENV['HOME']}/tmp/exports") 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

data/examples/older/command-line.rb

@@ -1,9 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/older/default-values.rb

@@ -1,10 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/older/multiple-sources.rb

@@ -1,9 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/older/postprocess.rb

@@ -1,10 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/older/switches.rb

@@ -1,10 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/older/two-args.rb

@@ -1,10 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/older/types.rb

@@ -1,10 +1,4 @@
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
+#!/usr/bin/env ruby
 
 require 'pp'
 require 'user-choices'

data/examples/tutorial/css/LICENSE.txt

@@ -0,0 +1 @@
+This work is public domain.This work is public domain.

data/examples/tutorial/css/main.css

@@ -0,0 +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:253px;
+}
+
+#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

@@ -6,18 +6,37 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
 	<title>Using User-Choices</title>
+	<link rel="stylesheet" type="text/css" media="screen" href="css/main.css" />
 	
 </head>
  
 <body>
-<h1 style="text-align: center">Using the User-Choices gem</h1>
-<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>
+	<div id="pageBody">
+		<div id="outer-container">
+			<div id="container">
+			<div id="header">
+				<div id="headerLeft"></div>
+				<div id="headerRight"><h1>User Choices</h1><span class="highlight"><h2>Act always to increase the number of choices <br /> &mdash; Heinz von Foerster</h2></span></div>
+			</div>
+			<div id="headerNav">
+					<div id="centerNav">
+					<ul>
+							<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>
+					</ul>
+					</div>
+			</div>
+			<div id="content">
+  
+	
+	
 
 <p>
-	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.
+	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 <strong>configuration file</strong>. Sometimes they want to change the default. Maybe they'll want a one-time change; for that, a <strong>command-line option</strong> is best. But sometimes they'll want to make the change for an entire login session; for that, setting an <strong>environment variable</strong> is most convenient.
 </p>
 <p>
-	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.
+	<strong>The User-Choices gem gives your code a unified interface to all those sources.</strong> Your code can obey the user's choices without having to bother (much) about how she made them.
 </p>
 
 <p>
@@ -78,7 +97,7 @@ if $0 == __FILE__ <br />
 
 <blockquote>
 	<code>
-		$ ruby tutorial1.rb<br/>
+		$ ruby <a href="tutorial1.rb">tutorial1.rb</a><br/>
 		There are 0 connections.<br/>
 		{:connections=>0}<br/>
 	</code>
@@ -301,12 +320,12 @@ if $0 == __FILE__ <br />
 </p>
 <blockquote><table bgcolor="white" border="0"><tr><td>
 <code>
-&nbsp;&nbsp;<font style="color: #002FBD;">def</font> <font style="color: #600080;">add_choices</font>(builder) <br />
-&nbsp;&nbsp;&nbsp;&nbsp;builder.add_choice(<font style="color: #800020;">:connections</font>, <font style="color: #800020;">:type</font>=><font style="color: #800020;">:integer</font>, :<font style="color: #800020;">default</font>=>0) { | command_line | <br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;command_line.uses_option("-c", "--connections COUNT", <br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Number of connections to open.") <br />
-&nbsp;&nbsp;&nbsp;&nbsp;} <br />
-&nbsp;&nbsp;<font style="color: #002FBD;">end</font> <br />
+<font style="color: #002FBD;">def</font> <font style="color: #600080;">add_choices</font>(builder) <br />
+&nbsp;&nbsp;builder.add_choice(<font style="color: #800020;">:connections</font>, <font style="color: #800020;">:type</font>=><font style="color: #800020;">:integer</font>, :<font style="color: #800020;">default</font>=>0) { | command_line | <br />
+&nbsp;&nbsp;&nbsp;&nbsp;command_line.uses_option("-c", "--connections COUNT", <br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Number of connections to open.") <br />
+&nbsp;&nbsp;} <br />
+<font style="color: #002FBD;">end</font> <br />
 </code>
 
 </td></tr></table></blockquote>
@@ -410,10 +429,10 @@ if $0 == __FILE__ <br />
 		
 		<blockquote><table bgcolor="white" border="0"><tr><td>
 		<code>
-		&nbsp;&nbsp;&nbsp;&nbsp;builder.add_choice(<font style="color: #800020;">:ssh</font>, <font style="color: #800020;">:type</font>=><font style="color: #800020;">:boolean</font>, :<font style="color: #800020;">default</font>=>false) { | command_line | <br />
-		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;command_line.uses_switch("-s", "--ssh", <br />
-		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Use ssh to open connection.") <br />
-		&nbsp;&nbsp;&nbsp;&nbsp;} <br />
+		&nbsp;&nbsp;builder.add_choice(<font style="color: #800020;">:ssh</font>, <font style="color: #800020;">:type</font>=><font style="color: #800020;">:boolean</font>, :<font style="color: #800020;">default</font>=>false) { | command_line | <br />
+		&nbsp;&nbsp;&nbsp;&nbsp;command_line.uses_switch("-s", "--ssh", <br />
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"Use ssh to open connection.") <br />
+		&nbsp;&nbsp;} <br />
 		</code>
 		
 		</td></tr></table></blockquote>
@@ -423,7 +442,7 @@ if $0 == __FILE__ <br />
 
 		
 		<blockquote><code>
-			$ ruby tutorial2.rb --ssh<br />
+			$ ruby <a href="tutorial2.rb">tutorial2.rb</a> --ssh<br />
 			SSH should be used. <br />
 			$ ruby tutorial2.rb --s file <br />
 			SSH should be used. <br />
@@ -471,7 +490,7 @@ if $0 == __FILE__ <br />
 		</td></tr></table></blockquote>
 		
 		<blockquote><code>
-		 $ ruby tutorial3.rb arg1 arg2 <br />
+		 $ ruby <a href="tutorial3.rb">tutorial3.rb</a> arg1 arg2 <br />
 		SSH should not be used. <br />
 		There are 19 connections. <br />
 		{<b>:files=>["arg1", "arg2"]</b>, :ssh=>false, :connections=>19} <br />
@@ -526,7 +545,7 @@ There are 19 connections. <br />
 </td></tr></table></blockquote>
 
 <blockquote><code>
-	 $ ruby tutorial4.rb 1 2 3 <br />
+	 $ ruby <a href="tutorial4.rb">tutorial4.rb</a> 1 2 3 <br />
 	<b>Error in the command line: 3 arguments given, 1 or 2 expected.</b> <br />
 	Usage: ruby tutorial4.rb [options] file1 [file2] <br />
  <br />
@@ -563,7 +582,7 @@ There are 19 connections. <br />
 		</td></td></table></blockquote>
 		
 		<blockquote><code>
-			$ ruby tutorial5.rb 1 <br />
+			$ ruby <a href="tutorial5.rb">tutorial5.rb</a> 1 <br />
 			{:infile=>"1"} <br />
 			$ ruby tutorial5.rb <br />
 			Error in the command line: 0 arguments given, 1 expected. <br />
@@ -591,7 +610,7 @@ There are 19 connections. <br />
 		</td></td></table></blockquote>
 
 			<blockquote><code>
-				 $ ruby tutorial6.rb <br />
+				 $ ruby <a href="tutorial6.rb">tutorial6.rb</a> <br />
 				{} <br />
 			</code></blockquote>			
 	</dd>
@@ -637,7 +656,7 @@ There are 19 connections. <br />
 	</td></tr></table></blockquote>
 	
 	<blockquote><code>
-		 $ ruby tutorial7.rb one two <br />
+		 $ ruby <a href="tutorial7.rb">tutorial7.rb</a> one two <br />
 		{:outfile=>"two", :files=>["one", "two"], :infile=>"one"} <br />	</code></blockquote>			
 
 <p>There's no need to call <code>postprocess_user_choices</code> yourself. It's done automatically.</p>	
@@ -650,5 +669,13 @@ There are 19 connections. <br />
 		</p>
 	</li>
 </ul>
+
+
+
+        </div>
+        </div>
+	</div>
+</div>
+
 </body>
 </html>

data/examples/tutorial/tutorial1.rb

@@ -5,13 +5,6 @@
 
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/examples/tutorial/tutorial2.rb

@@ -3,16 +3,8 @@
 #  Created by Brian Marick on 2007-08-09.
 #  Copyright (c) 2007. All rights reserved.
 
-
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/examples/tutorial/tutorial3.rb

@@ -3,16 +3,8 @@
 #  Created by Brian Marick on 2007-08-09.
 #  Copyright (c) 2007. All rights reserved.
 
-
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/examples/tutorial/tutorial4.rb

@@ -3,16 +3,8 @@
 #  Created by Brian Marick on 2007-08-09.
 #  Copyright (c) 2007. All rights reserved.
 
-
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/examples/tutorial/tutorial5.rb

@@ -5,13 +5,6 @@
 
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/examples/tutorial/tutorial6.rb

@@ -5,13 +5,6 @@
 
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/examples/tutorial/tutorial7.rb

@@ -5,13 +5,6 @@
 
 # See the tutorial for explanations.
 
-### The following adjusts the load path so that the correct version of
-### a self-contained package is found, no matter where the script is
-### run from. 
-require 'pathname'
-$:.unshift((Pathname.new(__FILE__).parent.parent.parent + 'lib').to_s)
-require 's4t-utils/load-path-auto-adjuster'
-
 require 'pp'
 require 'user-choices'
 

data/lib/user-choices/version.rb

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

data/test/user-choices-slowtests.rb

@@ -12,8 +12,9 @@ class Examples < Test::Unit::TestCase
     eval(result)
   end
 
-  EX = "ruby #{PACKAGE_ROOT}/examples/older/"
-  TUT = "ruby #{PACKAGE_ROOT}/examples/tutorial/"
+  LIB="-I#{PACKAGE_ROOT}/lib"
+  EX = "ruby #{LIB} #{PACKAGE_ROOT}/examples/older/"
+  TUT = "ruby #{LIB} #{PACKAGE_ROOT}/examples/tutorial/"
 
   require "#{PACKAGE_ROOT}/examples/older/command-line"
   # require "#{PACKAGE_ROOT}/examples/default-values" # not needed
@@ -22,6 +23,7 @@ class Examples < Test::Unit::TestCase
   require "#{PACKAGE_ROOT}/examples/older/switches"
   require "#{PACKAGE_ROOT}/examples/older/two-args"
   require "#{PACKAGE_ROOT}/examples/older/types"
+  
 
 
   def test_succeeding_examples

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: user-choices
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 date: 2007-09-28 00:00:00 -05:00
 summary: Unified interface to command-line, environment, and configuration files.
 require_paths: 
@@ -42,6 +42,16 @@ files:
 - examples/older/switches.rb
 - examples/older/two-args.rb
 - examples/older/types.rb
+- examples/tutorial/css/LICENSE.txt
+- examples/tutorial/css/bg2.gif
+- examples/tutorial/css/left.gif
+- examples/tutorial/css/left_on.gif
+- examples/tutorial/css/main.css
+- examples/tutorial/css/right.gif
+- examples/tutorial/css/right_on.gif
+- examples/tutorial/css/tvline.gif
+- examples/tutorial/css/von-foerster.jpg
+- examples/tutorial/css/von-foerster2.jpg
 - examples/tutorial/index.html
 - examples/tutorial/tutorial1.rb
 - examples/tutorial/tutorial2.rb
@@ -82,6 +92,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - examples/older/README.txt
+- examples/tutorial/css/LICENSE.txt
 executables: []
 
 extensions: []