puppet-syntax 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbbd3aba8d6bec0241405c588e3681c1f1e5a139d760b1ec395f80f7ca7ca121
-  data.tar.gz: 7622c3904efa27007315dd1aa10d9301e103d183faa6abf08d1f3862f85f0f2f
+  metadata.gz: ed40e0315c9f5a3ae3f761b1d2af9779b1ab913e19057af9415bc88791a67d39
+  data.tar.gz: d4a7e69e7c1e57afe6d0d393469de33cb6c38fd683d985e1cdd9a1daa35317c6
 SHA512:
-  metadata.gz: 90baf9b29551b81073c0ded34b3edbc5fd7a77478d5e25fa4f1054a7546505d06fb7e7b5fa0312379686500b5eb986648240e3e433af034b75578716e8720f72
-  data.tar.gz: f88be032866ad40ccd014e43c1acd3b7ac31c4e53c9194b6d41a9141d6a44a3d9749807656d78dced4818c7542fa0a4740898d0e9d25cddd7839f2b8846f866b
+  metadata.gz: eddfdba6008c885abfefd649165d8aafa31fb920274f8a2cc5221a277bc3b789d637e998516618d066ee039d41032711da910524e39f39e233fd2eeb617b7ff6
+  data.tar.gz: baeedf5b248d065b73db5365ea11b31db5cab27a953a2158e7d09839e8e96230c26b8a652659bc33bc86f6be31fbf01a4ebd121c230d9d050064c9c4bffc9a33

data/.travis.yml

@@ -7,6 +7,7 @@ script: bundle exec rake
 rvm:
   - 2.4.4
   - 2.5.1
+  - 2.6.5
 env:
   - PUPPET_VERSION="~> 5.5.10"
   - PUPPET_VERSION="~> 6.1.0"

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
+## [v2.6.0](https://github.com/voxpupuli/puppet-syntax/tree/v2.6.0) (2019-10-05)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v2.5.0...v2.6.0)
+
+**Implemented enhancements:**
+
+- add support for validating puppet plans \(fixes \#95, fixes \#96\) [\#97](https://github.com/voxpupuli/puppet-syntax/pull/97) ([slauger](https://github.com/slauger))
+- Allow specifying file paths for manifests and templates too [\#87](https://github.com/voxpupuli/puppet-syntax/pull/87) ([lavagetto](https://github.com/lavagetto))
+
+**Merged pull requests:**
+
+- Test on ruby 2.6 [\#111](https://github.com/voxpupuli/puppet-syntax/pull/111) ([alexjfisher](https://github.com/alexjfisher))
+- Adding KMS tags to allowed EYAML methods [\#105](https://github.com/voxpupuli/puppet-syntax/pull/105) ([craigwatson](https://github.com/craigwatson))
 
 ## [v2.5.0](https://github.com/voxpupuli/puppet-syntax/tree/v2.5.0) (2019-07-07)
 
@@ -10,6 +22,10 @@ All notable changes to this project will be documented in this file.
 
 - Support puppet 6.5 [\#106](https://github.com/voxpupuli/puppet-syntax/pull/106) ([alexjfisher](https://github.com/alexjfisher))
 
+**Fixed bugs:**
+
+- search manifests outside of manifests directory [\#104](https://github.com/voxpupuli/puppet-syntax/issues/104)
+
 ## [v2.4.3](https://github.com/voxpupuli/puppet-syntax/tree/v2.4.3) (2019-02-09)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v2.4.2...v2.4.3)

data/README.md

@@ -51,6 +51,11 @@ To configure Puppet::Syntax, add any of the following settings to your `Rakefile
 
         PuppetSyntax.hieradata_paths = ["**/data/**/*.yaml", "hieradata/**/*.yaml", "hiera*.yaml"]
 
+* To configure specific paths for the Puppet syntax checks or for the templates checks, specify `manifests_paths` or `templates_paths` respectively. This is useful if you want to check specific paths only.
+
+        PuppetSyntax.manifests_paths = ["**/environments/future/*.pp"]
+        PuppetSyntax.templates_paths = ["**/modules/**/templates/*.erb"]
+
 * To validate the syntax of code written for application orchestration, enable `app_management`:
 
         PuppetSyntax.app_management = true

data/lib/puppet-syntax.rb

@@ -12,6 +12,13 @@ module PuppetSyntax
     "hieradata/**/*.*{yaml,yml}",
     "hiera*.*{yaml,yml}"
   ]
+  @manifests_paths = [
+    '**/*.pp'
+  ]
+  @templates_paths = [
+    '**/templates/**/*.erb',
+    '**/templates/**/*.epp'
+  ]
   @fail_on_deprecation_notices = true
   @app_management = Puppet.version.to_i >= 5 ? true : false
   @check_hiera_keys = false
@@ -20,6 +27,8 @@ module PuppetSyntax
     attr_accessor :exclude_paths,
                   :future_parser,
                   :hieradata_paths,
+                  :manifests_paths,
+                  :templates_paths,
                   :fail_on_deprecation_notices,
                   :epp_only,
                   :check_hiera_keys

data/lib/puppet-syntax/hiera.rb

@@ -56,7 +56,7 @@ module PuppetSyntax
           method = 'PKCS7'
         end
 
-        return "has unknown eyaml method #{method}" unless ['PKCS7','GPG'].include? method
+        return "has unknown eyaml method #{method}" unless ['PKCS7','GPG','GKMS','KMS'].include? method
         return "has unpadded or truncated base64 data" unless base64.length % 4 == 0
 
         # Base64#decode64 will silently ignore characters outside the alphabet,

data/lib/puppet-syntax/manifests.rb

@@ -64,6 +64,7 @@ module PuppetSyntax
     def validate_manifest(file)
       Puppet[:parser] = 'future' if PuppetSyntax.future_parser and Puppet.version.to_i < 4
       Puppet[:app_management] = true if PuppetSyntax.app_management && (Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0 && Puppet.version.to_i < 5)
+      Puppet[:tasks] = true if Puppet::Util::Package.versioncmp(Puppet.version, '5.4.0') >= 0 and file.match(/.*plans\/.*\.pp$/)
       Puppet::Face[:parser, :current].validate(file)
     end
   end

data/lib/puppet-syntax/tasks/puppet-syntax.rb

@@ -13,11 +13,11 @@ module PuppetSyntax
     end
 
     def filelist_manifests
-      filelist("**/*.pp")
+      filelist(PuppetSyntax.manifests_paths)
     end
 
     def filelist_templates
-      filelist(["**/templates/**/*.erb", "**/templates/**/*.epp"])
+      filelist(PuppetSyntax.templates_paths)
     end
 
     def filelist_hiera_yaml

data/lib/puppet-syntax/version.rb

@@ -1,3 +1,3 @@
 module PuppetSyntax
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/puppet-syntax/templates_spec.rb

@@ -2,6 +2,13 @@ require 'spec_helper'
 
 describe PuppetSyntax::Templates do
   let(:subject) { PuppetSyntax::Templates.new }
+  let(:conditional_warning_regex) do
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+      %r{2: warning: found `= literal' in conditional}
+    else
+      %r{2: warning: found = in conditional}
+    end
+  end
 
   it 'should expect an array of files' do
     expect { subject.check(nil) }.to raise_error(/Expected an array of files/)
@@ -34,7 +41,7 @@ describe PuppetSyntax::Templates do
     res = subject.check(files)
 
     expect(res.size).to eq(1)
-    expect(res[0]).to match(/2: warning: found = in conditional/)
+    expect(res[0]).to match(conditional_warning_regex)
   end
 
   it 'should read more than one valid file' do
@@ -50,7 +57,7 @@ describe PuppetSyntax::Templates do
 
     expect(res.size).to eq(2)
     expect(res[0]).to match(/2: syntax error, unexpected/)
-    expect(res[1]).to match(/2: warning: found = in conditional/)
+    expect(res[1]).to match(conditional_warning_regex)
   end
 
   it 'should ignore a TypeError' do

data/spec/puppet-syntax_spec.rb

@@ -44,4 +44,12 @@ describe PuppetSyntax do
     expect(PuppetSyntax.epp_only).to eq(true)
   end
 
+  it 'should support setting paths for manifests, templates and hiera' do
+    PuppetSyntax.hieradata_paths = []
+    expect(PuppetSyntax.hieradata_paths).to eq([])
+    PuppetSyntax.manifests_paths = ["**/environments/production/**/*.pp"]
+    expect(PuppetSyntax.manifests_paths).to eq(["**/environments/production/**/*.pp"])
+    PuppetSyntax.templates_paths = []
+    expect(PuppetSyntax.templates_paths).to eq([])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,7 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Syntax checks for Puppet manifests, templates, and Hiera YAML