puppet-lint-unquoted_string-check 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b133720a8d70d6127dfef7a5bbed671fe2a5fee5004e986c99094563849029
-  data.tar.gz: c0bed1bcebd9831348ea4c40b4b113b5a83da6e21d06d759bdabe8cff25dbc29
+  metadata.gz: 000ae666e4ca3430beceda4c9e6d473b8ac15b009c458f4f26a23657a556d306
+  data.tar.gz: 44ff25f4da80736c8935e7c7ab0ed8fdedb4300c3734f5350ebdd2a2d88aee3a
 SHA512:
-  metadata.gz: 398b0a304a60bbd5def94f04e40ac1976ddd3a975a2c23d2c4dfe160cfdd7917371f3030f09c94a6838cbc3e66d9f81c4647d19ce8f313cd41f56ae93734a59f
-  data.tar.gz: 9e272a8e7425051ad58249f5cd4a26147c6d7cb5731d96456a481c28cccfe16406e7be9e63eceace5574aa466b5a4c7a88381d2fac204db3a58c9c8b1fa0e58c
+  metadata.gz: 91cb476de59a0564179f741712b7b5b35c5f19a14833ae73ef0541476224c6676d125d640769f18ce67e6a5a8da51ae13b3dd8f9b04130992239fc866a1afeb4
+  data.tar.gz: 1d1c2e3c1fbdee5217c7e8ebff5b9f679656fcb8203cfcd9f049260e10ab875b2e3cc760a4df6983831b9d03815a29e49d31d6810b5829c33525fbe9eb3291d7

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.0.0](https://github.com/voxpupuli/puppet-lint-unquoted_string-check/tree/3.0.0) (2023-04-21)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-lint-unquoted_string-check/compare/2.2.0...3.0.0)
+
+**Breaking changes:**
+
+- Drop Ruby \< 2.7; Add RuboCop [\#21](https://github.com/voxpupuli/puppet-lint-unquoted_string-check/pull/21) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [2.2.0](https://github.com/voxpupuli/puppet-lint-unquoted_string-check/tree/2.2.0) (2022-11-29)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-lint-unquoted_string-check/compare/2.1.0...2.2.0)

data/lib/puppet-lint/plugins/check_unquoted_string_in_case.rb

@@ -1,27 +1,21 @@
-require 'pp'
-
 def type_indexes(type)
   type_indexes = []
   tokens.each_index do |token_idx|
-    if tokens[token_idx].type == type
-      depth = 0
-      start = token_idx
-      tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
-        idx = case_token_idx + token_idx + 1
-        if tokens[idx].type == :LBRACE
-          depth += 1
-          if depth == 2
-            type_indexes << {:start => start, :end => idx}
-          end
-        elsif tokens[idx].type == :RBRACE
-          if depth == 2
-            start = idx
-          end
-          depth -= 1
-          if depth == 0
-            type_indexes << {:start => start, :end => idx}
-            break
-          end
+    next unless tokens[token_idx].type == type
+
+    depth = 0
+    start = token_idx
+    tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
+      idx = case_token_idx + token_idx + 1
+      if tokens[idx].type == :LBRACE
+        depth += 1
+        type_indexes << { start: start, end: idx } if depth == 2
+      elsif tokens[idx].type == :RBRACE
+        start = idx if depth == 2
+        depth -= 1
+        if depth == 0
+          type_indexes << { start: start, end: idx }
+          break
         end
       end
     end
@@ -38,10 +32,10 @@ def notify_tokens(type, sep_type, message)
         while (s.type != :NEWLINE) && (s.type != :LBRACE)
           if s.type == :NAME || (s.type == :CLASSREF && !s.value.include?('::'))
             notify :warning, {
-              :message => message,
-              :line    => s.line,
-              :column  => s.column,
-              :token   => s,
+              message: message,
+              line: s.line,
+              column: s.column,
+              token: s,
             }
           end
           s = s.prev_token

data/spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_case_spec.rb

@@ -24,7 +24,7 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -46,7 +46,7 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -71,7 +71,7 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -105,11 +105,11 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to have(7).problems
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(2).in_column(11)
         expect(problems).to contain_warning(msg).on_line(5).in_column(11)
         expect(problems).to contain_warning(msg).on_line(5).in_column(18)
@@ -137,7 +137,7 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(2).in_column(11)
       end
     end
@@ -154,7 +154,7 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -189,11 +189,11 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -215,11 +215,11 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -244,11 +244,11 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -282,11 +282,11 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should only detect a single problem' do
+      it 'onlies detect a single problem' do
         expect(problems).to have(7).problem
       end
 
-      it 'should fix the problem' do
+      it 'fixes the problem' do
         expect(problems).to contain_fixed(msg).on_line(2).in_column(11)
         expect(problems).to contain_fixed(msg).on_line(5).in_column(11)
         expect(problems).to contain_fixed(msg).on_line(5).in_column(18)
@@ -296,9 +296,9 @@ describe 'unquoted_string_in_case' do
         expect(problems).to contain_fixed(msg).on_line(14).in_column(11)
       end
 
-      it 'should quote the case statement' do
+      it 'quotes the case statement' do
         expect(manifest).to eq(
-          <<-EOS
+          <<-EOS,
         case $osfamily {
           'solaris': {
             $rootgroup = 'wheel'
@@ -344,17 +344,17 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should only detect a single problem' do
+      it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the problem' do
+      it 'fixes the problem' do
         expect(problems).to contain_fixed(msg).on_line(2).in_column(11)
       end
 
-      it 'should quote the case statement' do
+      it 'quotes the case statement' do
         expect(manifest).to eq(
-          <<-EOS
+          <<-EOS,
         case $osfamily {
           'Solaris': {
             $rootgroup = 'wheel'
@@ -383,11 +383,11 @@ describe 'unquoted_string_in_case' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end

data/spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_selector_spec.rb

@@ -15,7 +15,7 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -31,7 +31,7 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(2).in_column(11)
       end
     end
@@ -47,7 +47,7 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should create a warning' do
+      it 'creates a warning' do
         expect(problems).to contain_warning(msg).on_line(2).in_column(11)
       end
     end
@@ -63,7 +63,7 @@ describe 'unquoted_string_in_selector' do
         PUPPET
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end
@@ -89,11 +89,11 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
 
-      it 'should not modify the manifest' do
+      it 'does not modify the manifest' do
         expect(manifest).to eq(code)
       end
     end
@@ -109,17 +109,17 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should only detect a single problem' do
+      it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the problem' do
+      it 'fixes the problem' do
         expect(problems).to contain_fixed(msg).on_line(2).in_column(11)
       end
 
-      it 'should quote the case statement' do
+      it 'quotes the case statement' do
         expect(manifest).to eq(
-          <<-EOS
+          <<-EOS,
         $rootgroup = $osfamily ? {
           'solaris'            => 'wheel',
           /(Darwin|FreeBSD)/ => 'wheel',
@@ -141,17 +141,17 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should only detect a single problem' do
+      it 'onlies detect a single problem' do
         expect(problems).to have(1).problem
       end
 
-      it 'should fix the problem' do
+      it 'fixes the problem' do
         expect(problems).to contain_fixed(msg).on_line(2).in_column(11)
       end
 
-      it 'should quote the case statement' do
+      it 'quotes the case statement' do
         expect(manifest).to eq(
-          <<-EOS
+          <<-EOS,
         $rootgroup = $osfamily ? {
           'Solaris'            => 'wheel',
           /(Darwin|FreeBSD)/ => 'wheel',
@@ -180,7 +180,7 @@ describe 'unquoted_string_in_selector' do
         EOS
       end
 
-      it 'should not detect any problems' do
+      it 'does not detect any problems' do
         expect(problems).to have(0).problems
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-unquoted_string-check
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -16,90 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: "    A puppet-lint plugin to check that selectors and case statements
   cases are quoted.\n"
 email: voxpupuli@groups.io
@@ -110,7 +40,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- lib/puppet-lint-unquoted-string-check/version.rb
 - lib/puppet-lint/plugins/check_unquoted_string_in_case.rb
 - spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_case_spec.rb
 - spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_selector_spec.rb
@@ -127,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -139,7 +68,4 @@ signing_key:
 specification_version: 4
 summary: A puppet-lint plugin to check that selectors and case statements cases are
   quoted.
-test_files:
-- spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_case_spec.rb
-- spec/puppet-lint/plugins/check_unquoted_string_in_case/check_unquoted_string_in_selector_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/lib/puppet-lint-unquoted-string-check/version.rb

@@ -1,4 +0,0 @@
-class PuppetLintUnquotedStringCheck
-  VERSION = '2.2.0'.freeze
-end
-