puppet-lint 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67dfbcf1aff9be2449b52eb8ff66db18cf025ad69ce6dee4f3e8a7ae4155980
-  data.tar.gz: 2eec8d5d37d1deeaaf9e26ca6ad24e7f841e137bb9de99e61736675862f6bffc
+  metadata.gz: f5218ad907f8d7979c11e6275ee5747650d18ab7586ce531f8628d5a493f99ae
+  data.tar.gz: 521f517cf4f8cdb13a633ecb0498c3dfe23566e3584a7299950c9f8b22af44c9
 SHA512:
-  metadata.gz: 80e81796c7aa00827859e45f6586105bbeb1c16c5a813e3130e8ff1fa11272c012dd86563d21172862a00852f49c0b0df2015881c83e15b62e208e117c85e938
-  data.tar.gz: f21481a188185489015c3fa7dff8bd3d00e5eec505a547abc4c7633805c41e275f311eec37f5c4a93899ea77fb43a530ba25588fdbb0f78dc043f904d6716c1b
+  metadata.gz: fea7721ce15f702e1e66fb153724f6a27af58a9f44bb0dede58cda9582d0c63729f76cff5cbc48ff0a8784515f8a10bceb196b8c887791b8bbfaecfcd7338377
+  data.tar.gz: 2021cdd71199fe62955b5f940545a8f84a124ccd9ab096b24eda2e13c8a5787f545235fcf7db9426dd4020503c59bc647259126dc9d14641ab1cd09d4a4e8aaf

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [2.4.1](https://github.com/rodjek/puppet-lint/tree/2.4.1) (2019-10-09)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.4.0...2.4.1)
+
+**Fixed bugs:**
+
+- Puppet-lint 2.4.0 - ERROR: Syntax error on line x [\#887](https://github.com/rodjek/puppet-lint/issues/887)
+- Puppet-lint 2.4.0 throws misleading warning on double-quoted strings with escaped variables [\#886](https://github.com/rodjek/puppet-lint/issues/886)
+- Breaks after 2.4.0 upgrade [\#885](https://github.com/rodjek/puppet-lint/issues/885)
+
+**Merged pull requests:**
+
+- Fix escaped ${} enclosure handling when slurping double quoted strings [\#889](https://github.com/rodjek/puppet-lint/pull/889) ([rodjek](https://github.com/rodjek))
+- Fix non-indented heredoc parsing [\#888](https://github.com/rodjek/puppet-lint/pull/888) ([rodjek](https://github.com/rodjek))
+
 ## [2.4.0](https://github.com/rodjek/puppet-lint/tree/2.4.0) (2019-10-08)
 [Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.6...2.4.0)
 

data/lib/puppet-lint/lexer.rb

@@ -241,7 +241,7 @@ class PuppetLint
             process_string_segments(string_segments)
             length = slurper.consumed_bytes + 1
           rescue PuppetLint::Lexer::StringSlurper::UnterminatedStringError
-            raise PuppetLint::LexerError, @line_no, @column, 'unterminated string'
+            raise PuppetLint::LexerError.new(@line_no, @column, 'unterminated string')
           end
 
         elsif heredoc_name = chunk[%r{\A@\(("?.+?"?(:.+?)?#{WHITESPACE_RE}*(/.*?)?)\)}, 1]
@@ -293,6 +293,14 @@ class PuppetLint
           length = eol.size
           tokens << new_token(:NEWLINE, eol)
 
+          unless heredoc_queue.empty?
+            heredoc_tag = heredoc_queue.shift
+            slurper = PuppetLint::Lexer::StringSlurper.new(code[i + length..-1])
+            heredoc_segments = slurper.parse_heredoc(heredoc_tag)
+            process_heredoc_segments(heredoc_segments)
+            length += slurper.consumed_bytes
+          end
+
         elsif chunk.start_with?('/')
           length = 1
           tokens << new_token(:DIV, '/')

data/lib/puppet-lint/lexer/string_slurper.rb

@@ -103,6 +103,11 @@ class PuppetLint
       end
 
       def start_interp
+        if @segment.last && @segment.last == '\\'
+          read_char
+          return
+        end
+
         if interp_stack.empty?
           scanner.skip(START_INTERP_PATTERN)
           results << [@segment_type, @segment.join]

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.4.1'.freeze
 end

data/spec/puppet-lint/lexer/string_slurper_spec.rb

@@ -36,14 +36,22 @@ describe PuppetLint::Lexer::StringSlurper do
           end
         end
 
-        context 'an escaped $' do
+        context 'an escaped $var' do
           let(:string) { '\$foo"' }
 
-          it 'does not create an interpolation segment' do
+          it 'does not create an unenclosed variable segment' do
             expect(segments).to eq([[:STRING, '\$foo']])
           end
         end
 
+        context 'an escaped ${} enclosure' do
+          let(:string) { '\"\${\"string\"}\""' }
+
+          it 'does not create an interpolation segment' do
+            expect(segments).to eq([[:STRING, '\"\${\"string\"}\"']])
+          end
+        end
+
         context 'a variable and a suffix' do
           let(:string) { '${foo}bar"' }
 

data/spec/puppet-lint/lexer_spec.rb

@@ -1590,6 +1590,21 @@ END
       expect(tokens[6].type).to eq(:HEREDOC)
       expect(tokens[6].value).to eq("  foo\n  ")
     end
+
+    it 'should handle a heredoc with no indentation' do
+      manifest = <<-END.gsub(%r{^ {6}}, '')
+      $str = @(EOT)
+      something
+      EOT
+      END
+      tokens = @lexer.tokenise(manifest)
+
+      expect(tokens.length).to eq(8)
+      expect(tokens[4].type).to eq(:HEREDOC_OPEN)
+      expect(tokens[4].value).to eq('EOT')
+      expect(tokens[6].type).to eq(:HEREDOC)
+      expect(tokens[6].value).to eq('something')
+    end
   end
 
   context ':HEREDOC with interpolation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Checks your Puppet manifests against the Puppetlabs