user-choices 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,10 @@
+Version 1.1.4 -- in progress
+  * Enable better command_line documentation: ChoicesBuilder#add_help_line,
+ 	ChoicesBuilder#section, ChoicesBuilder#section_specific_to_script.
+  * One Rakefile instead of two.
+  * Give up on using extensions/string: too many name conflicts, too hard to 
+    avoid. Facets didn't solve the problem.
+
 Version 1.1.3
   * Bugfix: PosixCommandLineSource was not uniformly treated as a 	
     CommandLineSource.

data/Manifest.txt

@@ -3,7 +3,6 @@ LICENSE.txt
 Manifest.txt
 README.txt
 Rakefile
-Rakefile.hoe
 examples/older/README.txt
 examples/older/command-line.rb
 examples/older/default-values.rb
@@ -34,7 +33,5 @@ test/arglist-strategy-tests.rb
 test/builder-tests.rb
 test/command-line-source-tests.rb
 test/conversion-tests.rb
-test/set-standalone-test-paths.rb
 test/source-tests.rb
 test/user-choices-slowtests.rb
-user-choices.tmproj

data/Rakefile

@@ -1,19 +1,58 @@
-# This is a Makefile that would live in the root folder for a package
-# that follows the Scripting for Testers conventions.
+#!/usr/bin/env ruby
+#
+#  Created by Brian Marick on 2007-07-03.
+#  Copyright (c) 2007. All rights reserved.
 
-$started_from_rakefile = true
+require 'hoe'
+require 'lib/user-choices/version'
 
-PACKAGE_ROOT = Dir.pwd
-$:.unshift("#{PACKAGE_ROOT}/lib")
-require 's4t-utils/load-path-auto-adjuster'
+PROJECT='user-choices'
+THIS_RELEASE=UserChoices::Version
+ROOT = "svn+ssh://marick@rubyforge.org/var/svn/#{PROJECT}"
 
-require 's4t-utils'
-include S4tUtils
+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'], 
+                  ['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'
+end
 
-MyFileSystemName='user-choices'  # No ".rb" extension.
-MyModuleName='UserChoices'
-MyRdocFiles = FileList.new("lib/#{MyFileSystemName}.rb",
-                           "lib/#{MyFileSystemName}/**/*.rb").exclude('**/third-party/**')
+require 's4t-utils/rake-task-helpers'
+desc "Run fast tests."
+task 'fast' do
+  S4tUtils.run_particular_tests('test', 'fast')
+end
 
-require 's4t-utils/rakefile-common'
+desc "Run slow tests."
+task 'slow' do
+  S4tUtils.run_particular_tests('test', 'slow')
+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("#{ENV['HOME']}/tmp/exports") do
+    rm_rf PROJECT
+    exec = "svn export #{ROOT}/trunk #{PROJECT}"
+    puts exec
+    system exec
+  end
+end

data/examples/tutorial/index.html

@@ -213,6 +213,9 @@ if $0 == __FILE__ <br />
 		<p>
 		<b><code>builder.add_source(YamlConfigFileSource, <font style="color: #800020;">:from_file</font>, "filename")</code></b> says that the user choices are in a <a href="http://yaml.org/" title="YAML Ain't Markup Language">YAML</a> file named "filename" in the user's home directory. The home directory is found the same way RubyGems finds it. 
 		</p>
+		<p>
+			You can use <b><font style="color: #800020;">:from_complete_path</font></b> if your YAML file isn't in the home directory. In that case, the next argument is a path to the YAML file. It can be either relative or absolute. 
+		</p>
 		<p>
 			YAML files should contain a single level of keys and values. The values can be numbers, strings, and arrays of numbers or strings. Here is an acceptable file:
 			</p>
@@ -237,6 +240,9 @@ if $0 == __FILE__ <br />
 	<dd>
 <p>	<b><code>builder.add_source(XmlConfigFileSource, <font style="color: #800020;">:from_file</font>, "filename")</code></b> says that the user choices are in a XML file named "filename" in the user's home directory. The home directory is found the same way RubyGems finds it. 
 	</p>
+	<p>
+		You can use <b><font style="color: #800020;">:from_complete_path</font></b> if your XML file isn't in the home directory. In that case, the next argument is a path to the XML file. It can be either relative or absolute. 
+	</p>
 	<p>
 		Here is an acceptable XML file:
 	</p>

data/lib/user-choices/builder.rb

@@ -56,6 +56,35 @@ module UserChoices
       @sources << source
       @command_line_source = source if source_class <= CommandLineSource
     end
+    
+    # Add a single line composed of _string_ to the current position in the
+    # help output.
+    def add_help_line(string)
+      user_claims(@command_line_source) {
+        "Can't use 'add_help_string' when there's no command line source."
+      }
+      @command_line_source.add_help_line(string)
+    end
+    
+    # Demarcate a section of help text. It begins with the _description_, 
+    # ends with a dashed line.
+    def section(description)
+      add_help_line("... " + description + ":")
+      yield
+      add_help_line("---------------------------------")
+      add_help_line('')
+    end
+    
+    # In groups of related commands, there are often choices that apply to
+    # all commands and choices that apply only to this particular command.
+    # Use this to define the latter.
+    def section_specific_to_script
+      section("specific to this script") do
+        yield
+      end
+    end
+    
+    
 
     # Once sources and choices have been described, this builds and
     # returns a hash-like object indexed by the choices.

data/lib/user-choices/command-line-source.rb

@@ -3,7 +3,6 @@ require 's4t-utils'
 require 'user-choices/sources.rb'
 require 'user-choices/arglist-strategies'
 include S4tUtils
-require 'extensions/string'
 
 module UserChoices # :nodoc
 
@@ -92,7 +91,11 @@ module UserChoices # :nodoc
       use_strategy(choice, OneOptionalArg)
     end
 
-
+    # Add a single line composed of _string_ to the current position in the
+    # help output.
+    def add_help_line(string)
+      @parser.separator(string)
+    end
 
 
     # Public for testing.
@@ -123,10 +126,11 @@ module UserChoices # :nodoc
     def help_banner(banner, *more)    # :nodoc: 
       @parser.banner = banner
       more.each do | line |
-        @parser.separator(line)
+        add_help_line(line)
       end
-      @parser.separator ''
-      @parser.separator 'Options:'
+      
+      add_help_line ''
+      add_help_line 'Options:'
 
       @parser.on_tail("-?", "-h", "--help", "Show this message.") do
         help
@@ -155,7 +159,7 @@ module UserChoices # :nodoc
       rescue SystemExit
         raise
       rescue Exception => ex
-        message = if ex.message.starts_with?(error_prefix)
+        message = if ex.message.has_exact_prefix?(error_prefix)
                     ex.message
                   else
                     error_prefix + ex.message

data/lib/user-choices/sources.rb

@@ -152,7 +152,11 @@ module UserChoices   # :nodoc
   class FileSource < AbstractSource # :nodoc: 
 
     def from_file(filename)
-      @path = File.join(S4tUtils.find_home, filename)
+      from_complete_path(File.join(S4tUtils.find_home, filename))
+    end
+    
+    def from_complete_path(path)
+      @path = path
       @contents_as_hash = self.read_into_hash
       @contents_as_hash.each do | external_name, value |
         sym = external_name.to_inputable_sym

data/lib/user-choices/version.rb

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

data/test/arglist-strategy-tests.rb

@@ -3,12 +3,12 @@
 #  Created by Brian Marick on 2007-08-10.
 #  Copyright (c) 2007. All rights reserved.
 
-load "set-standalone-test-paths.rb" unless $started_from_rakefile
 require 'test/unit'
 require 's4t-utils'
 require 'builder'
 require 'user-choices/arglist-strategies'
 include S4tUtils
+set_test_paths(__FILE__)
 
 # Since ArglistStrategies were extracted from CommandLineSource, most
 # of the testing is implicit.

data/test/builder-tests.rb

@@ -1,8 +1,8 @@
-load "set-standalone-test-paths.rb" unless $started_from_rakefile
 require 'test/unit'
 require 's4t-utils'
 require 'user-choices'
 include S4tUtils
+set_test_paths(__FILE__)
 
 
 class TestDefaultsAndTypes < Test::Unit::TestCase
@@ -445,9 +445,11 @@ class TestCommandLineConstruction < Test::Unit::TestCase
                        "Usage: prog [options]",
                        "This is supplemental.")
 
-          b.add_choice(:test) { | command_line |
+          b.add_choice(:test, :type => :boolean) { | command_line |
             command_line.uses_switch("--test",
                                      "Here's text for a switch")
+          }
+          b.add_choice(:renew) { | command_line |
             command_line.uses_option("-r", "--renew VALUE",
                                      "Here's text for an option")
           }
@@ -467,103 +469,163 @@ class TestCommandLineConstruction < Test::Unit::TestCase
     }
   end
   
-  class TestSpecialCases  < Test::Unit::TestCase
-    include UserChoices
-    
-    def test_environment_choices_can_be_given_prefix_and_mapping
-      with_environment_vars("prefix_e" =>  "e", "HOME" => '/Users/marick') {
-        b = ChoicesBuilder.new
-        b.add_source(EnvironmentSource, :with_prefix, "prefix_", :mapping, {:home => "HOME" })
-        b.add_choice(:e)
-        b.add_choice(:home)
-        choices = b.build
-        assert_equal("e", choices[:e])
-        assert_equal("/Users/marick", choices[:home])
-      }
-      
-    end
-    
-    
-    def test_required_arg_with_type_conversion
-      with_command_args("2") {
-        b = ChoicesBuilder.new
-        b.add_source(CommandLineSource, :usage, "blah")
-        b.add_choice(:e, :type => :integer) { |command_line | 
-          command_line.uses_arg
-        }
-        choices = b.build
-        assert_equal(2, choices[:e])
-      }
-    end
+  def test_builder_can_add_separators_to_help_text
+    with_command_args('--help') {
+      output = capturing_stderr do
+        assert_wants_to_exit do
+          b = ChoicesBuilder.new
+          b.add_source(CommandLineSource, :usage,
+                       "Usage: prog [options]",
+                       "This is supplemental.")
 
-    def test_required_arg_conversion_prints_right_message
-      with_command_args("b") {
-        b = ChoicesBuilder.new
-        b.add_source(CommandLineSource, :usage, "blah")
-        b.add_choice(:e, :type => :integer) { |command_line | 
-          command_line.uses_arg
-        }
-        output = capturing_stderr do
-          assert_wants_to_exit do    
-            b.build
+          b.add_help_line("==============")
+          b.add_choice(:test) { | command_line |
+            command_line.uses_switch("--test",
+                                     "Here's text for a switch")
+          }
+          b.build
+        end
+      end
+      assert(l1 = output.index("This is supplemental"))
+      assert(l2 = output.index(/==============/))
+      assert(l3 = output.index(/--\[no-\]test.*Here's text for a switch/))
+
+      assert(l1 < l2)
+      assert(l2 < l3)
+    }
+  end
+  
+  def test_builder_can_group_help_text_in_sections
+    with_command_args('--help') {
+      output = capturing_stderr do
+        assert_wants_to_exit do
+          b = ChoicesBuilder.new
+          b.add_source(CommandLineSource, :usage,
+                       "Usage: prog [options]",
+                       "This is supplemental.")
+
+          b.section("section head") do 
+            b.add_choice(:test) { | command_line |
+              command_line.uses_switch("--test",
+                                       "Here's text for a switch")
+            }
           end
+          b.add_choice(:renew) { | command_line |
+            command_line.uses_option("-r", "--renew VALUE",
+                                     "Here's text for an option")
+          }
+          b.build
         end
-        assert_no_match(/^Error in the command line: Error in the command line: /, output)
-      }
-    end
+      end
+      assert(l1 = output.index("This is supplemental"))
+      assert(l2 = output.index(/section head/))
+      assert(l3 = output.index(/--\[no-\]test.*Here's text for a switch/))
+      assert(l4 = output.index(/---------/))
+      assert(l5 = output.index(/Here's text for an option/))
 
-    def test_optional_arg_with_type_conversion
-      with_command_args('2') {
-        b = ChoicesBuilder.new
-        b.add_source(CommandLineSource, :usage, "blah")
-        b.add_choice(:e, :type => :integer) { |command_line | 
-          command_line.uses_optional_arg
-        }
-        choices = b.build
-        assert_equal(2, choices[:e])
+      assert(l1 < l2)
+      assert(l2 < l3)
+      assert(l3 < l4)
+      assert(l4 < l5)
+    }
+  end
+  
+end
+  
+class TestSpecialCases  < Test::Unit::TestCase
+  include UserChoices
+  
+  def test_environment_choices_can_be_given_prefix_and_mapping
+    with_environment_vars("prefix_e" =>  "e", "HOME" => '/Users/marick') {
+      b = ChoicesBuilder.new
+      b.add_source(EnvironmentSource, :with_prefix, "prefix_", :mapping, {:home => "HOME" })
+      b.add_choice(:e)
+      b.add_choice(:home)
+      choices = b.build
+      assert_equal("e", choices[:e])
+      assert_equal("/Users/marick", choices[:home])
+    }
+    
+  end
+  
+  
+  def test_required_arg_with_type_conversion
+    with_command_args("2") {
+      b = ChoicesBuilder.new
+      b.add_source(CommandLineSource, :usage, "blah")
+      b.add_choice(:e, :type => :integer) { |command_line | 
+        command_line.uses_arg
       }
-    end
+      choices = b.build
+      assert_equal(2, choices[:e])
+    }
+  end
 
-    def test_missing_optional_arg_with_type_conversion_is_OK
-      # The type check applies only if the value is given.
-      with_command_args('') {
-        b = ChoicesBuilder.new
-        b.add_source(CommandLineSource, :usage, "blah")
-        b.add_choice(:e, :type => :integer) { |command_line | 
-          command_line.uses_optional_arg
-        }
-        assert_equal(nil, b.build[:e])
+  def test_required_arg_conversion_prints_right_message
+    with_command_args("b") {
+      b = ChoicesBuilder.new
+      b.add_source(CommandLineSource, :usage, "blah")
+      b.add_choice(:e, :type => :integer) { |command_line | 
+        command_line.uses_arg
       }
-    end
-
+      output = capturing_stderr do
+        assert_wants_to_exit do    
+          b.build
+        end
+      end
+      assert_no_match(/^Error in the command line: Error in the command line: /, output)
+    }
   end
 
+  def test_optional_arg_with_type_conversion
+    with_command_args('2') {
+      b = ChoicesBuilder.new
+      b.add_source(CommandLineSource, :usage, "blah")
+      b.add_choice(:e, :type => :integer) { |command_line | 
+        command_line.uses_optional_arg
+      }
+      choices = b.build
+      assert_equal(2, choices[:e])
+    }
+  end
 
-  class TestUtilities  < Test::Unit::TestCase
-    include UserChoices
-    
-    def setup
-      @builder = ChoicesBuilder.new
-    end
-    
-    def test_message_send_splitter
-      assert_equal([[:usage, 'arg']], 
-                   @builder.message_sends([:usage, 'arg']))
-      assert_equal([[:usage, 'arg1', 2]], 
-                   @builder.message_sends([:usage, 'arg1', 2]))
-      assert_equal([[:msg, 'arg1', 2], [:next, 1]], 
-                   @builder.message_sends([:msg, 'arg1', 2, :next, 1]))
-      # a common case
-      assert_equal([[:with_prefix, 'p_'], [:mapping, {:home => 'home'}]],
-                   @builder.message_sends([:with_prefix, 'p_', :mapping, {:home => 'home'}]))
-    end
-    
-    def test_symbol_indices
-      assert_equal([0, 3], @builder.symbol_indices([:foo, 1, 2, :bar, "quux"]))
-    end
+  def test_missing_optional_arg_with_type_conversion_is_OK
+    # The type check applies only if the value is given.
+    with_command_args('') {
+      b = ChoicesBuilder.new
+      b.add_source(CommandLineSource, :usage, "blah")
+      b.add_choice(:e, :type => :integer) { |command_line | 
+        command_line.uses_optional_arg
+      }
+      assert_equal(nil, b.build[:e])
+    }
   end
 
+end
+
 
+class TestUtilities  < Test::Unit::TestCase
+  include UserChoices
+  
+  def setup
+    @builder = ChoicesBuilder.new
+  end
   
+  def test_message_send_splitter
+    assert_equal([[:usage, 'arg']], 
+                 @builder.message_sends([:usage, 'arg']))
+    assert_equal([[:usage, 'arg1', 2]], 
+                 @builder.message_sends([:usage, 'arg1', 2]))
+    assert_equal([[:msg, 'arg1', 2], [:next, 1]], 
+                 @builder.message_sends([:msg, 'arg1', 2, :next, 1]))
+    # a common case
+    assert_equal([[:with_prefix, 'p_'], [:mapping, {:home => 'home'}]],
+                 @builder.message_sends([:with_prefix, 'p_', :mapping, {:home => 'home'}]))
+  end
+  
+  def test_symbol_indices
+    assert_equal([0, 3], @builder.symbol_indices([:foo, 1, 2, :bar, "quux"]))
+  end
 end
 
+

data/test/command-line-source-tests.rb

@@ -1,9 +1,9 @@
-load "set-standalone-test-paths.rb" unless $started_from_rakefile
 require 'test/unit'
 require 's4t-utils'
 require 'builder'
 require 'user-choices'
 include S4tUtils
+set_test_paths(__FILE__)
 
               ### Handling of options with arguments ###
 

data/test/conversion-tests.rb

@@ -3,11 +3,11 @@
 #  Created by Brian Marick on 2007-08-06.
 #  Copyright (c) 2007. All rights reserved.
 
-load "set-standalone-test-paths.rb" unless $started_from_rakefile
 require 'test/unit'
 require 's4t-utils'
 require 'user-choices'
 include S4tUtils
+set_test_paths(__FILE__)
 
 
 class TestDefaultsAndTypes < Test::Unit::TestCase

data/test/source-tests.rb

@@ -1,10 +1,10 @@
-load "set-standalone-test-paths.rb" unless $started_from_rakefile
 require 'test/unit'
 require 's4t-utils'
 require 'builder'
 require 'user-choices'
 include S4tUtils
-require 'extensions/string'
+set_test_paths(__FILE__)
+require 'tempfile'
 
 
 # The general contract of these objects.
@@ -312,6 +312,15 @@ class FileSourceTestCase < Test::Unit::TestCase
       assert_equal(53, choices[:maximum])
     end
   end
+  
+  def test_complete_paths_to_config_file_are_allowed
+    tempfile = Tempfile.new('path-test')
+    tempfile.puts(@some_xml)
+    tempfile.close
+    choices = XmlConfigFileSource.new.from_complete_path(tempfile.path)
+    choices.fill
+    assert_equal('53', choices[:maximum])
+  end
 
 
 
@@ -388,7 +397,7 @@ class YamlConfigFileSourceTestCase < Test::Unit::TestCase
     |   - a.com
     |   - b.com
     | list-arg: 1,2, 3
-    ".trim('|')
+    ".without_pretty_indentation('|')
   end
   
   def test_string_assurance

data/test/user-choices-slowtests.rb

@@ -1,8 +1,8 @@
-load "set-standalone-test-paths.rb" unless $started_from_rakefile
 require 'test/unit'
 require 's4t-utils'
 require 'user-choices'
 include S4tUtils
+set_test_paths(__FILE__)
 
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: user-choices
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
-date: 2007-09-19 00:00:00 -05:00
+  version: 1.1.4
+date: 2007-09-28 00:00:00 -05:00
 summary: Unified interface to command-line, environment, and configuration files.
 require_paths: 
 - lib
@@ -34,7 +34,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- Rakefile.hoe
 - examples/older/README.txt
 - examples/older/command-line.rb
 - examples/older/default-values.rb
@@ -65,16 +64,15 @@ files:
 - test/builder-tests.rb
 - test/command-line-source-tests.rb
 - test/conversion-tests.rb
-- test/set-standalone-test-paths.rb
 - test/source-tests.rb
 - test/user-choices-slowtests.rb
-- user-choices.tmproj
 test_files: 
 - test/arglist-strategy-tests.rb
 - test/builder-tests.rb
 - test/command-line-source-tests.rb
 - test/conversion-tests.rb
 - test/source-tests.rb
+- test/user-choices-slowtests.rb
 rdoc_options: 
 - --main
 - README.txt
@@ -107,16 +105,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extensions
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 1.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder

data/Rakefile.hoe

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Brian Marick on 2007-07-03.
-#  Copyright (c) 2007. All rights reserved.
-
-require 'hoe'
-require 'lib/user-choices/version'
-
-Hoe.new("user-choices", UserChoices::Version) do |p|
-  p.rubyforge_name = "user-choices"
-  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'], 
-                  ['s4t-utils', '>= 1.0.2'],
-                  ['extensions', '>= 0.6.0'],    # for testing
-                  ['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'
-end

data/test/set-standalone-test-paths.rb

@@ -1,5 +0,0 @@
-require 'pathname'
-
-PACKAGE_ROOT = Pathname.new(__FILE__).parent.parent.to_s
-$:.unshift("#{PACKAGE_ROOT}/lib")
-require 's4t-utils/load-path-auto-adjuster'

data/user-choices.tmproj

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>currentDocument</key>
-	<string>History.txt</string>
-	<key>documents</key>
-	<array>
-		<dict>
-			<key>expanded</key>
-			<true/>
-			<key>name</key>
-			<string>user-choices</string>
-			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
-			<key>selected</key>
-			<true/>
-			<key>sourceDirectory</key>
-			<string></string>
-		</dict>
-	</array>
-	<key>fileHierarchyDrawerWidth</key>
-	<integer>246</integer>
-	<key>metaData</key>
-	<dict>
-		<key>History.txt</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>10</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>lib/user-choices.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>11</integer>
-				<key>line</key>
-				<integer>9</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>97</integer>
-		</dict>
-		<key>lib/user-choices/arglist-strategies.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>5</integer>
-				<key>line</key>
-				<integer>160</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>111</integer>
-		</dict>
-		<key>lib/user-choices/builder.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>53</integer>
-				<key>line</key>
-				<integer>56</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>lib/user-choices/command-line-source.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>31</integer>
-				<key>line</key>
-				<integer>56</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>107</integer>
-		</dict>
-		<key>lib/user-choices/sources.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>lib/user-choices/version.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>18</integer>
-				<key>line</key>
-				<integer>1</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>test/builder-tests.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>5</integer>
-				<key>line</key>
-				<integer>83</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>138</integer>
-		</dict>
-		<key>test/source-tests.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>25</integer>
-				<key>line</key>
-				<integer>399</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>378</integer>
-		</dict>
-	</dict>
-	<key>openDocuments</key>
-	<array>
-		<string>lib/user-choices/command-line-source.rb</string>
-		<string>lib/user-choices/builder.rb</string>
-		<string>test/builder-tests.rb</string>
-		<string>test/source-tests.rb</string>
-		<string>History.txt</string>
-		<string>lib/user-choices.rb</string>
-		<string>lib/user-choices/version.rb</string>
-		<string>lib/user-choices/sources.rb</string>
-		<string>lib/user-choices/arglist-strategies.rb</string>
-	</array>
-	<key>showFileHierarchyDrawer</key>
-	<true/>
-	<key>windowFrame</key>
-	<string>{{8, 0}, {861, 778}}</string>
-</dict>
-</plist>