puppet-lint-version_comparison-check 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb963a206341b0ca35ac2ae345a68d25ef28553fb6710cccecadce1e8fb417f
-  data.tar.gz: '058e28f92340c9c4714f6330ea34d0b57459be5a2c395e2f3ac20caf6059b86b'
+  metadata.gz: '080c1a44f220a8186a060cf8bb65c4978e15ea9eae341bcdb1887fb4cb963de0'
+  data.tar.gz: aa9ff314e709c59c3d84c87d4e4d8c8243c5a85b74677d892dcb87847f1205b2
 SHA512:
-  metadata.gz: 6b0ccc13db5fbbcbaa7b3907b8f7ac46b2ad0945cab46b67fec2de08bb5bfb08e319595c9ac9fa5cf1b8b3dbe9c72c651da7973ff4ad1c92d007853aa36b0a20
-  data.tar.gz: 422a9cfe4bfca63c9b2b71bb7c4ed1f183341eb1240cc8318c5a45f51b00af1adcabfe6cf0f77751119705f45eabe9f1283b4c48f448f775964a287ce1b9cbd0
+  metadata.gz: 0aadedb778788535e4108d8ffe0889fe7831bbb03b240ea3a27b78b2482563fe9febfae443c8ae9e110d5068f84c6ad84b3045589b75e616a74868315dad75af
+  data.tar.gz: cf86cfe2781a3adadb4186fdb28e4f5a1a02e74749cc93a10ef18d9f980a4f15fc3cb01ef1d4005ee01515207be069e17e9917a21e0eec6598ed564f44323f03

data/CHANGELOG.md

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

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

@@ -1,25 +1,26 @@
 PuppetLint.new_check(:version_comparison) do
   def is_num_comparison?(token)
     return false unless token
-    return true if [:GREATEREQUAL, :GREATERTHAN, :LESSEQUAL, :LESSTHAN].include?(token.type)
-    return true if [:ISEQUAL, :NOTEQUAL].include?(token.type) && \
-                   token.next_code_token && \
+    return true if %i[GREATEREQUAL GREATERTHAN LESSEQUAL LESSTHAN].include?(token.type)
+    return true if %i[ISEQUAL NOTEQUAL].include?(token.type) &&
+                   token.next_code_token &&
                    token.next_code_token.type == :NUMBER
   end
 
   def check
-    tokens.each_with_index do |token, token_idx|
+    tokens.each_with_index do |token, _token_idx|
       next unless token.type == :VARIABLE
-      next unless token.value =~ /(?:version|release)$/
+      next unless /(?:version|release)$/.match?(token.value)
       next unless is_num_comparison?(token.next_code_token)
+
       notify :warning, {
-        :message => 'version compared as number',
-        :line    => token.line,
-        :column  => token.column,
-        :token   => token,
+        message: 'version compared as number',
+        line: token.line,
+        column: token.column,
+        token: token,
       }
     end
-  end 
+  end
 
   def compared_value(token)
     token.next_code_token.next_code_token.value
@@ -32,23 +33,23 @@ PuppetLint.new_check(:version_comparison) do
     )
     lparen = PuppetLint::Lexer::Token.new(
       :LPAREN, '(',
-      problem[:token].line, problem[:token].column+1
+      problem[:token].line, problem[:token].column + 1
     )
     rparen = PuppetLint::Lexer::Token.new(
       :RPAREN, ')',
-      problem[:token].line, problem[:token].column+2 # not +2
+      problem[:token].line, problem[:token].column + 2 # not +2
     )
     space = PuppetLint::Lexer::Token.new(
       :WHITESPACE, ' ',
-      problem[:token].line, problem[:token].column+3 # not +3
+      problem[:token].line, problem[:token].column + 3 # not +3
     )
     comma = PuppetLint::Lexer::Token.new(
       :COMMA, ',',
-      problem[:token].line, problem[:token].column+4 # not +4
+      problem[:token].line, problem[:token].column + 4 # not +4
     )
     value = PuppetLint::Lexer::Token.new(
       :SSTRING, compared_value(problem[:token]),
-      problem[:token].line, problem[:token].column+5 # not +5
+      problem[:token].line, problem[:token].column + 5 # not +5
     )
 
     idx = tokens.index(problem[:token])
@@ -57,12 +58,12 @@ PuppetLint.new_check(:version_comparison) do
     value_token.value = 0
     value_token.type = :NUMBER
     # Insert ')' after value
-    tokens.insert(idx+1, rparen)
+    tokens.insert(idx + 1, rparen)
     # Insert value as string after comma
-    tokens.insert(idx+1, value)
+    tokens.insert(idx + 1, value)
     # Insert comma after token
-    tokens.insert(idx+1, space)
-    tokens.insert(idx+1, comma)
+    tokens.insert(idx + 1, space)
+    tokens.insert(idx + 1, comma)
     # Insert 'versioncmp(' before token
     tokens.insert(idx, lparen)
     tokens.insert(idx, versioncmp)

data/spec/puppet-lint/plugins/check_version_comparison/version_comparison_spec.rb

@@ -14,7 +14,7 @@ describe 'version_comparison' 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
@@ -29,11 +29,11 @@ describe 'version_comparison' do
         EOS
       end
 
-      it 'should detect 4 problems' do
+      it 'detects 4 problems' do
         expect(problems).to have(4).problems
       end
 
-      it 'should create warnings' do
+      it 'creates warnings' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(12)
         expect(problems).to contain_warning(msg).on_line(2).in_column(12)
         expect(problems).to contain_warning(msg).on_line(3).in_column(12)
@@ -61,7 +61,7 @@ describe 'version_comparison' 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
@@ -77,11 +77,11 @@ describe 'version_comparison' do
         EOS
       end
 
-      it 'should detect 5 problems' do
+      it 'detects 5 problems' do
         expect(problems).to have(5).problems
       end
 
-      it 'should create warnings' do
+      it 'creates warnings' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(12)
         expect(problems).to contain_fixed(msg).on_line(2).in_column(12)
         expect(problems).to contain_fixed(msg).on_line(3).in_column(12)
@@ -89,9 +89,9 @@ describe 'version_comparison' do
         expect(problems).to contain_fixed(msg).on_line(5).in_column(12)
       end
 
-      it 'should should use versioncmp' do
+      it 'shoulds use versioncmp' do
         expect(manifest).to eq(
-        <<-EOS
+          <<-EOS,
         if versioncmp($::lsbmajdistrelease, '4') >= 0 { }
         if versioncmp($version, '1') <= 0 { }
         if versioncmp($some_version, '3') < 0 { }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-version_comparison-check
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.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: '1.0'
+        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: '1.0'
+        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 for versions compared as numbers.\n"
 email: voxpupuli@groups.io
 executables: []
@@ -124,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -135,6 +65,4 @@ rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: A puppet-lint plugin to check for versions compared as numbers.
-test_files:
-- spec/puppet-lint/plugins/check_version_comparison/version_comparison_spec.rb
-- spec/spec_helper.rb
+test_files: []