bashcov 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e79dc939af127bef6f99cd953e085033f167a5221e332a133951e476f9b63f6e
-  data.tar.gz: 0aaf4dfc8062e7a14efa1b7ccfd1f2dc8ac7e86b53f79c31500019cfae3ab97d
+  metadata.gz: 4a96a6fc49f31d7d6ff999f03930dea2949276da0be7e72cada3a176a91170f9
+  data.tar.gz: c52cd9c108b691491cf35e6785421b624de4f1a05de19bfc2d7d3a18e21e1012
 SHA512:
-  metadata.gz: f04d9cf50ddd7a95843676be55deb850201dea08ac7ef33bc6e7adfc17befe7e8ef14cc79a7899a2e529e058beea1930895344dfba915f6c3b8063f0faca5d49
-  data.tar.gz: 43ff857b123ca2c5fa85bb03dc707ea4a52c0601bfc3eab1fc94863136298a12614315b2b369569c74071e97ab88525599780bbaa344a862d43a0b285c0da004
+  metadata.gz: 6330cc5bc8dcafadcf514903563cad2979ccd1078dcfad20ddd153a472041439cc26333890aa67ea1b96a713ba43a69b2d2551e3698d857e151d39699bd24370
+  data.tar.gz: e354fd7011ef79a3ef5a777b87542ce461f34084eb8a24cb2dc7e12986856a99581af492937ffd992490bf30742a6048a06b61128a0b914934ddb8f6c8bdf546

data/CHANGELOG.md

@@ -1,7 +1,11 @@
-## Unreleased ([changes](https://github.com/infertux/bashcov/compare/v4.0.2...master))
+## Unreleased ([changes](https://github.com/infertux/bashcov/compare/v4.0.3...master))
 
   * TBD
 
+## v4.0.3, 2026-11-11 ([changes](https://github.com/infertux/bashcov/compare/v4.0.2...v4.0.3))
+
+  * [BUGFIX]  Do not read a closing quote after a space as a multiline string opener (fixes #118)
+
 ## v4.0.2, 2026-11-04 ([changes](https://github.com/infertux/bashcov/compare/v4.0.1...v4.0.2))
 
   * [BUGFIX]  Keep xtrace writes blocking so coverage records are not dropped (fixes #113)

data/Gemfile.nix.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bashcov (4.0.2)
+    bashcov (4.0.3)
       simplecov (~> 1.1)
 
 GEM

data/flake.nix

@@ -206,7 +206,7 @@
               pname = "bashcov";
               gemdir = self;
               lockfile = ./Gemfile.nix.lock;
-              version = "4.0.2";
+              version = "4.0.3";
               postBuild = ''
                 for gem in $out/${ruby.gemPath}/bundler/gems/*; do
                   ln -sfrT "$gem" $out/${ruby.gemPath}/gems/"''${gem##*/}"

data/gemset.nix

@@ -38,7 +38,7 @@
       path = ./.;
       type = "path";
     };
-    version = "4.0.2";
+    version = "4.0.3";
   };
   benchmark = {
     groups = ["development"];

data/lib/bashcov/lexer.rb

@@ -34,9 +34,27 @@ module Bashcov
       # line continuation (but never after an unescaped newline) - this must
       # come before simple line continuations which would claim the opening
       # line otherwise - unlike single quotes, double quotes may contain escaped
-      # characters such as \"
-      *[false, true].product([["'", /[^']*/], ['"', /(?:[^"\\]|\\.)*/m]]).map do |forward, (char, body)|
-        [/\G[^\n]+(?:[ \t=]|\\\n[ \t]*)+#{char}#{body}#{char}/m, forward]
+      # characters such as \" - the opening quote must not close a string
+      # already open on its line (e.g. `printf '%s: ' "$1"`), so the text
+      # before it may only hold complete strings, plus lone quotes of the other
+      # kind which may nest in command substitutions, e.g. "$(a 'b')" - this
+      # text may only be empty right after the closing quote of another string
+      *[false, true].product(["'", '"']).map do |forward, char|
+        # complete double-quoted string on one line, command substitutions
+        # being free to hold other strings, e.g. "$(a "b")"
+        dq = /(?<dq>"(?>(?:[^"\\\n$]|\\[^\n]|\$(?!\()|\$(?<sub>\((?>(?:[^()'"\\\n]|\\[^\n]|'[^'\n]*'|\g<dq>|\g<sub>)*)\)))*)")/
+        other = (char == "'" ? '(?!\g<dq>)"' : %q{(?!'[^'\n]*')'})
+        prefix = /(?:[^\n'"\\]|\\[^\n]|'[^'\n]*'|#{dq}|#{other})+|(?<=['"])/
+        body =
+          if char == "'"
+            /[^']*/
+          else
+            # same as above over several lines, or failing that anything up
+            # to the next unescaped quote
+            /(?<mdq>(?>(?:[^"\\$]|\\.|\$(?!\()|\$(?<msub>\((?>(?:[^()'"\\]|\\.|'[^']*'|"\g<mdq>"|\g<msub>)*)\)))*))|(?>(?:[^"\\]|\\.)*)/m
+          end
+
+        [/\G(?:#{prefix})(?:[ \t=]|\\\n[ \t]*)+#{char}(?:#{body})#{char}/m, forward]
       end,
 
       # simple line continuations with backslashes
@@ -61,23 +79,28 @@ module Bashcov
       offsets = lines.each_with_object([0]) { |line, memo| memo << (memo.last + line.size) }
 
       lineno = 0
+      resume = nil
       while lineno < lines.size
         # skip ahead past a multiline construct once its lines are marked, but
-        # recheck its last line as it may open another one, e.g. `a'; b='`
-        last = mark_multilines(content, offsets[lineno], lineno) || lineno
+        # recheck its last line as it may open another one, e.g. `a'; b='` -
+        # look right after a construct ending mid-line first, so that its
+        # closing quote is not read as an opener, then recheck the whole line
+        last, stop = (resume && mark_multilines(content, resume, lineno)) || mark_multilines(content, offsets[lineno], lineno)
+        last ||= lineno
         lineno.upto(last) { |sub_lineno| mark_line(lines[sub_lineno], sub_lineno) }
+        resume = (stop if last > lineno && stop < content.size && content[stop] != $/)
         lineno = (last > lineno ? last : last + 1)
       end
     end
 
   private
 
-    # @return [Integer, nil] last line of the multiline construct starting at
-    #   +lineno+, if any
+    # @return [Array<Integer>, nil] last line and end offset of the multiline
+    #   construct starting at +offset+ on +lineno+, if any
     def mark_multilines(content, offset, lineno)
       MULTILINE_PATTERNS.each do |regexp, forward|
-        last = mark_multiline(content, offset, lineno, regexp, forward: forward)
-        return last if last
+        result = mark_multiline(content, offset, lineno, regexp, forward: forward)
+        return result if result
       end
 
       nil
@@ -107,7 +130,7 @@ module Bashcov
         @coverage[sub_lineno] ||= @coverage[reference_lineno]
       end
 
-      last if length.positive?
+      [last, multiline_match.end(0)] if length.positive?
     end
 
     def mark_line(line, lineno)

data/lib/bashcov/version.rb

@@ -3,5 +3,5 @@
 # :nodoc:
 module Bashcov
   # Current Bashcov version
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bashcov
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Cédric Félizard