sh_vars 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f7bfacb048c3592ab7325dcaf8fc99466f072eeb2c146db9218e910348f8dd
-  data.tar.gz: 90146d1a36f79e9d585d8517153f62bfecf7e71bf340f0079aa23681bba09f44
+  metadata.gz: adb65ac8d005256f6f0504cc308cced8929ea3bfef5b624a8bbd264a711fa91d
+  data.tar.gz: d963c22a20bd91d220eef51dcd76d0222b1911046afa6290163ad0b5b4cb07aa
 SHA512:
-  metadata.gz: 64a7ee0d58b729dbf2ac572dca32d7964f057e4fcdbfa419c47630aceb5ac36a6853646e5f1360ff138372cfbe57d4365d30d0322825de4ed2c0de1e0f688380
-  data.tar.gz: 3f33a69120bb971345165030b2eb3206281bc4ece6e5b48d739d7c840ca5e7133b096b253b51b17eae10b29f7065f8690f89865f80404b2e7f33c10db9aab33b
+  metadata.gz: a5959d3cbb4ca3e9e9ed7dd6f5629e506981c2c902546a2e3c573e8de005eecf7e5a21c2b20742c32b551649f368b23fce88247a29735896f26f4e9bd1309f05
+  data.tar.gz: 539b2ebbdbaa25f505837635dc7cb54f569dcf2c0495c40299b2b1618524f6726da392ba77977d54200ac2a2cc0f81034706636bf7213b598fb065c35771f734

data/lib/sh_vars/string.rb

@@ -11,7 +11,7 @@ module ShVars
     end
 
     KEY   = %r([^\s=]+)
-    WORD  = %r((\\.|(?!\s|"|'|`|\${|\$\(|\)).)+)
+    WORD  = %r((\\.|(?!\s|"|'|`|\${|\$\().))
     SPACE = %r(\s+)
     EQUAL = %r(=)
     OPEN  = %r(\$\(|\$\{)
@@ -33,7 +33,7 @@ module ShVars
     end
 
     def pair
-      double_quoted_pair || unquoted_pair
+      double_quoted_pair || unquoted_pair || empty_pair
     end
 
     def double_quoted_pair
@@ -49,6 +49,12 @@ module ShVars
       [key, parts.join]
     end
 
+    def empty_pair
+      key = word
+      pair = [key, ''] if key
+      pair
+    end
+
     def values
       parts, part = [], nil
       parts << part while part = value || space
@@ -80,7 +86,9 @@ module ShVars
     end
 
     def word
-      scan(WORD) unless quote? || paren?
+      chars, char = [], nil
+      chars << char while !quote? && char = scan(WORD)
+      chars.join if chars.any?
     end
 
     def space
@@ -104,7 +112,7 @@ module ShVars
 
       parts, part = [], nil
       parts << part while part = scan_quote(quote)
-      parts << value
+      parts << values
       parts << part while part = scan_quote(quote)
 
       quotes.pop
@@ -141,6 +149,10 @@ module ShVars
       ['\\' * (level - 1), quote].join if str
     end
 
+    def space?
+      peek(1) =~ SPACE
+    end
+
     def paren?
       open.any? && peek(open.last.size) == open.last
     end

data/lib/sh_vars/version.rb

@@ -1,3 +1,3 @@
 module ShVars
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sh_vars
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies: []
 description: Shell var parser.
 email: