trollop 1.12 → 1.13

data/History.txt

@@ -1,3 +1,6 @@
+== 1.13 / 2009-03-16
+* Fix parsing of "--longarg=<value with spaces>".
+
 == 1.12 / 2009-01-30
 * Fix some unit test failures in the last release. Should be more careful.
 * Make default short options only be assigned *after* all user-specified

data/README.txt

@@ -6,7 +6,9 @@ Main page: http://trollop.rubyforge.org
 
 Release announcements and comments: http://all-thing.net/search/label/trollop
 
-Documentation quickstart: See Trollop::options and Trollop::Parser#opt.
+Documentation quickstart: See Trollop::options (for some reason rdoc isn't
+linking that; it's in the top right of the screen if you're browsing online)
+and then Trollop::Parser#opt. Also see the examples at http://trollop.rubyforge.org/.
 
 == DESCRIPTION
 

data/lib/trollop.rb

@@ -5,7 +5,7 @@
 
 module Trollop
 
-VERSION = "1.12"
+VERSION = "1.13"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
@@ -287,15 +287,14 @@ class Parser
     ## resolve symbols
     given_args = {}
     @leftovers = each_arg cmdline do |arg, params|
-      sym = 
-        case arg
-        when /^-([^-])$/
-          @short[$1]
-        when /^--([^-]\S*)$/
-          @long[$1]
-        else
-          raise CommandlineError, "invalid argument syntax: '#{arg}'"
-        end
+      sym = case arg
+      when /^-([^-])$/
+        @short[$1]
+      when /^--([^-]\S*)$/
+        @long[$1]
+      else
+        raise CommandlineError, "invalid argument syntax: '#{arg}'"
+      end
       raise CommandlineError, "unknown argument '#{arg}'" unless sym
 
       if given_args.include?(sym) && !@specs[sym][:multi]
@@ -491,7 +490,7 @@ private
       when /^--$/ # arg terminator
         remains += args[(i + 1) .. -1]
         return remains
-      when /^--(\S+?)=(\S+)$/ # long argument with equals
+      when /^--(\S+?)=(.*)$/ # long argument with equals
         yield "--#{$1}", [$2]
         i += 1
       when /^--(\S+)$/ # long argument

data/test/test_trollop.rb

@@ -548,7 +548,9 @@ EOM
     assert_equal "goat", opts[:arg]
     assert_nothing_raised { opts = @p.parse %w(--arg=goat) }
     assert_equal "goat", opts[:arg]
-    assert_raises(CommandlineError) { opts = @p.parse %w(--arg= goat) }
+    ## actually, this next one is valid. empty string for --arg, and goat as a
+    ## leftover.
+    ## assert_raises(CommandlineError) { opts = @p.parse %w(--arg= goat) }
   end
 
   def test_auto_generated_long_names_convert_underscores_to_hyphens
@@ -990,6 +992,16 @@ EOM
     assert !opts[:aab]
     assert opts[:ccd]
   end
+
+  def test_accepts_arguments_with_spaces
+    @p.opt :arg1, "arg", :type => String
+    @p.opt :arg2, "arg2", :type => String
+
+    opts = @p.parse ["--arg1", "hello there", "--arg2=hello there"]
+    assert_equal "hello there", opts[:arg1]
+    assert_equal "hello there", opts[:arg2]
+    assert_equal 0, @p.leftovers.size
+  end
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trollop
 version: !ruby/object:Gem::Version 
-  version: "1.12"
+  version: "1.13"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-30 00:00:00 -08:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: "Documentation quickstart: See Trollop::options and Trollop::Parser#opt.  == DESCRIPTION  == REQUIREMENTS  * A burning desire to write less code.  == INSTALL  * gem install trollop  == LICENSE  Copyright (c) 2008 William Morgan. Trollop is distributed under the same terms as Ruby."
+description: "Documentation quickstart: See Trollop::options (for some reason rdoc isn't linking that; it's in the top right of the screen if you're browsing online) and then Trollop::Parser#opt. Also see the examples at http://trollop.rubyforge.org/.  == DESCRIPTION  == REQUIREMENTS  * A burning desire to write less code.  == INSTALL  * gem install trollop  == LICENSE  Copyright (c) 2008 William Morgan. Trollop is distributed under the same terms as Ruby."
 email: wmorgan-trollop@masanjin.net
 executables: []