puppet-lint 2.3.6 → 2.4.0

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

@@ -313,7 +313,7 @@ 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
 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_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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.0
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Checks your Puppet manifests against the Puppetlabs
@@ -38,6 +38,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
@@ -92,6 +93,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 +102,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
@@ -159,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ensure your Puppet manifests conform with the Puppetlabs style guide
@@ -173,6 +175,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 +184,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