slop 2.4.1 → 2.4.2

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.4.2 (2011-12-18)
+------------------
+
+* Fix checking of required options (Dominik Honnef)
+
 2.4.1 (2011-12-08)
 ------------------
 

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -229,9 +229,7 @@ class Slop
     private
 
     def arg_value(value)
-      if accepts_optional_argument? || expects_argument?
-        value
-      end
+      value if accepts_optional_argument? || expects_argument?
     end
 
     def value_to_range(value)
@@ -881,7 +879,7 @@ class Slop
 
   def raise_if_missing_required_options!(items)
     @options.select(&:required).each do |o|
-      unless items.select {|i| i[/\A--?/] }.any? {|i| i.to_s.sub(/\A--?/, '') == o.key }
+      if o.argument_value.nil?
         raise MissingOptionError, "Expected option `#{o.key}` is required"
       end
     end
@@ -1048,4 +1046,4 @@ class Slop
     options.push((@arguments || extras[:argument]) ? true : (args.shift ? true : false))
     options.push extras
   end
-end
+end

data/slop.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies: []
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Option gathering made easy