opt-simple 0.9.8 → 0.9.9

data/README

@@ -39,7 +39,8 @@ It is recommended to install OptSimple using RubyGems:
 === One example that shows most of the behavior you might use
  require 'opt_simple'
  
- defaults = {
+ defaults = {  
+   :glob_pattern => '*',
    :num_results => 42,
    :range => [5,10]
  }
@@ -107,9 +108,9 @@ Which prints out an automatic usage statement:
  
      -n, -num, --num-values VAL                  The answer to everything
  
-     -p, --pattern, --glob-pattern PATTERN       glob pattern
+     -p, --pattern, --glob-pattern PATTERN       glob pattern (default is '*')
  
-         --range ARG                             range: min,max (both >0) (default is [5, 10])
+         --range ARG                             range: min,max (both >0) (default is '[5, 10]')
  
      -h, --help                                  (for this help message)
 
@@ -252,8 +253,43 @@ Which prints out an automatic usage statement:
  puts "Options"
  puts options
  
-== Questions and/or Comments
+=== A totally contrived example showing how to change multiple options within an option specification block
+
+ require 'opt_simple'
  
+ allowed_odds = [1,3,5,7]
+ allowed_evens = [2,4,6]
+ defaults = {
+   :even_val => allowed_evens.first,
+   :odd_val => allowed_odds.first
+ }
+
+ # Note that b/c we define option [--odd] and [--evens] _after_ the max-out flag, 
+ # they will override the max-out setting. 
+ opts = OptSimple.new(defaults).parse_opts! do | opt_obj |
+   flag %w[-m --max-out], "Maximize evens and odds." do 
+     opt_obj.odd_val = allowed_odds.last
+     opt_obj.even_val = allowed_evens.last
+   end
+   
+   option "--odd-val","Odd val in #{allowed_odds.inspect}","VAL" do | arg |
+     val = arg.to_i
+     error "Odd val must be in #{allowed_odds.inspect}" unless allowed_odds.include? val
+     set_opt val
+   end
+ 
+   option "--even-val","Even val #{allowed_evens.inspect}","VAL" do | arg |
+     val = arg.to_i
+     error "Even val must be in #{allowed_evens.inspect}" unless allowed_evens.include? val
+     set_opt val
+   end
+ end
+ 
+ puts "Options"
+ puts opts
+ 
+== Questions and/or Comments
+  
 email {Ethan Stryker}[mailto:e.stryker@gmail.com]
  
  

data/lib/opt_simple.rb

@@ -274,8 +274,10 @@ class OptSimple
 	intersection = @defaults.keys & parm.names unless parm.class == Flag
 	if intersection.empty?
 	  help_str << "\n\n"
+	elsif @defaults[intersection.first].nil?
+	  help_str << " (default is 'nil')\n\n"
 	else
-	  help_str << " (default is #{@defaults[intersection.first]})\n\n"
+	  help_str << " (default is '#{@defaults[intersection.first]}')\n\n"
 	end
       end
       help_str << "  SUMMARY:\n\n    #{@summary}\n\n" unless @summary.empty?
@@ -424,7 +426,7 @@ class OptSimple
       unless block_given?
 	@block = Proc.new {|arg| @param_options[names.first] = arg}
       end
-      @first_call = true
+      @first_call = true # use this so we can accumulate non-defaults
     end
 
     def switch_len #:nodoc:

data/lib/tmp.rb

@@ -0,0 +1,63 @@
+# in parse_opts!
+# now actually parse the args, and call all the stored up blocks from the options
+      @parameters.each do | parm |
+	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) }
+	  # ...  
+  def flag(switches,help="",&block)
+    parm = Flag.new(switches,help,&block)
+    parm.set_opt false
+    add_parameter parm 
+
+    # add it to the results to make checking flags nicer. 
+    # use the first name b/c they are all aliased anyways.
+    @results.merge! parm.param_options
+  end
+  
+  def option(switches,help="",metavar="ARG",&block)
+    parm = Option.new(switches,help,metavar,&block)
+    
+    # set the defaults, if there are any in the defaults hash
+    intersection = parm.names & @defaults.keys
+    if intersection.length == 1
+      parm.set_opt @defaults[intersection.first]
+      @results.merge! parm.param_options
+    elsif intersection.length > 1
+      raise OptSimple::Error "Clashes in the defaults for #{parm.switches}"
+    end
+    
+    add_parameter(parm)
+  end
+  
+   class Option < Parameter
+    attr_reader = :metavar
+    def initialize(switches,help="",metavar="ARG",&block)
+      super(switches,help,&block)
+      @metavar = metavar
+      unless block_given?
+	@block = Proc.new {|arg| @param_options[names.first] = arg}
+      end
+      @first_call = true # use this so we can accumulate non-defaults
+    end
+    def switch_len #:nodoc:
+      metavar_space = @metavar.empty? ? 0 : @metavar.length + 1 
+      super + metavar_space
+    end
+    def switch_str #:nodoc:
+      super + " #{@metavar}"
+    end
+    # append val to the parameter list
+    def accumulate_opt(val)
+      if @first_call
+	@param_options[names.first] = [val].flatten
+      else
+	@param_options[names.first] << val
+      end
+      @first_call = false
+    end
+  end

metadata

@@ -2,7 +2,7 @@
 name: opt-simple
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Ethan Stryker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +01:00
+date: 2011-07-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ extra_rdoc_files: []
 files: 
 - lib/test_unit_extensions.rb
 - lib/opt_simple.rb
+- lib/tmp.rb
 - test/test_help.rb
 - test/test_usage.rb
 - test/test_arglist.rb