optparse-simple 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b5f043c99689f3caba79090e8088dbbe2f46f9
-  data.tar.gz: 541094409e54628ac4dcb27287b8e49c98fdf3cf
+  metadata.gz: ea3a3a04d3463032d7b2c0cd3120a8999705fd5a
+  data.tar.gz: 8c49b1a26f92d43c712ef2caf996d48d12b16c23
 SHA512:
-  metadata.gz: aae95cf6610d9b3faf19d1a6a916de6c2a6124efb872f28b7bf14c2842bef91f5cdb8c47a85bd35bf77ec867077918996c5904cc3180308e59cd5aa52549607b
-  data.tar.gz: 3903b7fb61f5746984fda6076458d81c3403adc07b08d39f0a76e8e2143e11f8a9d3091933931bf63cf470adb970569025d2a90ff7bfd99270d53a5e3d1ecb75
+  metadata.gz: 9f95efa9b778a9fb9965c0d70e5fa155d7bc81a00b3acf875c43cb78d5ac9bda5137c635fec282e794216d42159eae3084a102829d694112149c3e4ac4ed649f
+  data.tar.gz: 4ca8bfc69bfc82d4204ec470ee63cbdec94113bfbf95da78176fb775bb2c8537f305b35c330638ef6e48817527c0b30faa88c14fbc4a4c8b3421c4d4de50ede4

data/lib/optparse-simple.rb

@@ -50,12 +50,14 @@ class OptParseSimple
         .map {|node|  %w(switch alias)\
           .map{|x| node.text(x)}.compact}\
         .flatten
+    puts 'after flatten 2'
     args.map!.with_index do |x,i|
       next unless x or i < args.length - 1
       (x += '=' + args[i+1]; args[i+1] = nil) if options.include?(x)
       x
     end
-    args.compact!        
+    args.compact!
+
     # -- end of bind any loose value to their argument
 
     a1 = []
@@ -77,8 +79,9 @@ class OptParseSimple
     end
 
     a2 = args.zip(options_remaining).map(&:reverse)
+    
     if a2.map(&:first).all? then
-      @h = Hash[*(a1+a2).map{|x,y| [x.to_s.strip.to_sym, y]}.flatten]
+      @h = Hash[*(a1+a2).map{|x,y| [x.to_s.strip.to_sym, y || true]}.flatten]
     else
       invalid_option = a2.detect {|x,y| x.nil? }.last
       raise "invalid option: %s not recognised" % invalid_option
@@ -105,8 +108,10 @@ class OptParseSimple
   def options_match(option, args)
 
     switch, switch_alias = option.text('summary/switch'), option.text('summary/alias')
-    switch_pattern = switch_alias ? "(%s|%s)" % [switch, switch_alias] : switch 
+    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
@@ -164,11 +169,11 @@ class OptParseSimple
   end
   
   def readx(s)
-
-    r = if s[/\s/] then
-      Polyrex.new('options/optionx[name,switch,alias,value,mandatory]/errorx[msg]').parse(s).to_xml
-    elsif s.is_a? Polyrex then
+        
+    r = if s.is_a? Polyrex then
       s.to_xml
+    elsif s[/\s/] then
+      Polyrex.new('options/optionx[name,switch,alias,value,mandatory]/errorx[msg]').parse(s).to_xml
     elsif s[/^https?:\/\//] then  # url
       Kernel.open(s, 'UserAgent' => 'Polyrex-Reader').read
     elsif s[/\</] # xml
@@ -176,8 +181,8 @@ class OptParseSimple
     else # local file
       File.read s
     end    
-    
+
     r
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse-simple
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   reMUqAcVi3UK52Ugibv74I27D9zJTDYgqRMX3SevcEFrJo+g8ulq9nmVLQ3T+YB/
   BlF5+4+5WNopaw==
   -----END CERTIFICATE-----
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: optparse-simple