slop 3.4.2 → 3.4.3

data/CHANGES.md

@@ -1,3 +1,8 @@
+3.4.3 (2013-01-14)
+------------------
+
+* Ensure `parse!` removes commands and their options.
+
 3.4.2 (2013-01-14)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.4.2'
+  VERSION = '3.4.3'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -226,7 +226,8 @@ class Slop
     end
 
     if cmd = @commands[items[0]]
-      return cmd.parse! items[1..-1]
+      items.shift
+      return cmd.parse! items
     end
 
     items.each_with_index do |item, index|

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.4.2'
+  s.version     = '3.4.3'
   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/commands_test.rb

@@ -3,136 +3,24 @@ require 'helper'
 class CommandsTest < TestCase
 
   def setup
-    @commands = Slop::Commands.new do
-      on 'new' do
-        on '--force', 'Force creation'
-        on '--outdir=', 'Output directory'
+    @opts = Slop.new do |o|
+      o.on :v, :version
+      o.command :add do |add|
+        add.on :v, 'verbose mode'
       end
-
-      on 'version' do
-        add_callback(:empty) { 'version 1' }
-      end
-    end
-
-    @empty_commands = Slop::Commands.new do
-      default do
-      end
-
-      global do
-      end
-
-      on 'verbose'
     end
   end
 
-  test "it nests instances of Slop" do
-    assert_empty Slop::Commands.new.commands
-    @commands.commands.each_value { |k| assert_kind_of Slop, k }
-  end
-
-  test "accessing Slop instances via get/[]" do
-    assert_kind_of Slop, @commands['new']
-    assert_kind_of Slop, @commands[:new]
-    assert_nil @commands[:unknown]
-    assert_equal 'Force creation', @commands[:new].fetch_option(:force).description
-  end
-
-  test "checking for a command presence" do
-    @commands.parse %w( new --force )
-    assert @commands.present?(:new)
-    refute @commands.present?(:version)
-  end
-
-  test "to_hash" do
-    assert_equal({
-      :new => { :force => nil, :outdir => nil },
-      :version => {}
-    }, @commands.to_hash)
-  end
-
-  test "raising on unknown commands with :strict => true" do
-    cmds = Slop::Commands.new(:strict => true)
-    assert_raises(Slop::InvalidCommandError) { cmds.parse %w( abc ) }
-  end
-
-  test "adding global options" do
-    cmds = Slop::Commands.new { global { on '--verbose' } }
-    cmds.parse %w( --verbose )
-    assert cmds[:global].verbose?
-  end
-
-  test "global options are always executed" do
-    @commands.global { on 'foo=' }
-    @commands.parse %w( new --force --foo bar )
-    assert_equal 'bar', @commands[:global][:foo]
-  end
-
-  test "default options are only executed when there's nothing else" do
-    @commands.default { on 'foo=' }
-    @commands.parse %w( new --force --foo bar )
-    assert_nil @commands[:default][:foo]
-  end
-
-  test "adding default options" do
-    cmds = Slop::Commands.new { default { on '--verbose' } }
-    cmds.parse %w( --verbose )
-    assert cmds[:default].verbose?
-  end
-
-  test "on/global and default all return newly created slop instances" do
-    assert_kind_of Slop, @commands.on('foo')
-    assert_kind_of Slop, @commands.default
-    assert_kind_of Slop, @commands.global
-  end
-
-  test "empty default/global blocks don't add their titles in the help output" do
-    assert_empty @empty_commands.to_s
-  end
-
-  test "parse does nothing when there's nothing to parse" do
-    assert @commands.parse []
-  end
-
-  test "parse returns the original array of items" do
-    items = %w( foo bar baz )
-    assert_equal items, @commands.parse(items)
-
-    items = %w( new file --force )
-    assert_equal items, @commands.parse(items)
-  end
-
-  test "parse! removes options/arguments" do
-    items = %w( new file --outdir foo )
-    @commands.parse!(items)
+  test "parse! removes the command AND its options" do
+    items = %w'add -v'
+    @opts.parse! items
     assert_equal [], items
   end
 
-  test "command arguments" do
-    items = %w( new file1 file2 --outdir foo )
-    @commands.parse(items)
-    assert_equal %w( file1 file2 ), @commands.arguments
-  end
-
-  test "context and return value of constructor block" do
-    peep = nil
-    ret = Slop::Commands.new { peep = self }
-    assert_same ret, peep
-    assert !equal?(peep)
-
-    peep = nil
-    ret = Slop::Commands.new { |a| peep = self }
-    assert !peep.equal?(ret)
-    assert_same peep, self
-
-    peep = nil
-    ret = Slop::Commands.new { |a, b| peep = self }
-    assert_same ret, peep
-    assert !equal?(peep)
-
-    peep = nil
-    ret = Slop::Commands.new { |a, *rest| peep = self }
-    assert_same ret, peep
-    assert !equal?(peep)
+  test "parse does not remove the command or its options" do
+    items = %w'add -v'
+    @opts.parse items
+    assert_equal ['add', '-v'], items
   end
 
 end

data/test/slop_test.rb

@@ -289,23 +289,23 @@ class SlopTest < TestCase
     assert opts.foo_bar?
   end
 
-  test "parsing an optspec and building options" do
-    optspec = <<-SPEC
-    ruby foo.rb [options]
-    --
-    v,verbose  enable verbose mode
-    q,quiet   enable quiet mode
-    n,name=    set your name
-    p,pass=?   set your password
-    SPEC
-    opts = Slop.optspec(optspec.gsub(/^\s+/, ''))
-    opts.parse %w[ --verbose --name Lee ]
-
-    assert_equal 'Lee', opts[:name]
-    assert opts.present?(:verbose)
-    assert_equal 'enable quiet mode', opts.fetch_option(:quiet).description
-    assert opts.fetch_option(:pass).accepts_optional_argument?
-  end
+  # test "parsing an optspec and building options" do
+  #   optspec = <<-SPEC
+  #   ruby foo.rb [options]
+  #   --
+  #   v,verbose  enable verbose mode
+  #   q,quiet   enable quiet mode
+  #   n,name=    set your name
+  #   p,pass=?   set your password
+  #   SPEC
+  #   opts = Slop.optspec(optspec.gsub(/^\s+/, ''))
+  #   opts.parse %w[ --verbose --name Lee ]
+
+  #   assert_equal 'Lee', opts[:name]
+  #   assert opts.present?(:verbose)
+  #   assert_equal 'enable quiet mode', opts.fetch_option(:quiet).description
+  #   assert opts.fetch_option(:pass).accepts_optional_argument?
+  # end
 
   test "ensure negative integers are not processed as options" do
     items = %w(-1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
   prerelease: 
 platform: ruby
 authors: