slop 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ec5394f499e02a0abeb5341ed660ef3822dfa3
-  data.tar.gz: 4cc1f6f9d754ae2b45c813c96c544669756650bd
+  metadata.gz: 68937e18cd6530ee2f31c7ef36a4cd7cb8259f05
+  data.tar.gz: bcfe723b43f378c5205b44c2b10aa063692d4241
 SHA512:
-  metadata.gz: 2e11fa1d72ee94114ca1153ba79b0b114bf6720a60cb90d923f976e934c9988b8ea7bab24960b86115c65e31a5dbe6a715564f57efd97b13dd690210370d52ed
-  data.tar.gz: f9ee6be396f7ae956ece36166d2c272b464dad70c1525d1a61eb0955181bee64973307694679ba634ec1baf97529b0509ed00d95cb1bdc1a29204d6867174f13
+  metadata.gz: fd370624b2039b5367c994d0c3f5cbcfad850a8f9da3972d579c7c04f53e67204d7ade792e287099a8fdd83b784e13ca4f69250a9f20d587fc876e13dcb95c5c
+  data.tar.gz: 5329b9d7c8c5afe7806e99fdc90bd0dd0e5da49c0b2c278df1cb9519c2cf478662911a1b5abfbee502d2dfa0927dddd3504a0fc517633ca763084b49b12fee69

data/CHANGES.md

@@ -1,3 +1,8 @@
+HEAD
+----
+
+* Allow specifying long options starting with numbers (#110, Peter Zotov)
+
 3.4.4 (2013-03-12)
 ------------------
 

data/README.md

@@ -175,8 +175,8 @@ require 'slop'
 
 opts = Slop.parse do
   on :n, :name=, 'Your name'
-  on :a, :age=, 'Your age', :as => :int
+  on :a, :age=, 'Your age', as: Integer
 end
 
 opts.to_hash #=> { :name => 'lee', :age => 105 }
-```
+```

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.4.4'
+  VERSION = '3.4.5'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -61,7 +61,7 @@ class Slop
     # Returns a new instance of Slop.
     def parse!(items = ARGV, config = {}, &block)
       config, items = items, ARGV if items.is_a?(Hash) && config.empty?
-      slop = Slop.new config, &block
+      slop = new config, &block
       slop.parse! items
       slop
     end
@@ -511,7 +511,7 @@ class Slop
           option.call(nil)
         end
       elsif config[:multiple_switches] && argument
-        execute_multiple_switches(option, argument, index)
+        execute_multiple_switches(option, argument, items, index)
       else
         option.value = option.count > 0
         option.call(nil)
@@ -559,15 +559,22 @@ class Slop
   #
   # option   - The first Option object.
   # argument - The argument to this option. (Split into multiple Options).
+  # items    - The Array of items currently being parsed.
   # index    - The index of the current item being processed.
   #
   # Returns nothing.
-  def execute_multiple_switches(option, argument, index)
+  def execute_multiple_switches(option, argument, items, index)
     execute_option(option, nil, index)
-    argument.split('').each do |key|
+    flags = argument.split('')
+    flags.each do |key|
       next unless opt = fetch_option(key)
       opt.count += 1
-      execute_option(opt, nil, index, key)
+      if (opt.expects_argument? || opt.accepts_optional_argument?) &&
+          (flags[-1] == opt.key) && (val = items[index+1])
+        execute_option(opt, val, index, key)
+      else
+        execute_option(opt, nil, index, key)
+      end
     end
   end
 
@@ -654,7 +661,7 @@ class Slop
   # config  - The Hash of configuration options built in #build_option.
   def extract_long_flag(objects, config)
     flag = objects.first.to_s
-    if flag =~ /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\=?\??\z/
+    if flag =~ /\A(?:--?)?[a-zA-Z0-9][a-zA-Z0-9_.-]+\=?\??\z/
       config[:argument] ||= true if flag.end_with?('=')
       config[:optional_argument] = true if flag.end_with?('=?')
       objects.shift

data/slop.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.4.4'
+  s.version     = '3.4.5'
   s.summary     = 'Simple Lightweight Option Parsing'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author      = 'Lee Jarvis'
-  s.email       = 'lee@jarvis.co'
+  s.email       = 'ljjarvis@gmail.com'
   s.homepage    = 'http://github.com/injekt/slop'
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- test/*`.split("\n")
@@ -13,5 +13,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', '~> 5.0.0'
 end

data/test/helper.rb

@@ -1,14 +1,11 @@
 $VERBOSE = true
 
-unless Object.const_defined? 'Slop'
-  $:.unshift File.expand_path('../../lib', __FILE__)
-  require 'slop'
-end
+require 'slop'
 
 require 'minitest/autorun'
 require 'stringio'
 
-class TestCase < MiniTest::Unit::TestCase
+class TestCase < Minitest::Test
   def self.test(name, &block)
     define_method("test_#{name.gsub(/\W/, '_')}", &block) if block
   end

data/test/slop_test.rb

@@ -36,6 +36,7 @@ class SlopTest < TestCase
     assert_equal [nil, 'foo', nil, {}], build_option(:foo)
     assert_equal ['f', nil, 'Some description', {}], build_option(:f, 'Some description')
     assert_equal ['f', 'foo', nil, {}], build_option(:f, :foo)
+    assert_equal [nil, '1.8', 'Use v. 1.8', {}], build_option('--1.8', 'Use v. 1.8')
 
     # with arguments
     assert_equal ['f', nil, nil, {:argument=>true}], build_option('f=')
@@ -131,9 +132,11 @@ class SlopTest < TestCase
   end
 
   test "default help exits" do
-    slop = Slop.new :help => true
-    assert_raises SystemExit do
-      slop.parse %w/--help/
+    temp_stdout do
+      slop = Slop.new :help => true
+      assert_raises SystemExit do
+        slop.parse %w/--help/
+      end
     end
   end
 
@@ -244,6 +247,12 @@ class SlopTest < TestCase
     assert_equal %w'foo', args
   end
 
+  test "multiple options should still accept trailing arguments" do
+    opts = Slop.new { on :a; on :b= }
+    opts.parse %w'-ab foo'
+    assert_equal 'foo', opts[:b]
+  end
+
   test "setting/getting the banner" do
     opts = Slop.new :banner => 'foo'
     assert_equal 'foo', opts.banner
@@ -339,13 +348,17 @@ class SlopTest < TestCase
   test "printing help with :help => true" do
     temp_stdout do |string|
       opts = Slop.new(:help => true, :banner => false)
-      opts.parse %w( --help )
+      assert_raises SystemExit do
+        opts.parse %w( --help )
+      end
       assert_equal "    -h, --help      Display this help message.\n", string
     end
 
     temp_stdout do |string|
       opts = Slop.new(:help => true)
-      opts.parse %w( --help )
+      assert_raises SystemExit do
+        opts.parse %w( --help )
+      end
       assert_equal "Usage: rake_test_loader [options]\n    -h, --help      Display this help message.\n", string
     end
   end
@@ -463,8 +476,10 @@ class SlopTest < TestCase
     assert_equal %w'--help foo bar', items
     items.clear
     temp_stdout do
-      Slop.parse(%w'--help foo bar', :help => true) do
-        run { |o, a| items.concat a }
+      assert_raises SystemExit do
+        Slop.parse(%w'--help foo bar', :help => true) do
+          run { |o, a| items.concat a }
+        end
       end
       assert_empty items
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,18 +28,18 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 description: A simple DSL for gathering options and parsing the command line
-email: lee@jarvis.co
+email: ljjarvis@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Lightweight Option Parsing