opt-simple 0.7.3 → 0.7.4

data/lib/opt_simple.rb

@@ -12,7 +12,9 @@ There are three methods to define command line parameters:
  argument - a mandatory command line parameter with one or more arguments
 
 Inside the blocks in flag, option, and argument a shortcut function called 'set_opt'
-can be used to set an option that will be returned in the options hash.
+can be used to set an option that will be returned in the options hash. The 'accumulate_opt'
+method can be used in the option and argument blocks to create a list of values, and in 
+the flag block to increment a counter (with verbosity being the classic example). 
 
 The number of arguments are determined by the 'arity' of the block. 
 
@@ -79,7 +81,7 @@ class OptSimple
 	end
 	
 	mandatory_check = mandatory_opts.map {|m| m.switches}
-	
+
 	if(loc = @args.index('--'))
 	  #remove the '--', but don't include it w/ positional arguments
 	  @positional_arguments += @args.slice!(loc..-1)[1..-1] 
@@ -96,9 +98,9 @@ class OptSimple
 
 	# now actually parse the args, and call all the stored up blocks from the options
 	@parameters.each do | parm |
-	  mandatory_check.delete(parm.switches)
 	  intersection = @args & parm.switches
 	  unless intersection.empty?
+	    mandatory_check.delete(parm.switches)
 	 
 	    arg_locations =  []
 	    @args.each_with_index {|arg,i| arg_locations << i if intersection.include?(arg) }
@@ -116,7 +118,7 @@ class OptSimple
 	    chunks.each do | pieces |
 	      if pieces.length < parm.block.arity or
 		  pieces.any? {|p| p.start_with?('-')}
-		raise OptSimple::MissingArgument.new "Not enough args following #{intersection}",self 
+		raise OptSimple::ParameterUsageError.new "Not enough args following #{intersection}",self 
 	      end
 	      
 	      begin
@@ -420,9 +422,13 @@ class OptSimple
   # is used on the command line
   class InvalidOption < Error;end
 
-  # An exception thrown if a mandatory parameter is not
+  # An exception thrown  if a mandatory parameter is not
   # used on the command line
   class MissingArgument < Error;end
 
+  # An exception thrown if a parameter isn't followed by enough arguments
+  # on the command line
+  class ParameterUsageError < Error;end
+
 end
  

data/test/test_usage.rb

@@ -8,21 +8,30 @@ class TestHelpStatement < Test::Unit::TestCase
     assert_raise(OptSimple::Error) { OptSimple.new.parse_opts! {option %w[-a --awesome]; flag '-awesome' } }
   end
 
-  must "raise error when unknown option is given" do 
-    os = OptSimple.new({},['-not-specified'])
-    assert_raise(OptSimple::InvalidOption) { os.parse_opts! { option %w[-a --awesome]  }  }
+  must "throw parameter missing exception when the argument method is used but the parm isn't specified" do
+    os = OptSimple.new({})
+    assert_raise(OptSimple::MissingArgument) do
+      os.parse_opts! do
+	argument '-a'
+      end
+    end
   end
 
-  must "raise error when not enough arguments are given" do
+  must "throw missing parameter usage error when a parameter isn't followed by enough arguments" do
     os = OptSimple.new({},['-a'])
-    assert_raise(OptSimple::MissingArgument) do
+    assert_raise(OptSimple::ParameterUsageError) do
       os.parse_opts! do
-	option '-a' do |arg| 
+	argument '-a' do |arg| 
 	  nil
 	end
       end
     end
   end
+  
+  must "raise error when unknown option is given" do 
+    os = OptSimple.new({},['-not-specified'])
+    assert_raise(OptSimple::InvalidOption) { os.parse_opts! { option %w[-a --awesome]  }  }
+  end
 
   must "handle arguments with equals and commas" do
     os = OptSimple.new({},['-a=2','--foo=4,5'])

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: opt-simple
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 3
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Ethan Stryker
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 +00:00
+date: 2011-03-13 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -46,27 +40,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: opt-simple
-rubygems_version: 1.6.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple and elegant command line option parser.