puppet-lint 2.3.6 → 2.5.0

data/spec/puppet-lint/plugins/check_classes/parameter_order_spec.rb

@@ -147,5 +147,23 @@ describe 'parameter_order' do
 
       it { expect(problems).to have(0).problems }
     end
+
+    context "#{type} parameter with array operation" do
+      let(:code) do
+        <<-END
+          #{type} ntp (
+            # XXX: remove self from list
+            Array[String] $ntp_servers = [
+              'foo',
+              'bar',
+              'baz',
+            ] - $::fqdn,
+            Array[String] $pools       = [],
+          ) { }
+        END
+      end
+
+      it { expect(problems).to have(0).problems }
+    end
   end
 end

data/spec/puppet-lint/plugins/check_classes/variable_scope_spec.rb

@@ -313,7 +313,21 @@ describe 'variable_scope' do
     end
 
     it 'should create one warning' do
-      expect(problems).to contain_warning(msg).on_line(2).in_column(13)
+      expect(problems).to contain_warning(msg).on_line(2).in_column(14)
+    end
+  end
+
+  context 'assigning regex with multiple alternations to variable' do
+    let(:code) do
+      <<-END
+        class gh::issue859 {
+          $regex = /5|6|7/
+        }
+      END
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
     end
   end
 end

data/spec/puppet-lint/plugins/check_conditionals/case_without_default_spec.rb

@@ -105,4 +105,43 @@ describe 'case_without_default' do
       expect(problems).to have(0).problems
     end
   end
+
+  context 'issue-829 nested selector with default in case without default' do
+    let(:code) do
+      <<-END
+        case $::operatingsystem {
+          'centos': {
+            $variable = $::operatingsystemmajrelease ? {
+              '7'     => 'value1'
+              default => 'value2',
+            }
+          }
+        }
+      END
+    end
+
+    it 'should create one warning' do
+      expect(problems).to contain_warning(msg).on_line(1).in_column(9)
+    end
+  end
+
+  context 'issue-829 nested selector with default in case with default' do
+    let(:code) do
+      <<-END
+        case $::operatingsystem {
+          'centos': {
+            $variable = $::operatingsystemmajrelease ? {
+              '7'     => 'value1'
+              default => 'value2',
+            }
+          }
+          default: {}
+        }
+      END
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
 end

data/spec/puppet-lint/plugins/check_documentation/documentation_spec.rb

@@ -29,6 +29,24 @@ describe 'documentation' do
     end
   end
 
+  describe 'incorrectly documented class' do
+    let(:code) do
+      <<-END
+        # foo
+
+        class test {}
+      END
+    end
+
+    it 'should only detect a single problem' do
+      expect(problems).to have(1).problem
+    end
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(class_msg).on_line(3).in_column(9)
+    end
+  end
+
   describe 'undocumented defined type' do
     let(:code) { 'define test {}' }
 

data/spec/puppet-lint/plugins/check_resources/ensure_first_param_spec.rb

@@ -80,6 +80,22 @@ describe 'ensure_first_param' do
         expect(problems).to have(0).problems
       end
     end
+
+    context 'ensure in nested hash' do
+      let(:code) do
+        <<-END
+          foo::bar { 'bar':
+            opts   => {
+              ensure => present,
+            },
+          },
+        END
+      end
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+    end
   end
 
   context 'with fix enabled' do

data/spec/puppet-lint/plugins/check_strings/double_quoted_strings_spec.rb

@@ -93,15 +93,15 @@ describe 'double_quoted_strings' do
       end
     end
 
-    context 'double quoted stings containing supported escape patterns' do
+    context 'double quoted strings containing supported escape patterns' do
       let(:code) do
         <<-END
-          $string1 = "this string contins \n newline"
-          $string2 = "this string contains \ttab"
+          $string1 = "this string contains \n newline"
+          $string2 = "this string contains \t tab"
           $string3 = "this string contains \${escaped} var"
           $string4 = "this string contains \\"escaped \\" double quotes"
           $string5 = "this string contains \\'escaped \\' single quotes"
-          $string6 = "this string contains \r line return"
+          $string6 = "this string contains \r carriage return"
           $string7 = "this string contains \\\\ an escaped backslash"
         END
       end
@@ -112,7 +112,7 @@ describe 'double_quoted_strings' do
     end
 
     context 'double quoted string with random escape should be rejected' do
-      let(:code) { %( $ztring = "this string contains \l random esape" ) }
+      let(:code) { %( $ztring = "this string contains \l random escape" ) }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem

data/spec/puppet-lint/plugins/check_strings/only_variable_string_spec.rb

@@ -12,7 +12,7 @@ describe 'only_variable_string' do
       end
 
       it 'should create a warning' do
-        expect(problems).to contain_warning(msg).on_line(1).in_column(3)
+        expect(problems).to contain_warning(msg).on_line(1).in_column(4)
       end
     end
 
@@ -24,7 +24,7 @@ describe 'only_variable_string' do
       end
 
       it 'should create a warning' do
-        expect(problems).to contain_warning(msg).on_line(1).in_column(3)
+        expect(problems).to contain_warning(msg).on_line(1).in_column(4)
       end
     end
 
@@ -36,7 +36,7 @@ describe 'only_variable_string' do
       end
 
       it 'should create a warning' do
-        expect(problems).to contain_warning(msg).on_line(1).in_column(3)
+        expect(problems).to contain_warning(msg).on_line(1).in_column(4)
       end
     end
 
@@ -73,7 +73,7 @@ describe 'only_variable_string' do
       end
 
       it 'should fix the manifest' do
-        expect(problems).to contain_fixed(msg).on_line(1).in_column(3)
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
       end
 
       it 'should unquote the variable' do
@@ -89,7 +89,7 @@ describe 'only_variable_string' do
       end
 
       it 'should fix the manifest' do
-        expect(problems).to contain_fixed(msg).on_line(1).in_column(3)
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
       end
 
       it 'should unquoted the variable' do
@@ -105,7 +105,7 @@ describe 'only_variable_string' do
       end
 
       it 'should fix the manifest' do
-        expect(problems).to contain_fixed(msg).on_line(1).in_column(3)
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
       end
 
       it 'should unquote the variable' do

data/spec/puppet-lint/plugins/check_strings/variables_not_enclosed_spec.rb

@@ -86,5 +86,37 @@ describe 'variables_not_enclosed' do
         expect(manifest).to eq('"${foo}-${bar}"')
       end
     end
+
+    context 'variable with a hash or array reference not enclosed' do
+      let(:code) { %("$foo['bar'][2]something") }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(2)
+      end
+
+      it 'should enclose the variable with the references' do
+        expect(manifest).to eq(%("${foo['bar'][2]}something"))
+      end
+    end
+
+    context 'unenclosed variable followed by a dash and then text' do
+      let(:code) { '"$hostname-keystore"' }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(2)
+      end
+
+      it 'should enclose the variable but not the text' do
+        expect(manifest).to eq('"${hostname}-keystore"')
+      end
+    end
   end
 end

data/spec/puppet-lint/plugins/check_variables/variable_is_lowercase_spec.rb

@@ -22,4 +22,32 @@ describe 'variable_is_lowercase' do
       expect(problems).to have(0).problems
     end
   end
+
+  context 'when typecasting inside an interpolation' do
+    let(:code) { %("${Integer(fact('memory.system.total_bytes'))}") }
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
+
+  context 'when an interpolated variable contains an uppercase letter' do
+    let(:code) { '"${fooBar}"' }
+
+    it 'should only detect a single problem' do
+      expect(problems).to have(1).problem
+    end
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(msg).on_line(1).in_column(4)
+    end
+  end
+
+  context 'when an interpolated variable only contains lowercase letters' do
+    let(:code) { '"${foobar}"' }
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter('/spec/')
-  add_filter('/vendor/')
-  add_group('Checks', 'lib/puppet-lint/plugins')
+if ENV['COVERAGE'] == 'yes' && RUBY_VERSION.start_with?('2.6.')
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter('/spec/')
+    add_filter('/vendor/')
+    add_group('Checks', 'lib/puppet-lint/plugins')
+  end
 end
 
 require 'puppet-lint'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.5.0
 platform: ruby
 authors:
 - Tim Sharpe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Checks your Puppet manifests against the Puppetlabs
@@ -19,17 +19,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- appveyor.yml
 - bin/puppet-lint
 - lib/puppet-lint.rb
 - lib/puppet-lint/bin.rb
@@ -38,6 +30,7 @@ files:
 - lib/puppet-lint/configuration.rb
 - lib/puppet-lint/data.rb
 - lib/puppet-lint/lexer.rb
+- lib/puppet-lint/lexer/string_slurper.rb
 - lib/puppet-lint/lexer/token.rb
 - lib/puppet-lint/monkeypatches.rb
 - lib/puppet-lint/optparser.rb
@@ -83,7 +76,6 @@ files:
 - lib/puppet-lint/tasks/puppet-lint.rb
 - lib/puppet-lint/tasks/release_test.rb
 - lib/puppet-lint/version.rb
-- puppet-lint.gemspec
 - spec/fixtures/test/manifests/fail.pp
 - spec/fixtures/test/manifests/ignore.pp
 - spec/fixtures/test/manifests/ignore_multiple_block.pp
@@ -92,6 +84,7 @@ files:
 - spec/fixtures/test/manifests/init.pp
 - spec/fixtures/test/manifests/malformed.pp
 - spec/fixtures/test/manifests/mismatched_control_comment.pp
+- spec/fixtures/test/manifests/two_warnings.pp
 - spec/fixtures/test/manifests/unterminated_control_comment.pp
 - spec/fixtures/test/manifests/url_interpolation.pp
 - spec/fixtures/test/manifests/warning.pp
@@ -100,6 +93,7 @@ files:
 - spec/puppet-lint/configuration_spec.rb
 - spec/puppet-lint/data_spec.rb
 - spec/puppet-lint/ignore_overrides_spec.rb
+- spec/puppet-lint/lexer/string_slurper_spec.rb
 - spec/puppet-lint/lexer/token_spec.rb
 - spec/puppet-lint/lexer_spec.rb
 - spec/puppet-lint/plugins/check_classes/arrow_on_right_operand_line_spec.rb
@@ -142,9 +136,10 @@ files:
 - spec/puppet-lint_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rodjek/puppet-lint/
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,9 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Ensure your Puppet manifests conform with the Puppetlabs style guide
 test_files:
@@ -173,6 +168,7 @@ test_files:
 - spec/fixtures/test/manifests/init.pp
 - spec/fixtures/test/manifests/malformed.pp
 - spec/fixtures/test/manifests/mismatched_control_comment.pp
+- spec/fixtures/test/manifests/two_warnings.pp
 - spec/fixtures/test/manifests/unterminated_control_comment.pp
 - spec/fixtures/test/manifests/url_interpolation.pp
 - spec/fixtures/test/manifests/warning.pp
@@ -181,6 +177,7 @@ test_files:
 - spec/puppet-lint/configuration_spec.rb
 - spec/puppet-lint/data_spec.rb
 - spec/puppet-lint/ignore_overrides_spec.rb
+- spec/puppet-lint/lexer/string_slurper_spec.rb
 - spec/puppet-lint/lexer/token_spec.rb
 - spec/puppet-lint/lexer_spec.rb
 - spec/puppet-lint/plugins/check_classes/arrow_on_right_operand_line_spec.rb

data/.gitignore

@@ -1,12 +0,0 @@
-*.gem
-.bundle/
-.rbenv-version
-.ruby-version
-Gemfile.lock
-vendor/
-coverage/
-*.swp
-/_site/
-.idea
-/*.pp
-/tmp/

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.rubocop.yml

@@ -1,74 +0,0 @@
----
-inherit_from: './.rubocop_todo.yml'
-AllCops:
-    TargetRubyVersion: 1.9
-
-Style/HashSyntax:
-    EnforcedStyle: hash_rockets
-
-Layout/FirstArrayElementLineBreak:
-    Enabled: true
-Layout/FirstHashElementLineBreak:
-    Enabled: true
-Layout/FirstMethodArgumentLineBreak:
-    Enabled: true
-Layout/FirstMethodParameterLineBreak:
-    Enabled: true
-Layout/IndentArray:
-    EnforcedStyle: consistent
-Layout/MultilineArrayBraceLayout:
-    EnforcedStyle: new_line
-Layout/MultilineAssignmentLayout:
-    Enabled: true
-    EnforcedStyle: same_line
-Layout/MultilineHashBraceLayout:
-    EnforcedStyle: new_line
-Layout/MultilineMethodDefinitionBraceLayout:
-    EnforcedStyle: new_line
-
-Style/AutoResourceCleanup:
-    Enabled: true
-Style/BlockDelimiters:
-    EnforcedStyle: braces_for_chaining
-Style/BracesAroundHashParameters:
-    EnforcedStyle: context_dependent
-Style/Encoding:
-    Enabled: false
-Style/MethodCallWithArgsParentheses:
-    Enabled: true
-    IgnoreMacros: true
-    IgnoredMethods:
-        - puts
-        - require
-        - include
-        - it
-        - context
-        - describe
-        - to
-        - to_not
-        - raise
-        - desc
-        - task
-        - exit
-        - should
-        - gem
-        - group
-        - attr_reader
-        - attr_accessor
-        - attr_writer
-        - source
-Style/MethodCalledOnDoEndBlock:
-    Enabled: true
-Style/RegexpLiteral:
-    EnforcedStyle: percent_r
-Style/TrailingCommaInArguments:
-    EnforcedStyleForMultiline: no_comma
-Style/TrailingCommaInLiteral:
-    EnforcedStyleForMultiline: comma
-Style/FormatStringToken:
-    Enabled: false
-Style/FileName:
-    Exclude:
-        - 'lib/puppet-lint.rb'
-        - 'lib/puppet-lint/tasks/puppet-lint.rb'
-        - 'spec/puppet-lint_spec.rb'