optparse-simple 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e66528676b96854cd455c31eb7465cf28d7cf4c
-  data.tar.gz: 1f63da0ac7fb383e8d893595d5d7b1d2de5d8a23
+  metadata.gz: 37d6173b73bb275426106256fb2966cfde8a043e
+  data.tar.gz: 23a9c4497a816aebfa1e1d8849958c14b983aa45
 SHA512:
-  metadata.gz: 2a3ae73868e033342437aec414ef0600159aef88f43603a6d30283710138f8fe5d22c0845ca7321f5f633184295cfe5afa9f0213ac9428eb4b8e6b4ecc0e1b7b
-  data.tar.gz: b482b5d52eaef6aa314609fef2e989d99d8671df281e551b618d8e530921bc27406289930b1b05681ca58af7d05ce4a9ca3446415ed0156874abd130d9de08aa
+  metadata.gz: 7835d62d9ed19c9035889a0c9bdc941a2d784ce8dabf4d3f21ee235a44b48dee6bbdda72c7288aaf5e43ebe4e13c7b2c0eabb57fba1bafd0f59687c0764eb7b5
+  data.tar.gz: cb7a391852f0ce2a6badf87e6245cf7c5cc3bcb146f65f6dead3e2685dac300cf7a7b700ff7da8555cf26e4e62f09816118910e3425d77205cf0d599f1f50994

data/lib/optparse-simple.rb

@@ -9,26 +9,28 @@ require 'table-formatter'
 
 class OptParseSimple
   include REXML
-  
+
   def initialize(s)    
     super()
-    
-    buffer = read(s)    
-    @doc = Document.new(buffer)    
-    
+    buffer = readx(s)
+
+    @doc = Document.new(buffer)
+    #@doc = Rexle.new(buffer)
   end
   
   def parse(args)
-    
+
     @options = XPath.match(@doc.root, 'records/optionx[summary/switch!="n/a"]')
+    #@options = @doc.root.xpath('records/optionx[summary/switch!="n/a"]')
+
+    switches = @options.map do |option|
 
-    switches = @options.map do |option| 
       switch = option.text('summary/switch')
       switch[0] == '-' ? switch : nil
     end    
 
     switches.compact!
-
+    
     # split the argument switches if grouped e.g. -ltr
     args.map! do |arg|
 
@@ -44,6 +46,7 @@ class OptParseSimple
     # -- bind any loose value to their argument
     xpath = 'records/optionx/summary[switch != "n/a" and value != "n/a"]'
     options = XPath.match(@doc.root, xpath)\
+    #options = @doc.root.xpath(xpath)\
         .map {|node|  %w(switch alias)\
           .map{|x| node.text(x)}.compact}\
         .flatten
@@ -56,15 +59,23 @@ class OptParseSimple
     # -- end of bind any loose value to their argument
 
     a1 = []
+
     a1 = options_match(@options[0], args).flatten.each_slice(2).map {|x| x if x[0]}.compact unless @options.empty?
+
     options_remaining = XPath.match(@doc.root, 'records/optionx/summary[switch="n/a"]/name/text()').map(&:to_s)
+    #options_remaining = @doc.root.xpath('records/optionx/summary[switch="n/a"]/name/text()').map(&:to_s)
     mandatory_remaining  = XPath.match(@doc.root, 'records/optionx/summary[switch="n/a" and mandatory="true"]/name/text()').map(&:to_s)
+    #mandatory_remaining  = @doc.root.xpath('records/optionx/summary[switch="n/a" and mandatory="true"]/name/text()').map(&:to_s)
+
     if mandatory_remaining.length > args.length then
+
        missing_arg = (mandatory_remaining - args).first
        option = XPath.first(@doc.root, "records/optionx[summary/name='#{missing_arg}']")
-       raise option.text('records/errorx/summary/msg')
+       #option = @doc.root.element("records/optionx[summary/name='#{missing_arg}']")
+
+       raise option.text('records/errorx/summary/msg') || 'missing arg'
     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]
@@ -72,6 +83,7 @@ class OptParseSimple
       invalid_option = a2.detect {|x,y| x.nil? }.last
       raise "invalid option: %s not recognised" % invalid_option
     end
+
     @h
   end
 
@@ -81,9 +93,10 @@ class OptParseSimple
   
   def help    
     a = XPath.match(@doc.root,  "records/optionx/summary[switch != 'n/a']").map do |summary|
+    #a = @doc.root.xpath("records/optionx/summary[switch != 'n/a']").map do |summary|
       %w(switch alias).map {|x| summary.text x}
     end
-    puts 'options:'
+
     puts TableFormatter.new(source: a, border: false).to_s
   end
 
@@ -114,6 +127,7 @@ class OptParseSimple
           next_option = @options[1] if @options.length > 1
 
           if next_arg != next_option then
+
             # validate using the regex
             value = next_arg[/#{value_pattern}/]
 
@@ -129,6 +143,7 @@ class OptParseSimple
         end      
 
       else
+
         args.delete_at(arg_index)
       end
 
@@ -148,8 +163,9 @@ class OptParseSimple
     [pair, next_pair]
   end
   
-  def read(s)
-    if s[/\s/] then
+  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
       s.to_xml
@@ -158,8 +174,10 @@ class OptParseSimple
     elsif s[/\</] # xml
       s
     else # local file
-      File.open(s,'r').read
+      File.read s
     end    
+    
+    r
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse-simple
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,55 +10,69 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDAxMloXDTE0MDIwNjIxMDAxMlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDIwODE4MjQyN1oXDTE2MDIwODE4MjQyN1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALARHzy0edhcPpKCtmZUFPjqTKJqATTv13DsZS2KjorpY/9IDrx0qaZfbbni
-  +EW2h1yTCFouz+jruAXrH2Q5qIaxNHpCcAcdknFLQ6PlWw2B2pHy6Zn0CBOnVMRM
-  J+mRwydr1/e1G1KQf0iuQZu1UwdkTFojxsE2x9QOZf65QG8Xvc/GhQG/nHIfkPWe
-  ZQ6/mN4xx6qB4YkNz+veOqvxr0Xf0+ZG2kmOiwLqRkPM2HDSHJQDraGsf5gssAab
-  +I7y0OOllZIaVZUoLJSy+LZHizuNqqzoaPOIiBNHzDBZD0FfGQYIku0BGpOiihjn
-  2yYn0J2PJDlIlKn3RRkR5AMXAUkCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUi04yktd73wCh/mS+LKbyKVbSSVwwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQBDk+WvBmvb+kinBhptuf4KMZIvlvguI0NcKLf7/HsGMWoCrsinDwtV
-  ix1Mia9Dy08UtojBz14D9sK35srFSUGmhZ3/aAnL9ad/gPFs0ReHsOjfiG65CdBD
-  E3t00g+57iiGkJVy6EkEw6POyJfmfxoribntgXyDRDgXI7cTXaD9+sKILsz8LmYK
-  aylMuQSXdaKFEL+/dc2T0CyeLXnkb3qYMVBnMkGby5kIF2dkR8t/2d5A6g0FGvcF
-  u3Db7En6amZnZmzCCCzR5Ufry31XNpLHgT4vbcmjdXWyIlKeq577yoy2ibDdME4h
-  fI0FSIwcvk2lrsuX3eQWJWzr/yAHvMiH
+  ggEBAJLJE+iYKOrPhAmeZtKk4DD3mV8coX/pMgl3GExMZ3ABiGNA5wnraEeN1krx
+  q9cRIiEgO+llV+CDGWLd2oWBjo4u6LAhpCz2eQlJIbVyHu6qouKBTy4GbgVFg8Fn
+  8PLiFMB7wQoLoD8bG68AxxO2/iDQud4JlafEBXyxlTGuQlq5Lw9gQvSnlGAieRQr
+  NjuNIOw4n2HXRmivS4V+//zRPiyBGdhDbSB1zLIT7fgeIglEbDo21SQITTENRZ1h
+  DAkd4pmpisQWQAWy2Ov5r63uD9lpxSbHRFXyfaGaX3DMWpAhu10+JCc1Bo5kI2yk
+  hY4avOApo4rABOB/0PADod7JZ+ECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUKuHNETC2YZlY8IaQxkLOu2+O10YwJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAPe03jlVt
+  HJlEqi5rwIcpo18mJFtU/9jcJt/3qlxN4966cs5sSCh96nMv0jLae/Y7a46OLwZG
+  MdF5SDcY3DCBJ7T+E+P2uuF17sx2NSZb/GDm90Z2rRhHnQCAyvCulBvE8lS8MjS8
+  dHzhwbn8Q2WvE4MDs/h8iGD+zW8DiSK1ltc+MWgHK/s9GyetV8S2/Gq6p9ejSZn+
+  HBHBh2QEqbXkwCsH5UllD93L2A8kyBEHzjuaO3CG1Yqj6d9xdCGzXr4vtXKVmBSd
+  reMUqAcVi3UK52Ugibv74I27D9zJTDYgqRMX3SevcEFrJo+g8ulq9nmVLQ3T+YB/
+  BlF5+4+5WNopaw==
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: table-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.13
 description: OptParse-Simple parses command-line arguments and returns them as a hash.
 email: james@r0bertson.co.uk
 executables: []
@@ -76,17 +90,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: optparse-simple