puppet-lint-class_parameter-check 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c5361e935c4344c4564501bec96dcadf862bc2e
-  data.tar.gz: 204b0beec1bee3ce66024ebe875c5dd667bf2d49
+  metadata.gz: 8d4ff8ab903779758a54fac337183a597a64ecf2
+  data.tar.gz: 13672cb4c1c29d1f461b8c573bff36b172bcbd3c
 SHA512:
-  metadata.gz: 4cbced68e79a4d40abd5c346f94026cccae7587a422313e1cb53496502d3eba3626b21a57e3dd81c1cf4886353ee39171a4f0d992173f326e1bd3b958726ca22
-  data.tar.gz: e5f3c4cfeac458dd3a10003ff6656c6abd2564952af1d3c8a30b8255a32ae09738540f264541dd80ea6ba535a13f54f4652f314c48dd0ec36395cddd71e8ebeb
+  metadata.gz: fe4e9065152745426c4f8ad70c9c8b0606ed9612313e862e9294eea4a7b7a89ce6ee402d58e23c7829e205d5c22653652be3ad2d54c0475ebb3e572f134aa171
+  data.tar.gz: 52fa35443e2dee2370ec19c32f7121543df9923abc4904cfa321548b468faf4d51e1d427bb021aa942d33f0d28d168bc9c7721c0426ca277e81038ae95a2d15e

data/lib/model/class_parameter_list.rb

@@ -45,9 +45,16 @@ class ClassParameterList
   private
   def parameters
     parameter = ClassParameter.new
+    stack = []
 
     @tokens.inject([]) do |memo, token|
-      if (token.type == :COMMA || token == @tokens.last) && parameter.tokens.any?
+      if token.type == :LBRACK
+        stack.push(true)
+      elsif token.type == :RBRACK
+        stack.pop
+      end
+
+      if (token.type == :COMMA || token == @tokens.last) && stack.empty? && parameter.tokens.any?
         # always add a comma and a newline token at the end of each parameter
         parameter.add(PuppetLint::Lexer::Token.new(:COMMA, ",", 0,0))
         parameter.add(PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0,0))

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

@@ -26,31 +26,20 @@ describe 'class_parameter' do
         it 'has no problems' do
           expect(problems).to have(0).problems
         end
-      end
-
-      context 'class with only optional parameters' do
-        let(:code) { <<-EOF
-          class puppet_module(
-            String $alphabetical = default
-          ) { }
-          EOF
-        }
-
-        it 'has no problems' do
-          expect(problems).to have(0).problems
-        end
 
-        context 'optional parameter from inherited class' do
+        context 'with hash parameters' do
           let(:code) { <<-EOF
             class puppet_module(
-              String $alphabetical = $puppet_module::params::alphabetical
-            ) inherits puppet_module::params { }
+              Hash [String, String] $alphabetical,
+              String $non_alphabetical
+            ) { }
             EOF
           }
 
           it 'has no problems' do
             expect(problems).to have(0).problems
           end
+
         end
       end
 
@@ -69,6 +58,32 @@ describe 'class_parameter' do
       end
     end
 
+    context 'class with only optional parameters' do
+      let(:code) { <<-EOF
+        class puppet_module(
+          String $alphabetical = default
+        ) { }
+        EOF
+      }
+
+      it 'has no problems' do
+        expect(problems).to have(0).problems
+      end
+
+      context 'optional parameter from inherited class' do
+        let(:code) { <<-EOF
+          class puppet_module(
+            String $alphabetical = $puppet_module::params::alphabetical
+          ) inherits puppet_module::params { }
+          EOF
+        }
+
+        it 'has no problems' do
+          expect(problems).to have(0).problems
+        end
+      end
+    end
+
     context 'class with required and optional parameters' do
       context 'sorted alphabetically per group' do
         let(:code) { <<-EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-class_parameter-check
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Roelof Reitsma