puppet-lint-duplicate_class_parameters-check 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c957e34dc505b3bc658eb11ae4f7c08eb4e0d63f
-  data.tar.gz: a2a18dbacc630089763fa09b9cfa2bc0e1027019
+  metadata.gz: bd37576ccadd7950e00643ae5bf071511564842d
+  data.tar.gz: c9faed627d84e90dff0bfa4051e3feacf7528a9a
 SHA512:
-  metadata.gz: bbc3321554f570e66889fff30b23768aafce2e92df1f0e1a684be637c97b0315a04c0023853c8149bdb791b85ee355d18f5b5154b6dc0a2ae74c66f76cd5bac8
-  data.tar.gz: 0face3b01d8779c40922b054bc8848be290cedb58d0ae1821f0b3e66ab8ce8bda85f0170fae9644ac33005d6807dace00a9a1fdd66f488df6fc2889fabc12435
+  metadata.gz: c8e4dd1d4aac280c6926d29475e3e6499e4a2b8b18853ffc6fb1595507c04cb86ef59793a9b1b4de8c6699601cdaf85cecc79d87d0d525da81aff92f247819dd
+  data.tar.gz: 2ca2571d1e337510cdecadc4b92b4c40c4b2dcd5a0de6e1f86bbfe33e3412e79504d53b5295ceb843d689d3dc3ee602a7f22d9d2d34c9c9385df9fd923c28ffa

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

@@ -2,6 +2,7 @@ PuppetLint.new_check(:duplicate_class_parameters) do
   def check
     class_indexes.each do |class_idx|
       seen = Hash.new(0)
+      inside = nil
 
       # if there are no params there is nothing to do, return early.
       return if class_idx[:param_tokens].nil?
@@ -10,6 +11,18 @@ PuppetLint.new_check(:duplicate_class_parameters) do
         class_name = class_idx[:name_token].value
 
         if token.type == :VARIABLE
+          next_type = token.next_code_token.type
+
+          # handling for lines with an equals and a variable on the rhs
+          if next_type == :EQUALS
+            inside = true
+          elsif next_type == :COMMA
+            inside = false
+          end
+
+          # only proceed if we're at the end of a declaration.
+          next if !inside
+
           param_name = token.value
           seen[param_name] += 1
 
@@ -21,7 +34,6 @@ PuppetLint.new_check(:duplicate_class_parameters) do
               :column  => token.column,
             }
           end
-
         end
       end
     end

data/spec/puppet-lint/plugins/puppet-lint_duplicate_class_parameters_spec.rb

@@ -39,6 +39,46 @@ describe 'duplicate_class_parameters' do
     end
   end
 
+  context 'class with duplicate right hand side' do
+    let(:code) do
+      <<-EOS
+        class duplicated_rhs(
+          $nagios_innodb_enable = $sys11mysql,
+          $nagios_myisam_enable = $sys11mysql,
+        ) {
+          file { '/tmp/my-file':
+            mode => '0600',
+          }
+        }
+      EOS
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
+
+  context 'class with type and duplicate right hand side' do
+    let(:code) do
+      <<-EOS
+        class duplicated_rhs(
+          Boolean $nagios_innodb_enable = $sys11mysql::params::production_environment,
+          Boolean $nagios_myisam_enable = $sys11mysql::params::production_environment,
+        ) {
+          file { '/tmp/my-file':
+            mode => '0600',
+          }
+        }
+      EOS
+    end
+
+    it 'should not detect any problems' do
+      expect(problems).to have(0).problems
+    end
+  end
+
+  # Examples that should fail specs
+
   context 'class with duplicate parameters' do
     let(:msg) { 'found duplicate parameter \'duplicated\' in class \'file_resource\'' }
     let(:code) do
@@ -74,4 +114,32 @@ describe 'duplicate_class_parameters' do
     end
 
   end
+
+  context 'class with type and duplicate parameters' do
+    let(:msg) { 'found duplicate parameter \'not_unique\' in class \'duplicated_type\'' }
+    let(:code) do
+      <<-EOS
+        class duplicated_type(
+          Boolean $not_unique = true,
+          Boolean $not_unique = false,
+        ) {
+
+          file { '/tmp/my-file':
+            mode => '0600',
+          }
+
+          $baz = 'xxzzy'
+        }
+      EOS
+    end
+
+    it 'should detect two problems' do
+      expect(problems).to have(1).problems
+    end
+
+    it 'should create a warning' do
+      expect(problems).to contain_warning(msg).on_line(3).in_column(19)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-duplicate_class_parameters-check
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Dean Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +78,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 11.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec-json_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
 description: |2
       A puppet-lint extension that ensures class parameter names
       are unique.
@@ -133,11 +161,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: puppet-lint duplicate class parameters check
 test_files:
 - spec/spec_helper.rb
 - spec/puppet-lint/plugins/puppet-lint_duplicate_class_parameters_spec.rb
-has_rdoc: