kvx 0.9.6 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddaef947e49b210dbee31fcf56ec84e3644681c6a790c9ec80cb9fe314cd9d8
-  data.tar.gz: 56fae3981651c158701eb34023477125fbe7dd0ee8421d49d0e15174f550aae4
+  metadata.gz: 9fe4f150a49ff2f1c88b0cf28b7d24cbd04af9fc64cf7ea697fe0e29ab62a67b
+  data.tar.gz: c2ead702dcf44db16cb10a1866051ceb85d947870f491276c610acff2bf2c5be
 SHA512:
-  metadata.gz: fd452778a00be2a43d078b61ffdbb2616c1b631a0a1806c6027453c739b755ac90c7cd7e804ee6fe0839dae01d083d02abbffb7900e54fa6b7ba6159abee3248
-  data.tar.gz: 27c99e9368bc2dfd7cd49527eed157a31a9e2a2bd3d8caaf357fb12c1c5ccf898dc8913a963fdb2594eacf660054403302bc9425b54dfc46e06b588565ed9dd7
+  metadata.gz: abf623624bb8630caa32c5d1893013351e3ec328e188bca05343b51286376387c70006cc70ac265958e4b376b299bacf6578c9dab46113c8f36d98d1ae1422f1
+  data.tar.gz: 83e9dcbff011d65f72408f1b7b9ab681599eba0057e2ee3bc8b5e78a94a08afbb5b29e01214a08c7e0ee22847c4214398a826c4cd2183c24fae6142285731761

data/lib/kvx.rb

@@ -336,7 +336,7 @@ class Kvx
 
     lines = txt.gsub(/^-+$/m,'').lines.map do |line|
 
-      if not line[/^ *\w+:|^ +/] then
+      if not line[/^ *[^:]+:|^ +/] then
         indent + '  ' + line
       else
         indent = line[/^ +/] || ''
@@ -344,22 +344,25 @@ class Kvx
       end
 
     end    
-
+    puts ('lines: ' + lines.inspect).debug if @debug
+    
     puts ('inside scan_to_h').info if @debug
-    raw_a = LineTree.new(lines.join.gsub(/(^-*$)|(^ *#.*)/,'').strip, 
+    raw_a = LineTree.new(lines.join.gsub(/(^-*$)|(?<=\S) +#.*/,'').strip, 
                          ignore_blank_lines: @ignore_blank_lines).to_a
     puts ('raw_a: ' + raw_a.inspect).debug if @debug
     
     # if there are any orphan lines which aren't nested underneath a 
     #   label, they will be fixed using the following statement
     
-    a = raw_a.chunk {|x| x[0][/^[^:]+:|.*/]}.inject([]) do |r,y|
+    a = raw_a.chunk {|x| x[0][/^[^:]+:/]}.inject([]) do |r,y|
+
       
       puts 'r: ' + r.inspect if @debug
       
       if r.last and !y.first[/[^:]+:/] then
         r.last << y.last[-1]
       else
+        puts 'y: ' + y.inspect if @debug
         r << y.last[-1]
       end
       
@@ -372,13 +375,16 @@ class Kvx
       s = line.shift
       puts ('s: ' + s.inspect).debug if @debug
       
-      if line.join.length > 0 then 
-
-        r2 = if line[0][0][/^[^:]+:/] then
-
-          padding = line[0].length < 2 ? "\n" : "\n  "
+      if line.join.length > 0 then
+        
+        puts 'line: ' + line.inspect if @debug
+        
+        padding = line[0].length < 2 ? "\n" : "\n  "        
+        s10 = line.map{|x| x.join(padding)}.join("\n")
+        
+        r2 = if s10[/^ *\w+:[\n ]/] then
           
-          scan_to_h(line.map{|x| x.join(padding)}.join("\n"))
+          scan_to_h(s10)
           
         else
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kvx
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.11
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   m/+jxdgFjKKGxeZqunu9cp5ca9wSjjtKh/VA/3xZtPwokCa7vCMB+ZxUP0jvd++u
   OTXy8k/zqddw/VfD/It1UUK4
   -----END CERTIFICATE-----
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -61,22 +61,22 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Kvx (Keys, Values, and XML) makes it convenient to store and retrieve the