puppet-lint-class_parameter-check 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c9f69e6438b1c1454bfb8f826922cfdd0e39d8
-  data.tar.gz: 2e7620b8cdb14bd0e57935b066ed0a5e2968df9b
+  metadata.gz: 6e75015f13ea813a8d308575f028536653bc84cf
+  data.tar.gz: 95ed706edf7e95efb9b03e7028ebc8990aee9376
 SHA512:
-  metadata.gz: 55e32ac4ac2a6e730571f862776c92d41f8a3c1c6b336e40557f9af83e0547349a65b3a19ab5eacc9604620c1183ef41a0f5d942c28d14192279611fd215df15
-  data.tar.gz: 9fc4aa5d2094ae859aa9d811a783862ff7e7938266f9f1e695612da7ab952eaf2e2809e1ff89805897349a64562eeb7dc312f202c0411d568a2d2db2bb0a8367
+  metadata.gz: 3143d719a396c96967fe5a010114c5d344cb2ba65c4ccc2b4a877a3d43c99819e17e5cdcefa9999bd9b16992ba4cc15534b1d7553b83f5b94931cfb3a5f2d5d1
+  data.tar.gz: d3659ced8a9ddcc5621e11c134bd61a1eb14fcfd85b9e093cfa501883939232e043b8480a27da91bc7970ccda378c25165d6b30607a8d036c63cde0cbff32c0d

data/lib/model/class_parameter.rb

@@ -1,12 +1,10 @@
 class ClassParameter
-  attr_reader :tokens
-
   def initialize
     @tokens = []
   end
 
   def is_optional?
-    tokens.any? { |token| token.type == :EQUALS }
+    @tokens.any? { |token| token.type == :EQUALS }
   end
 
   def is_required?
@@ -14,21 +12,29 @@ class ClassParameter
   end
 
   def name
-    tokens.select do |token|
+    @tokens.select do |token|
       token.type == :VARIABLE
     end.first.value
   end
 
   def add(token)
-    tokens << token
+    # A parameter never starts with a newline token
+    unless @tokens.empty? && token.type == :NEWLINE
+      @tokens << token
+    end
+  end
+
+  def tokens
+    sanitized_tokens = strip_starting_newlines(@tokens)
+    return strip_ending_newlines(sanitized_tokens)
   end
 
   def line
-    tokens.first.line
+    @tokens.first.line
   end
 
   def column
-    tokens.first.column
+    @tokens.first.column
   end
 
   def <=>(other)
@@ -40,4 +46,18 @@ class ClassParameter
       return -1
     end
   end
+
+  private
+  def strip_starting_newlines(tokens)
+    tokens.inject([]) do |memo, token|
+      unless memo.empty? && token.type == :NEWLINE
+        memo << token
+      end
+      memo
+    end
+  end
+
+  def strip_ending_newlines(tokens)
+    strip_starting_newlines(tokens.reverse).reverse
+  end
 end

data/lib/model/class_parameter_list.rb

@@ -48,9 +48,9 @@ class ClassParameterList
     stack = []
 
     @tokens.inject([]) do |memo, token|
-      if token.type == :LBRACK || token.type == :LPAREN
+      if [:LBRACK, :LPAREN].include?(token.type)
         stack.push(true)
-      elsif token.type == :RBRACK || token.type == :RPAREN
+      elsif [:RBRACK, :RPAREN].include?(token.type)
         stack.pop
       end
 
@@ -59,12 +59,9 @@ class ClassParameterList
           parameter.add(token)
         end
 
-        # 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))
         memo << parameter
         parameter = ClassParameter.new
-      elsif token.type != :NEWLINE
+      else
         parameter.add(token)
       end
       memo

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

@@ -16,8 +16,15 @@ PuppetLint.new_check(:class_parameter) do
     class_parameter_lists.each do |class_parameter_list|
       resorted_tokens += tokens[token_index..class_parameter_list.start_index]
 
-      class_parameter_list.sort.each do |parameter|
+      sorted_class_parameter_list = class_parameter_list.sort
+      sorted_class_parameter_list.each do |parameter|
         resorted_tokens += parameter.tokens
+
+        unless parameter == sorted_class_parameter_list.last
+          resorted_tokens << PuppetLint::Lexer::Token.new(:COMMA, ",", 0,0)
+        end
+
+        resorted_tokens << PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0,0)
       end
 
       token_index = class_parameter_list.end_index

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

@@ -191,7 +191,7 @@ describe 'class_parameter' do
       let(:code) { <<-EOF
           class puppet_module(
             String $alphabetical,
-            String $non_alphabetical,
+            String $non_alphabetical
           ) { }
           EOF
       }
@@ -218,12 +218,12 @@ describe 'class_parameter' do
         expect(manifest).to eq(<<-EOF
           class puppet_module(
             String $alphabetical,
-            String $non_alphabetical,
+            String $non_alphabetical
           ) { }
 
           class puppet_module2(
             String $alphabetical,
-            String $non_alphabetical,
+            String $non_alphabetical
           ) { }
           EOF
         )
@@ -247,7 +247,7 @@ describe 'class_parameter' do
             String $alphabetical,
             String $non_alphabetical,
             String $alphabetical_optional = "default",
-            String $non_alphabetical_optional = $puppet_module::params::non_alphabetical_optional,
+            String $non_alphabetical_optional = $puppet_module::params::non_alphabetical_optional
           ) inherits puppet_module::params { }
           EOF
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-class_parameter-check
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Roelof Reitsma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint