help_parser 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50119d56d6b94ac58234ccfc24d3c5ddaf68a6f399753af89fc3fad2f210b3e
-  data.tar.gz: 591810bdc390d16c1ed6b4fc2332f6bc1b98a683c218cd446fa7726d820ff22e
+  metadata.gz: 137d04ddd668a522d322093c831b92b12b6c52354ef621383825f90a860d6e30
+  data.tar.gz: 13a5bce9a7fd241d5bc27614eab56105b3a355e8f0140ad1e6390d59bed38de1
 SHA512:
-  metadata.gz: b64e50f235e4f53e2f85a0508212b38b4fb80f7616150864a68cf04f39bb3c9d88dad4a3b1764ee3a7410978d01f20ae15739610a79c92a25190bad00bd24526
-  data.tar.gz: 9ccf098df4a3226b39a85519251f172097ecb9854cd05adf95bc61d54a4fad9718703c6c2ed9a92abf61f1862fbe10738937b41473c34fa0eb75db34aca78b7e
+  metadata.gz: c9353c972bf23ee28025d2a373397bfad784da2abc51cf26d932a88359a9e6df8930d4e04fc2c82e11a12813049bb98d56c98cd0ff02793161c62cc98117d6a2
+  data.tar.gz: 29efa76ac44adfdc5b1146eb7d6bf8f7c8d6c012fcd0215f996b956478e0e8f84c908a4810ab9ca67a4bb0d8e6285d9bb68eed5d19478f77d0889366065cf652

data/README.md

@@ -42,7 +42,7 @@ I prefer easy.
     Blah blah blah
     HELP
 
-    VERSION = "6.1.0"
+    VERSION = "6.2.0"
 
     # Macros:
     HelpParser.string(name)  # for options.name    : String

data/lib/help_parser.rb

@@ -11,7 +11,7 @@ require_relative './help_parser/options'
 require_relative './help_parser/macros'
 
 module HelpParser
-  VERSION = '6.1.0'
+  VERSION = '6.2.0'
 
   def self.[](
     version = nil,

data/lib/help_parser/completion.rb

@@ -1,10 +1,11 @@
 module HelpParser
   class Completion
-    def initialize(hash, specs, cache = NoDupHash.new)
-      @hash,@specs,@cache = hash,specs,cache
+    def initialize(hash, specs, validate=true)
+      @hash,@specs = hash,specs
+      @cache = NoDupHash.new
       usage if @specs.has_key?(USAGE)
       pad
-      types
+      types(validate)
     end
 
     def usage
@@ -23,10 +24,10 @@ module HelpParser
       raise UsageError, MATCH_USAGE
     end
 
-    def types
+    def types(validate=true)
       if t2r = HelpParser.t2r(@specs)
-        k2t = HelpParser.k2t(@specs)
-        HelpParser.validate_k2t2r(@specs, k2t, t2r)
+        k2t = HelpParser.k2t(@specs, validate)
+        HelpParser.validate_k2t2r(@specs, k2t, t2r) if validate
         @hash.each do |key,value|
           next unless key.is_a?(String)
           if type = k2t[key]

data/lib/help_parser/constants.rb

@@ -28,7 +28,7 @@ module HelpParser
   # spec W+ /~/
   TYPE_DEF = /^(?<t>[A-Z]+),?\s+\/(?<r>\S+)\/$/
 
-  # spec w+( w+)*
+  # spec w+( w+)+
   X_DEF = /^\w+( +\w+)+$/
 
   CSV = /,?\s+/
@@ -39,7 +39,6 @@ module HelpParser
   EX_CONFIG   = 78
 
   # error messages, partials:
-  NO_MATCH            = 'Software Error: NoMatch was not caught by HelpParser.'
   DUP_KEY             = 'Duplicate key'
   DUP_WORD            = 'Duplicate word'
   DUP_FLAG            = 'Duplicate flag'
@@ -67,6 +66,7 @@ module HelpParser
   NOT_INTEGER         = 'Not an Integer'
   NOT_INTEGERS        = 'Not all Integers'
   # error messages, full:
+  NO_MATCH            = 'Software Error: NoMatch was not caught by HelpParser.'
   MATCH_USAGE         = 'Please match usage.'
   EXTRANEOUS_SPACES   = 'Extraneous spaces in help.'
 

data/lib/help_parser/k2t2r.rb

@@ -1,12 +1,12 @@
 module HelpParser
-  def self.k2t(specs)
+  def self.k2t(specs, validate=true)
     k2t = NoDupHash.new
     tokens = specs.select{|k,v| !(k==TYPES)}.values.flatten.select{|v|v.include?('=')}
     tokens.each do |token|
       if match = VARIABLE.match(token) || LONG.match(token)
         name, type = match['k'], match['t']
         k2t[name] = type if !k2t.has_key?(name)
-        raise HelpError, MSG[INCONSISTENT,name,type,k2t[name]] unless type==k2t[name]
+        raise HelpError, MSG[INCONSISTENT,name,type,k2t[name]] if validate and !(type==k2t[name])
       else
         # Expected these to be caught earlier...
         raise SoftwareError, MSG[UNEXPECTED,token]

data/lib/help_parser/options.rb

@@ -11,16 +11,20 @@ module HelpParser
         if @hash.has_key?('h') || _=@hash.has_key?('help')
           begin
             # validates help
-            HelpParser.parseh(help, true)
+            specs = HelpParser.parseh(help, true)
+            if t2r = HelpParser.t2r(specs)
+              k2t = HelpParser.k2t(specs, true)
+              HelpParser.validate_k2t2r(specs, k2t, t2r)
+            end
           rescue HelpError
             $stderr.puts $!
           end if _
           raise HelpException, help
         end
         specs = HelpParser.parseh(help, HelpParser.validate?)
-        Completion.new(@hash, specs)
-        if xs=specs[EXCLUSIVE]
-          xs.each{|x| raise HelpParser::UsageError, MSG[EXCLUSIVE_KEYS,*x] if @hash.keys.count{|k|x.include?(k)}>1}
+        Completion.new(@hash, specs, HelpParser.validate?)
+        if exclusive=specs[EXCLUSIVE]
+          exclusive.each{|xs| raise HelpParser::UsageError, MSG[EXCLUSIVE_KEYS,*xs] if @hash.keys.count{|k|xs.include?(k)}>1}
         end
       end
     end

data/lib/help_parser/parseh.rb

@@ -10,12 +10,12 @@ module HelpParser
       else
         next if name==''
         break if line[0]=='#'
-        next if line[0]!=' '
+        next if !(line[0]==' ')
         spec = (index=line.rindex("\t"))? line[0,index].strip : line.strip
         raise HelpError, EXTRANEOUS_SPACES if validate and spec==''
         case name
         when USAGE
-          specs[name].push HelpParser.parseu spec
+          specs[name].push HelpParser.parseu(spec, validate)
         when TYPES
           raise HelpError, MSG[UNRECOGNIZED_TYPE,spec] if validate and not spec=~TYPE_DEF
           specs[name].push spec.split(CSV)

data/lib/help_parser/parseu.rb

@@ -18,11 +18,11 @@ module HelpParser
     return tokens
   end
 
-  def self.parseu(line)
+  def self.parseu(line, validate=true)
     chars = line.chars
     HelpParser.validate_line_chars(chars)
     tokens = HelpParser._parseu(chars)
-    HelpParser.validate_usage_tokens(tokens)
+    HelpParser.validate_usage_tokens(tokens) if validate
     return tokens
   end
 end

data/lib/help_parser/validations.rb

@@ -30,11 +30,11 @@ module HelpParser
   def self.validate_usage_specs(specs)
     option_specs = specs.select{|a,b| !RESERVED[a]}
     flags = option_specs.values.flatten.select{|f|f[0]=='-'}.map{|f| F2K[f]}
-    unless specs[EXCLUSIVE].nil?
+    if exclusive=specs[EXCLUSIVE]
       seen = {}
-      specs[EXCLUSIVE].each do |xs|
-        k = xs.sort.join(',').to_sym
-        raise HelpError, MSG[DUP_X,*xs] if seen[k]
+      exclusive.each do |xs|
+        k = xs.sort.join(' ').to_sym
+        raise HelpError, MSG[DUP_X,k] if seen[k]
         seen[k] = true
         xs.each do |x|
           raise HelpError, MSG[UNSEEN_FLAG, x] unless flags.include?(x)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: help_parser
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - carlosjhr64
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies: []
 description: |
   Welcome to the best Help Parser of all!