slop 3.2.0 → 3.3.0

data/CHANGES.md

@@ -1,3 +1,10 @@
+3.3.0 (2012-05-30)
+------------------
+
+* Fix `:as => :count` when using multiple switches.
+* Ensure range typecast allows negative range values.
+* Ignore nil objects send to #parse instead of choking.
+
 3.2.0 (2012-05-15)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -414,7 +414,7 @@ class Slop
   #
   # Returns nothing.
   def process_item(items, index, &block)
-    item = items[index]
+    return unless item = items[index]
     option, argument = extract_option(item) if item.start_with?('-')
 
     if option
@@ -433,7 +433,7 @@ class Slop
       elsif option.accepts_optional_argument?
         argument ||= items.at(index + 1)
 
-        if argument && argument !~ /\A--?/
+        if argument && argument =~ /\A([^-\-?]|-\d)+/
           execute_option(option, argument, index, item)
         else
           option.call(nil)
@@ -488,7 +488,7 @@ class Slop
     execute_option(option, argument, index)
     argument.split('').each do |key|
       opt = fetch_option(key)
-      opt.count = 1
+      opt.count += 1
       execute_option(opt, argument, index, key)
     end
   end

data/lib/slop/option.rb

@@ -46,7 +46,8 @@ class Slop
         :integer => proc { |v| value_to_integer(v) },
         :float   => proc { |v| value_to_float(v) },
         :array   => proc { |v| v.split(@config[:delimiter], @config[:limit]) },
-        :range   => proc { |v| value_to_range(v) }
+        :range   => proc { |v| value_to_range(v) },
+        :count   => proc { |v| @count }
       }
 
       if long && long.size > @slop.config[:longest_flag]
@@ -85,7 +86,10 @@ class Slop
     # Returns the Object once any type conversions have taken place.
     def value
       value = @value.nil? ? config[:default] : @value
-      return value if [true, false, nil].include?(value)
+
+      if [true, false, nil].include?(value) && config[:as].to_s != 'count'
+        return value
+      end
 
       type = config[:as]
       if type.respond_to?(:call)

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.2.0'
+  s.version     = '3.3.0'
   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

@@ -56,7 +56,7 @@ class OptionTest < TestCase
     opts.on :f=, :as => Integer
     opts.parse %w'-f 1'
     assert_equal 1, opts[:f]
-    
+
     opts = Slop.new(:strict => true) { on :r=, :as => Integer }
     assert_raises(Slop::InvalidArgumentError) { opts.parse %w/-r abc/ }
   end
@@ -78,6 +78,7 @@ class OptionTest < TestCase
     assert_equal (-1..10), option_value(%w/-r -1..10/, :r=, :as => Range)
     assert_equal (1..-10), option_value(%w/-r 1..-10/, :r=, :as => Range)
     assert_equal (1..1), option_value(%w/-r 1/, :r=, :as => Range)
+    assert_equal (-1..10), option_value(%w/-r -1..10/, :r, :as => Range, :optional_argument => true)
 
     opts = Slop.new(:strict => true) { on :r=, :as => Range }
     assert_raises(Slop::InvalidArgumentError) { opts.parse %w/-r abc/ }
@@ -98,6 +99,12 @@ class OptionTest < TestCase
     assert_equal 'rab', opt.value
   end
 
+  test "count type" do
+    assert_equal 3, option_value(%w/-c -c -c/, :c, :as => :count)
+    assert_equal 0, option_value(%w/-a -b -z/, :c, :as => :count)
+    assert_equal 3, option_value(%w/-vvv/, :v, :as => :count)
+  end
+
   # end type casting tests
 
   test "using a default value as fallback" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70135352281960 !ruby/object:Gem::Requirement
+  requirement: &70279515453400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135352281960
+  version_requirements: *70279515453400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70135352280820 !ruby/object:Gem::Requirement
+  requirement: &70279515450800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135352280820
+  version_requirements: *70279515450800
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
 executables: []
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3008846930636062325
+      hash: -452403334270182101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3008846930636062325
+      hash: -452403334270182101
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11