puppet-lint 3.4.0 → 4.0.0.rc.1

data/spec/unit/puppet-lint/lexer_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe PuppetLint::Lexer do
@@ -13,7 +11,7 @@ describe PuppetLint::Lexer do
     end
   end
 
-  context '#new_token' do
+  describe '#new_token' do
     it 'calculates the line number for an empty string' do
       token = lexer.new_token(:TEST, 'test')
       expect(token.line).to eq(1)
@@ -55,19 +53,19 @@ describe PuppetLint::Lexer do
     end
 
     it 'calculates the column number for a multi line string' do
-      lexer.instance_variable_set('@line_no', 4)
-      lexer.instance_variable_set('@column', 5)
+      lexer.instance_variable_set(:@line_no, 4)
+      lexer.instance_variable_set(:@column, 5)
       lexer.new_token(:SSTRING, "test\ntest")
       token = lexer.new_token(:TEST, 'test')
       expect(token.column).to eq(6)
     end
   end
 
-  context '#process_string_segments' do
-    subject(:tokens) { lexer.tokens }
-
+  describe '#process_string_segments' do
     subject(:manifest) { lexer.tokens.map(&:to_manifest).join }
 
+    let(:tokens) { lexer.tokens }
+
     before(:each) do
       lexer.process_string_segments(segments)
     end
@@ -1291,7 +1289,7 @@ END
     it 'does not enclose variable with a chained function call' do
       manifest = '"This is ${a.test}"'
       tokens = lexer.tokenise(manifest)
-      expect(tokens.map(&:to_manifest).join('')).to eq(manifest)
+      expect(tokens.map(&:to_manifest).join).to eq(manifest)
     end
   end
 
@@ -1382,6 +1380,7 @@ END
         expect(token.type).to eq(:TYPE)
         expect(token.value).to eq('Callable')
       end
+
       it 'matches Sensitive' do
         token = lexer.tokenise('Sensitive').first
         expect(token.type).to eq(:TYPE)
@@ -1689,7 +1688,7 @@ END
       END
 
       tokens = lexer.tokenise(manifest)
-      expect(tokens.map(&:to_manifest).join('')).to eq(manifest)
+      expect(tokens.map(&:to_manifest).join).to eq(manifest)
 
       expect(tokens[0].type).to eq(:VARIABLE)
       expect(tokens[0].value).to eq('str')
@@ -1756,7 +1755,7 @@ END
       expect(tokens[7].raw).to eq('$myvar')
       expect(tokens[7].to_manifest).to eq('$myvar')
 
-      expect(tokens.map(&:to_manifest).join('')).to eq(manifest)
+      expect(tokens.map(&:to_manifest).join).to eq(manifest)
     end
   end
 

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

@@ -27,7 +27,7 @@ describe 'parameter_order' do
         expect(problems).to have(1).problem
       end
 
-      col = (type == 'class' ? 23 : 24)
+      col = ((type == 'class') ? 23 : 24)
       it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(col)
       end
@@ -58,7 +58,7 @@ describe 'parameter_order' do
         expect(problems).to have(1).problem
       end
 
-      col = (type == 'class' ? 35 : 36)
+      col = ((type == 'class') ? 35 : 36)
       it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(col)
       end

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

@@ -87,15 +87,15 @@ describe 'case_without_default' do
     let(:code) do
       <<-END
         $mem = inline_template('<%
-          mem,unit = scope.lookupvar(\'::memorysize\').split
+          mem,unit = scope.lookupvar('::memorysize').split
           mem = mem.to_f
           # Normalize mem to bytes
           case unit
               when nil:  mem *= (1<<0)
-              when \'kB\': mem *= (1<<10)
-              when \'MB\': mem *= (1<<20)
-              when \'GB\': mem *= (1<<30)
-              when \'TB\': mem *= (1<<40)
+              when 'kB': mem *= (1<<10)
+              when 'MB': mem *= (1<<20)
+              when 'GB': mem *= (1<<30)
+              when 'TB': mem *= (1<<40)
           end
           %><%= mem.to_i %>')
       END

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

@@ -98,7 +98,7 @@ describe 'double_quoted_strings' do
         <<-END
           $string1 = "this string contains \n newline"
           $string2 = "this string contains \t tab"
-          $string3 = "this string contains \${escaped} var"
+          $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 carriage return"

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

@@ -45,7 +45,7 @@ describe 'only_variable_string' do
         <<-END
           $bar = 'key'
           $foo = {
-            \"$bar\" => 1,
+            "$bar" => 1,
           }
         END
       end

data/spec/unit/puppet-lint/plugins/check_whitespace/140chars_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe '140chars' do

data/spec/unit/puppet-lint/plugins/check_whitespace/80chars_spec.rb

@@ -1,10 +1,8 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe '80chars' do
   before(:each) do
-    PuppetLint.configuration.send('enable_80chars')
+    PuppetLint.configuration.send(:enable_80chars)
   end
 
   let(:msg) { 'line has more than 80 characters' }

data/spec/unit/puppet-lint/plugins/legacy_facts/legacy_facts_spec.rb

@@ -250,6 +250,7 @@ describe 'legacy_facts' do
       it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
+
       it 'uses the facts hash' do
         expect(manifest).to eq("$facts['disks']['sda']['model']")
       end
@@ -261,6 +262,7 @@ describe 'legacy_facts' do
       it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
+
       it 'uses the facts hash' do
         expect(manifest).to eq("$facts['networking']['interfaces']['em2']['ip6']")
       end
@@ -272,6 +274,7 @@ describe 'legacy_facts' do
       it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
+
       it 'uses the facts hash' do
         expect(manifest).to eq("$facts['solaris_zones']['zones']['foobar']['uuid']")
       end
@@ -283,6 +286,7 @@ describe 'legacy_facts' do
       it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
+
       it 'uses the facts hash' do
         expect(manifest).to eq("$facts['processors']['models'][314]")
       end
@@ -294,6 +298,7 @@ describe 'legacy_facts' do
       it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
+
       it 'uses the facts hash' do
         expect(manifest).to eq("$facts['system_profiler']['l3_cache']")
       end
@@ -305,6 +310,7 @@ describe 'legacy_facts' do
       it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
+
       it 'uses the facts hash' do
         expect(manifest).to eq("$facts['ssh']['rsa']['key']")
       end
@@ -333,6 +339,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['family']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::gid"' do
       let(:code) { '"$::gid"' }
 
@@ -344,6 +351,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['identity']['group']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::id"' do
       let(:code) { '"$::id"' }
 
@@ -355,6 +363,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['identity']['user']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbdistcodename"' do
       let(:code) { '"$::lsbdistcodename"' }
 
@@ -366,6 +375,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['codename']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbdistdescription"' do
       let(:code) { '"$::lsbdistdescription"' }
 
@@ -377,6 +387,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['description']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbdistid"' do
       let(:code) { '"$::lsbdistid"' }
 
@@ -388,6 +399,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['id']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbdistrelease"' do
       let(:code) { '"$::lsbdistrelease"' }
 
@@ -399,6 +411,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['release']['full']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbmajdistrelease"' do
       let(:code) { '"$::lsbmajdistrelease"' }
 
@@ -410,6 +423,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['release']['major']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbminordistrelease"' do
       let(:code) { '"$::lsbminordistrelease"' }
 
@@ -421,6 +435,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['release']['minor']\"")
       end
     end
+
     context 'fact variable using legacy variable in double quotes "$::lsbrelease"' do
       let(:code) { '"$::lsbrelease"' }
 
@@ -432,6 +447,7 @@ describe 'legacy_facts' do
         expect(manifest).to eq("\"$facts['os']['distro']['release']['specification']\"")
       end
     end
+
     context "fact variable using facts hash in double quotes \"$facts['lsbrelease']\"" do
       let(:code) { "\"${facts['lsbrelease']}\"" }
 

data/spec/unit/puppet-lint/plugins/top_scope_facts/top_scope_facts_spec.rb

@@ -11,6 +11,7 @@ describe 'top_scope_facts' do
         expect(problems).to have(0).problem
       end
     end
+
     context 'non-fact variable with two colons' do
       let(:code) { '$foo::bar' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0.rc.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies: []
 description: "    Checks your Puppet manifests against the Puppetlabs style guide
   and alerts you to any discrepancies.\n"
@@ -162,12 +162,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: