puppet-lint-trailing_comma-check 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86adcccda246662d25e00fa8d9daa1527e6203493c1ee0cbd2bda4e2c4b769cc
-  data.tar.gz: 26976dd1f21925da59d0a0ddc11339ab7a9a1044ae740267b237d601d1547637
+  metadata.gz: e41a473856855e19fc39972572b59cac85c269c727bd8039f336d99f6a33e26f
+  data.tar.gz: f52de49ea2fcc778284152f288c30f2496eea22a1b8b795950a6e462d738fbf7
 SHA512:
-  metadata.gz: 294d7eb8f6f53ea7c349b961ad0a6216aae23c95294b15c7b4089d42507e0743eb3685732c66cdbdfdeb119ff48a5caf95080c14ecee91485f89f2500bca42a7
-  data.tar.gz: 6b239638d055253653177221acf1a5c9d0b8e6611bd0825c611017236c64761995c0d79f96d93e3db5e3791f9f072486e57d83fd0f1b274e0d6cd4ffc25e3563
+  metadata.gz: 5e8e7368247209d0c36040c0fb95c74cbe6a9779397b75dc3800ef95c7de9532ff7bfa42543f6e3f3b44d573600e4ff2a40ff44ba04f5eee3be30fb69d43adcc
+  data.tar.gz: 46cffcde63d6f3d46230c0fad39764eb062fe09d125636c94a0ef3be911cf83bc465125459ee0f64d7a2996d6a9e18c5fb581a7864aa3115b188ecc1a56c7365

data/README.md

@@ -2,11 +2,11 @@ puppet-lint-trailing_comma-check
 =================================
 
 [![License](https://img.shields.io/github/license/voxpupuli/puppet-lint-trailing_comma-check.svg)](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/blob/master/LICENSE)
-[![Build Status](https://img.shields.io/travis/voxpupuli/puppet-lint-trailing_comma-check.svg)](https://travis-ci.org/voxpupuli/puppet-lint-trailing_comma-check)
-[![Gem Version](https://img.shields.io/gem/v/puppet-lint-trailing_comma-check.svg)](https://rubygems.org/gems/puppet-lint-trailing_comma-check)
-[![Gem Downloads](https://img.shields.io/gem/dt/puppet-lint-trailing_comma-check.svg)](https://rubygems.org/gems/puppet-lint-trailing_comma-check)
+[![Test](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/actions/workflows/test.yml)
+[![Release](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/puppet-lint-trailing_comma-check.svg)](https://rubygems.org/gems/puppet-lint-trailing_comma-check)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/puppet-lint-trailing_comma-check.svg)](https://rubygems.org/gems/puppet-lint-trailing_comma-check)
 [![Coverage Status](https://coveralls.io/repos/github/voxpupuli/puppet-lint-trailing_comma-check/badge.svg?branch=master)](https://coveralls.io/github/voxpupuli/puppet-lint-trailing_comma-check?branch=master)
-[![Dependency Status](https://gemnasium.com/badges/github.com/voxpupuli/puppet-lint-trailing_comma-check.svg)](https://gemnasium.com/github.com/voxpupuli/puppet-lint-trailing_comma-check)
 [![Donated by Camptocamp](https://img.shields.io/badge/donated%20by-camptocamp-fb7047.svg)](#transfer-notice)
 
 A puppet-lint plugin to check for missing trailing commas.
@@ -70,3 +70,17 @@ The maintainer preferred that Puppet Community take ownership of the module for
 Existing pull requests and issues were transferred over, please fork and continue to contribute here instead of Camptocamp.
 
 Previously: https://github.com/camptocamp/puppet-lint-trailing_comma-check
+
+## License
+
+This gem is licensed under the Apache-2 license.
+
+## Release information
+
+To make a new release, please do:
+* update the version in the gemspec file
+* Install gems with `bundle install --with release --path .vendor`
+* generate the changelog with `bundle exec rake changelog`
+* Check if the new version matches the closed issues/PRs in the changelog
+* Create a PR with it
+* After it got merged, push a tag. GitHub actions will do the actual release to rubygems and GitHub Packages

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

@@ -13,6 +13,11 @@ PuppetLint.new_check(:trailing_comma) do
           # Ignore resource references
           next if token.prev_code_token && \
             token.prev_code_token.type == :CLASSREF
+
+          # Ignore data types
+          next if token.prev_code_token && \
+            token.prev_code_token.type == :TYPE
+
           arrays << {
             :start  => token_idx,
             :end    => real_idx,
@@ -62,7 +67,7 @@ PuppetLint.new_check(:trailing_comma) do
           # Ensure that we aren't matching a function return type:
           token.prev_code_token.type != :RSHIFT && \
           # Or a conditional matching a type:
-          token.prev_code_token.type != :MATCH
+          ! [:MATCH, :NOMATCH].include?(token.prev_code_token.type)
           real_idx = 0
 
           tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|

data/spec/puppet-lint/plugins/check_trailing_comma/check_trailing_comma_spec.rb

@@ -10,6 +10,11 @@ describe 'trailing_comma' do
         class { '::apache':
           timeout => '100',
           docroot => '/var/www',
+          Enum[
+            'a',
+            'b',
+            'c'
+          ] $test = 'c',
         }
 
         class{ '::nginx': }
@@ -66,6 +71,16 @@ describe 'trailing_comma' do
         if $var =~ Sensitive {
           $foo = $var.unwrap
         }
+
+        if $var !~ Mymodule::MyType {
+          fail("encountered error ${err}")
+        }
+
+        $test = [
+          'a',
+          'b',
+          'c',
+        ],
         EOS
       }
 
@@ -79,7 +94,12 @@ describe 'trailing_comma' do
         <<-EOS
         class { '::apache':
           timeout => '100',
-          docroot => '/var/www'
+          docroot => '/var/www',
+          Enum[
+            'a',
+            'b',
+            'c'
+          ] $test = 'c'
         }
 
         class{ '::nginx': }
@@ -125,20 +145,27 @@ describe 'trailing_comma' do
             '/etc/baz.conf', '/etc/baz.conf.d'
              ],
         }
+
+        $test = [
+          'a',
+          'b',
+          'c'
+        ]
         EOS
       }
 
-      it 'should detect 6 problems' do
-        expect(problems).to have(6).problems
+      it 'should detect 7 problems' do
+        expect(problems).to have(7).problems
       end
 
       it 'should create warnings' do
-        expect(problems).to contain_warning(msg).on_line(3).in_column(32)
-        expect(problems).to contain_warning(msg).on_line(10).in_column(27)
-        expect(problems).to contain_warning(msg).on_line(24).in_column(18)
-        expect(problems).to contain_warning(msg).on_line(33).in_column(23)
-        expect(problems).to contain_warning(msg).on_line(39).in_column(26)
-        expect(problems).to contain_warning(msg).on_line(41).in_column(25)
+        expect(problems).to contain_warning(msg).on_line(8).in_column(24)
+        expect(problems).to contain_warning(msg).on_line(15).in_column(27)
+        expect(problems).to contain_warning(msg).on_line(29).in_column(18)
+        expect(problems).to contain_warning(msg).on_line(38).in_column(23)
+        expect(problems).to contain_warning(msg).on_line(44).in_column(26)
+        expect(problems).to contain_warning(msg).on_line(46).in_column(25)
+        expect(problems).to contain_warning(msg).on_line(58).in_column(14)
       end
     end
 
@@ -219,6 +246,11 @@ describe 'trailing_comma' do
         class { '::apache':
           timeout => '100',
           docroot => '/var/www',
+          Enum[
+            'a',
+            'b',
+            'c'
+          ] $test = 'c',
         }
 
         class{ '::nginx': }
@@ -264,6 +296,12 @@ describe 'trailing_comma' do
             '/etc/baz.conf', '/etc/baz.conf.d'
              ],
         }
+
+        $test = [
+          'a',
+          'b',
+          'c',
+        ],
         EOS
       }
 
@@ -281,7 +319,12 @@ describe 'trailing_comma' do
         <<-EOS
         class { '::apache':
           timeout => '100',
-          docroot => '/var/www'
+          docroot => '/var/www',
+          Enum[
+            'a',
+            'b',
+            'c'
+          ] $test = 'c'
         }
 
         class{ '::nginx': }
@@ -327,20 +370,27 @@ describe 'trailing_comma' do
             '/etc/baz.conf', '/etc/baz.conf.d'
              ],
         }
+
+        $test = [
+          'a',
+          'b',
+          'c'
+        ]
         EOS
       }
 
-      it 'should detect 6 problems' do
-        expect(problems).to have(6).problems
+      it 'should detect 7 problems' do
+        expect(problems).to have(7).problems
       end
 
       it 'should create a warning' do
-        expect(problems).to contain_fixed(msg).on_line(3).in_column(32)
-        expect(problems).to contain_fixed(msg).on_line(10).in_column(27)
-        expect(problems).to contain_fixed(msg).on_line(24).in_column(18)
-        expect(problems).to contain_fixed(msg).on_line(33).in_column(23)
-        expect(problems).to contain_fixed(msg).on_line(39).in_column(26)
-        expect(problems).to contain_fixed(msg).on_line(41).in_column(25)
+        expect(problems).to contain_fixed(msg).on_line(8).in_column(24)
+        expect(problems).to contain_fixed(msg).on_line(15).in_column(27)
+        expect(problems).to contain_fixed(msg).on_line(29).in_column(18)
+        expect(problems).to contain_fixed(msg).on_line(38).in_column(23)
+        expect(problems).to contain_fixed(msg).on_line(44).in_column(26)
+        expect(problems).to contain_fixed(msg).on_line(46).in_column(25)
+        expect(problems).to contain_fixed(msg).on_line(58).in_column(14)
       end
 
       it 'should add trailing commas' do
@@ -349,6 +399,11 @@ describe 'trailing_comma' do
         class { '::apache':
           timeout => '100',
           docroot => '/var/www',
+          Enum[
+            'a',
+            'b',
+            'c'
+          ] $test = 'c',
         }
 
         class{ '::nginx': }
@@ -394,7 +449,13 @@ describe 'trailing_comma' do
             '/etc/baz.conf', '/etc/baz.conf.d'
              ],
         }
-          EOS
+
+        $test = [
+          'a',
+          'b',
+          'c',
+        ]
+        EOS
         )
       end
     end

data/spec/spec_helper.rb

@@ -1,5 +1,28 @@
-require 'coveralls'
-Coveralls.wear!
+# frozen_string_literal: true
+
+begin
+  require 'simplecov'
+  require 'simplecov-console'
+  require 'codecov'
+rescue LoadError
+else
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+
+    add_filter '/spec'
+
+    enable_coverage :branch
+
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+  end
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::Console,
+    SimpleCov::Formatter::Codecov,
+  ]
+end
 
 require 'puppet-lint'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-trailing_comma-check
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
-- Puppet Community
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -73,21 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
-  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: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,9 +100,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      A puppet-lint plugin to check for missing trailing commas.
-email: raphael.pinson@camptocamp.com
+description: "    A puppet-lint plugin to check for missing trailing commas.\n"
+email: voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -145,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: A puppet-lint plugin to check for missing trailing commas.