slop 3.0.0 → 3.0.1

data/CHANGES.md

@@ -1,3 +1,10 @@
+HEAD
+----
+
+* Ensure tests run green on 1.8.7
+* Ensure `:argument => :optional` works with `:option=` format.
+* Ruby 1.8.7 compat fix (dont chain Enumerable methods!) (Eric Anderson)
+
 3.0.0 (2012-01-24)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -335,7 +335,7 @@ class Slop
     heads  = options.reject(&:tail?)
     tails  = (options - heads)
     opts = (heads + tails).select(&:help).map(&:to_s)
-    optstr = opts.map.with_index { |o, i|
+    optstr = opts.each_with_index.map { |o, i|
       (str = @separators[i + 1]) ? [o, str].join("\n") : o
     }.join("\n")
     config[:banner] ? config[:banner] + "\n" + optstr : optstr
@@ -519,10 +519,13 @@ class Slop
     config[:argument] = true if @config[:arguments]
     config[:optional_argument] = true if @config[:optional_arguments]
 
-    short  = extract_short_flag(objects, config)
-    long   = extract_long_flag(objects, config)
-    desc   = objects[0].respond_to?(:to_str) ? objects.shift : nil
-    config = config.merge!(objects.last) if objects.last.is_a?(Hash)
+    if objects.last.is_a?(Hash)
+      config = config.merge!(objects.last)
+      objects.pop
+    end
+    short = extract_short_flag(objects, config)
+    long  = extract_long_flag(objects, config)
+    desc  = objects[0].respond_to?(:to_str) ? objects.shift : nil
 
     Option.new(self, short, long, desc, config, &block)
   end
@@ -535,7 +538,7 @@ class Slop
     flag = clean(objects.first)
 
     if flag.size == 2 && flag[-1, 1] == '='
-      config[:argument] = true
+      config[:argument] ||= true
       flag.chop!
     end
 
@@ -552,7 +555,7 @@ class Slop
   def extract_long_flag(objects, config)
     flag = objects.first.to_s
     if flag =~ /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\=?\??\z/
-      config[:argument] = true if flag[-1, 1] == '='
+      config[:argument] ||= true if flag[-1, 1] == '='
       config[:optional_argument] = true if flag[-2, 2] == '=?'
       objects.shift
       clean(flag).sub(/\=\??\z/, '')

data/slop.gemspec

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

@@ -52,7 +52,10 @@ class OptionTest < TestCase
   end
 
   test "integer type cast" do
-    assert_equal 1, option_value(%w'-f 1', :f=, :as => Integer)
+    opts = Slop.new
+    opts.on :f=, :as => Integer
+    opts.parse %w'-f 1'
+    assert_equal 1, opts[:f]
   end
 
   test "symbol type cast" do

metadata

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