help_parser 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137d04ddd668a522d322093c831b92b12b6c52354ef621383825f90a860d6e30
-  data.tar.gz: 13a5bce9a7fd241d5bc27614eab56105b3a355e8f0140ad1e6390d59bed38de1
+  metadata.gz: b8f371bee63827fcbd8051796c5fce3421da5a3fc41bf6223e546c28ec99362c
+  data.tar.gz: 4484cae785efb013dfccdbcec34a7f17ed89fe013b0a5018c31f4515e87a9439
 SHA512:
-  metadata.gz: c9353c972bf23ee28025d2a373397bfad784da2abc51cf26d932a88359a9e6df8930d4e04fc2c82e11a12813049bb98d56c98cd0ff02793161c62cc98117d6a2
-  data.tar.gz: 29efa76ac44adfdc5b1146eb7d6bf8f7c8d6c012fcd0215f996b956478e0e8f84c908a4810ab9ca67a4bb0d8e6285d9bb68eed5d19478f77d0889366065cf652
+  metadata.gz: ad1de10f9ba6c1788db1dcae160c5fe8ea8c61432d388c097aab22efe8edfa6f86e22131e43159f8ab944615e8e3aa9e66fa714131e0347a241ded901aba8926
+  data.tar.gz: c4086cff775108315243f191acb81d243b792fdc18718b5390070b67f9b2174f8f5a517bf3a665807a4122bce80118799559f5883142e914f748eaa5f8895884

data/README.md

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

data/lib/help_parser/completion.rb

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

data/lib/help_parser/k2t2r.rb

@@ -1,12 +1,12 @@
 module HelpParser
-  def self.k2t(specs, validate=true)
+  def self.k2t(specs)
     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]] if validate and !(type==k2t[name])
+        raise HelpError, MSG[INCONSISTENT,name,type,k2t[name]] if !(type==k2t[name])
       else
         # Expected these to be caught earlier...
         raise SoftwareError, MSG[UNEXPECTED,token]

data/lib/help_parser/options.rb

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

data/lib/help_parser/parseh.rb

@@ -15,7 +15,10 @@ module HelpParser
         raise HelpError, EXTRANEOUS_SPACES if validate and spec==''
         case name
         when USAGE
-          specs[name].push HelpParser.parseu(spec, validate)
+          HelpParser.validate_line_chars(spec.chars) if validate
+          tokens = HelpParser.parseu(spec.chars)
+          HelpParser.validate_usage_tokens(tokens) if validate
+          specs[name].push tokens
         when TYPES
           raise HelpError, MSG[UNRECOGNIZED_TYPE,spec] if validate and not spec=~TYPE_DEF
           specs[name].push spec.split(CSV)
@@ -30,7 +33,13 @@ module HelpParser
         end
       end
     end
-    HelpParser.validate_usage_specs(specs) if validate
+    if validate
+      HelpParser.validate_usage_specs(specs)
+      if t2r = HelpParser.t2r(specs)
+        k2t = HelpParser.k2t(specs)
+        HelpParser.validate_k2t2r(specs, k2t, t2r)
+      end
+    end
     return specs
   end
 end

data/lib/help_parser/parseu.rb

@@ -1,5 +1,5 @@
 module HelpParser
-  def self._parseu(chars)
+  def self.parseu(chars)
     tokens,token = [],''
     while c = chars.shift
       case c
@@ -8,7 +8,7 @@ module HelpParser
           tokens.push(token)
           token = ''
         end
-        tokens.push HelpParser._parseu(chars) if c=='['
+        tokens.push HelpParser.parseu(chars) if c=='['
         return tokens if c==']'
       else
         token += c
@@ -17,12 +17,4 @@ module HelpParser
     tokens.push(token) unless token==''
     return tokens
   end
-
-  def self.parseu(line, validate=true)
-    chars = line.chars
-    HelpParser.validate_line_chars(chars)
-    tokens = HelpParser._parseu(chars)
-    HelpParser.validate_usage_tokens(tokens) if validate
-    return tokens
-  end
 end

data/lib/help_parser.rb

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

metadata

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