optparse-simple 0.1.0 → 0.2.0

data/lib/{optparsesimple.rb → optparse-simple.rb}

@@ -5,10 +5,10 @@ class OptParseSimple
 
   def initialize(filename, args)
     doc = Document.new(File.open(filename,'r').read)
-    @options = XPath.match(doc.root, 'records/option[switch!=""]')
+    @options = XPath.match(doc.root, 'records/option[summary/switch!=""]')
 
     switches = @options.map do |option| 
-      switch = option.text('switch')
+      switch = option.text('summary/switch')
       switch[0] == '-' ? switch : nil
     end
 
@@ -27,7 +27,7 @@ class OptParseSimple
     args.flatten!
 
     a1 = options_match(@options[0], args).flatten.each_slice(2).map {|x| x if x[0]}.compact
-    options_remaining = XPath.match(doc.root, 'records/option[switch=""]/name/text()')
+    options_remaining = XPath.match(doc.root, 'records/option/summary[switch=""]/name/text()')
     a2 = args.zip(options_remaining).map(&:reverse)
     if a2.map(&:first).all? then
       @h = Hash[*(a1+a2).map{|x,y| [x.to_s.to_sym, y]}.flatten]
@@ -45,14 +45,14 @@ class OptParseSimple
 
   def options_match(option, args)
 
-    switch, switch_alias = option.text('switch'), option.text('alias')
+    switch, switch_alias = option.text('summary/switch'), option.text('summary/alias')
     switch_pattern = switch_alias ? "(%s|%s)" % [switch, switch_alias] : switch 
     switch_matched, arg_index = args.each_with_index.detect {|x,j| x[/^#{switch_pattern}/]}
     key, value = nil
 
     if switch_matched then
 
-      value_pattern = option.text('value')
+      value_pattern = option.text('summary/value')
 
       if value_pattern then
 
@@ -74,7 +74,7 @@ class OptParseSimple
             if value then
               args.delete_at(arg_index + 1)
             else
-              raise option.text('errors/records/error[last()]')
+              raise option.text('records/error[last()]/summary/msg')
             end
           end
 
@@ -86,11 +86,11 @@ class OptParseSimple
         args.delete_at(arg_index)
       end
 
-      key = option.text('name')
+      key = option.text('summary/name')
  
-    elsif option.text('mandatory').downcase == 'true' then
+    elsif option.text('summary/mandatory').downcase == 'true' then
 
-      raise option.text('errors/records/error')
+      raise option.text('records/error/summary/msg')
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: optparse-simple
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +00:00
+date: 2010-05-11 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -22,7 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/optparsesimple.rb
+- lib/optparse-simple.rb
 has_rdoc: true
 homepage: 
 licenses: []