slop 2.4.3 → 2.4.4

data/CHANGES.md

@@ -1,5 +1,13 @@
-HEAD
-----
+2.4.4 (2012-02-07)
+------------------
+
+* Ensure options taking arguments to not parsing an argument which
+  is an option (#56)
+* Ensure `:as => Range` returns a type of Range even if the value looks
+  like an Integer (#48)
+
+2.4.3 (2012-01-16)
+------------------
 
 * Allow the `:as` option to accept an object responding to :call for
   custom type conversions (#45)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Lee Jarvis
+Copyright (c) 2012 Lee Jarvis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,6 +3,9 @@ Slop
 
 Slop is a simple, lightweight option parser with an easy to remember syntax and friendly API.
 
+Note that this is the `v2` branch. If you are looking for version 3 of Slop
+please check out the [master branch](https://github.com/injekt/slop).
+
 Installation
 ------------
 
@@ -38,7 +41,7 @@ opts[:age]    #=> nil
 ```
 
 For more information about creating options, see the
-[Creating Options](https://github.com/injekt/slop/wiki/Creating-Options)
+[Creating Options](https://github.com/injekt/slop/wiki/Creating-Options---v2)
 wiki page.
 
 You can also return your options as a Hash
@@ -228,7 +231,7 @@ opts[:people] #=> ['lee', 'john', 'bill']
 ```
 
 Slop supports a few styles of list parsing. Check out
-[this wiki page](https://github.com/injekt/slop/wiki/Lists) for more info.
+[this wiki page](https://github.com/injekt/slop/wiki/Lists---v2) for more info.
 
 Strict Mode
 -----------
@@ -248,7 +251,7 @@ Check out the following wiki pages for more features:
 
 * [Ranges](https://github.com/injekt/slop/wiki/Ranges)
 * [Auto Create](https://github.com/injekt/slop/wiki/Auto-Create)
-* [Commands](https://github.com/injekt/slop/wiki/Commands)
+* [Commands](https://github.com/injekt/slop/wiki/Commands---v2)
 
 Woah woah, why you hating on OptionParser?
 ------------------------------------------

data/Rakefile

@@ -3,10 +3,11 @@ begin
 rescue LoadError
 end
 
-desc 'Run the test suite'
-task :test do
-  $:.unshift './test'
-  Dir.glob("test/*_test.rb").each { |test| require "./#{test}" }
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = Dir['test/*_test.rb']
 end
 
 task :default => :test

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -243,7 +243,7 @@ class Slop
       when /\A(-?\d+?)(\.\.\.?|-|,)(-?\d+)\z/
         Range.new($1.to_i, $3.to_i, $2 == '...')
       when /\A-?\d+\z/
-        value.to_i
+        Range.new(value.to_i, value.to_i)
       else
         value
       end
@@ -840,7 +840,7 @@ class Slop
             raise MissingArgumentError, "'#{option.key}' expects an argument, none given"
           end
 
-          if argument
+          if argument && argument !~ /^--?[a-zA-Z_-]+/
             if option.match and not argument.match(option.match)
               raise InvalidArgumentError, "'#{argument}' does not match #{option.match.inspect}"
             end

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '2.4.3'
+  s.version = '2.4.4'
   s.summary = 'Option gathering made easy'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author = 'Lee Jarvis'

data/test/option_test.rb

@@ -98,7 +98,6 @@ class OptionTest < TestCase
     assert_equal nil, option_value(%w/-i/, :i, :as => :array)
     assert_equal nil, option_value(%w/-i/, :i, :as => :range)
 
-    assert_equal 1, option_value(%w/-i 1/, :i, :optional => true, :as => :range)
     assert_equal nil, option_value(%w/-i/, :i, :optional => true, :as => :range)
   end
 
@@ -114,7 +113,8 @@ class OptionTest < TestCase
     # return value.to_i if the value is /\A\d+\z/
     # maybe this should raise if Slop#strict?
     assert_equal "1abc10", option_value(%w/-r 1abc10/, :r, true, :as => Range)
-    assert_equal 1, option_value(%w/-r 1/, :r, true, :as => Range)
+    assert_equal (1..1), option_value(%w/-r 1/, :r, true, :as => Range)
+    assert_equal (2..2), option_value(%w/-r 2/, :r, true, :as => Range)
   end
 
   test 'printing options' do

data/test/slop_test.rb

@@ -593,4 +593,10 @@ class SlopTest < TestCase
     Slop.parse!(items)
     assert_equal %w(-1), items
   end
+
+  test "options taking arguments should ignore argument that look like options (wut?)" do
+    opts = Slop.new { on :v; on :foo, :optional => true, :default => 5, :as => Integer }
+    opts.parse %w[ -c -v ]
+    assert_equal 5, opts[:foo]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies: []
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co