puppet-syntax 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c8f3b9275ea2f9c7cccb72c2b930a15079ff0618ee55d62d8b3d393ec3f8a1
-  data.tar.gz: 11d6e05a07d6932b9180a9e09eb1e5c7cf47b209c7c935bd4d5635e51ce11bba
+  metadata.gz: a9f7f1ca6475068159902b6dbe227d6ac486336d2fc2ad1c8b00e38b71082597
+  data.tar.gz: 725e830cc518515bf10605391de65a324eb7caafc38c37f32f252cafe1f18ace
 SHA512:
-  metadata.gz: 87e65a0f0e244ee179926e7e9b3904a5f0c77b87b6789a24f98efa18e78a8345312b434c5fbd051c92b9332572b19346a0bddad3623c341b6d9479ec6f55e094
-  data.tar.gz: 2bfd3fae9730595def3f1892a753279a7a081ab9ba4f09f8dafc1c798e7aaf67c469886c1fca22a994274d02343a9d838d90a02c56f16dd0c4b65099c28a9404
+  metadata.gz: a677df82c7a0a758a8184bb8158a422105be48f9552d21bec36f9c1f5f0e67380559318f3dbc6dda464ea18d9e8ed4b515ac68416220bcaf826e2816790f98cf
+  data.tar.gz: 6f9849ab4f2f99ab59f0dbdcff21b31e8c76e0bdc8920c8cf0edabe2d4882e07d4f29e7cdd6b8a4a32e8539b19a7a1b6b4cfa8002e666835ba92ac0358110eb2

data/.rubocop_todo.yml

@@ -86,7 +86,7 @@ RSpec/DescribedClass:
 # Offense count: 7
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 16
+  Max: 17
 
 # Offense count: 4
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
@@ -100,7 +100,7 @@ RSpec/FilePath:
 
 # Offense count: 29
 RSpec/MultipleExpectations:
-  Max: 10
+  Max: 11
 
 # Offense count: 30
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v4.1.1](https://github.com/voxpupuli/puppet-syntax/tree/v4.1.1) (2024-04-04)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v4.1.0...v4.1.1)
+
+**Fixed bugs:**
+
+- fix too greedy regular expression [\#171](https://github.com/voxpupuli/puppet-syntax/pull/171) ([tmu-sprd](https://github.com/tmu-sprd))
+
 ## [v4.1.0](https://github.com/voxpupuli/puppet-syntax/tree/v4.1.0) (2024-03-12)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v4.0.1...v4.1.0)

data/lib/puppet-syntax/hiera.rb

@@ -122,7 +122,7 @@ module PuppetSyntax
     # You can do string concatenation outside of {}:
     # "%{lookup('this_is_ok')}:3306"
     def check_broken_function_call(element)
-      'string after a function call but before `}` in the value' if element.is_a?(String) && /%{.+\('.*'\).+}/.match?(element)
+      'string after a function call but before `}` in the value' if element.is_a?(String) && /%{[^}]+\('[^}]*'\)[^}\s]+}/.match?(element)
     end
 
     # gets a hash or array, returns all keys + values as array

data/lib/puppet-syntax/version.rb

@@ -1,3 +1,3 @@
 module PuppetSyntax
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/puppet-syntax.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.14.2'
   spec.add_development_dependency 'rb-readline', '~> 0.5.5'
 
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.5.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.6.0'
 end

data/spec/fixtures/hiera/hiera_badkey.yaml

@@ -3,6 +3,7 @@ this_is_ok: 0
 this_is_ok::too: 0
 th1s_is_ok::two3: 0
 :eventhis: 0
+this_is_ok::concat_func: "%{lookup('foo')}%{lookup('bar')}"
 
 typical:typo::warning1:   true
 ::notsotypical::warning2: true
@@ -15,3 +16,4 @@ this_is::warning7:
   - "%{lookup('foobar'):3306}"
 this_is::warning8:
   foo: "%{lookup('foobar'):3306}"
+this_is::warning9: "%{lookup('foo'):3306}%{lookup('bar')}"

data/spec/puppet-syntax/hiera_spec.rb

@@ -29,7 +29,7 @@ describe PuppetSyntax::Hiera do
 
     it 'returns warnings for invalid keys' do
       hiera_yaml = 'hiera_badkey.yaml'
-      examples = 8
+      examples = 9
       files = fixture_hiera(hiera_yaml)
       res = subject.check(files)
       (1..examples).each do |n|
@@ -44,6 +44,7 @@ describe PuppetSyntax::Hiera do
       expect(res[5]).to match('Key :this_is::warning6: string after a function call but before `}` in the value')
       expect(res[6]).to match('Key :this_is::warning7: string after a function call but before `}` in the value')
       expect(res[7]).to match('Key :this_is::warning8: string after a function call but before `}` in the value')
+      expect(res[8]).to match('Key :this_is::warning9: string after a function call but before `}` in the value')
     end
 
     it 'returns warnings for bad eyaml values' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 description: Syntax checks for Puppet manifests and templates
 email:
 - voxpupuli@groups.io