puppet-lint 0.0.5 → 0.0.6

data/lib/puppet-lint.rb

@@ -5,7 +5,7 @@ require 'puppet'
 class PuppetLint::NoCodeError < StandardError; end
 
 class PuppetLint
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   attr_reader :code, :file
 

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

@@ -4,8 +4,10 @@
 class PuppetLint::Plugins::CheckWhitespace < PuppetLint::CheckPlugin
   def test(data)
     line_no = 0
-    in_block = false
-    prefix_length = 0
+    in_resource = false
+    in_selector = false
+    resource_indent_length = 0
+    selector_indent_length = 0
     data.split("\n").each do |line|
       line_no += 1
 
@@ -16,7 +18,9 @@ class PuppetLint::Plugins::CheckWhitespace < PuppetLint::CheckPlugin
       error "trailing whitespace found on line #{line_no}" if line.end_with? " "
 
       # SHOULD NOT exceed an 80 character line width
-      warn "line #{line_no} has more than 80 characters" if line.length > 80
+      unless line =~ /puppet:\/\//
+        warn "line #{line_no} has more than 80 characters" if line.length > 80
+      end
 
       # MUST use two-space soft tabs
       line.scan(/^ +/) do |prefix|
@@ -27,17 +31,33 @@ class PuppetLint::Plugins::CheckWhitespace < PuppetLint::CheckPlugin
 
       # SHOULD align fat comma arrows (=>) within blocks of attributes
       if line =~ /^( +\w+ +)=>/
-        if in_block
-          unless $1.length == prefix_length
-            warn "=> on line #{line_no} isn't aligned with the previous line"
+        line_indent = $1
+        if in_resource
+          if in_selector
+            unless line_indent.length == selector_indent_length
+              warn "=> on line #{line_no} isn't aligned with the previous line"
+            end
+
+            if line.strip =~ /\}[,;]?$/
+              in_selector = false
+              selector_indent_length = 0
+            end
+          else
+            if line.strip.end_with? "{"
+              in_selector = true
+              selector_indent_length = resource_indent_length + 2
+            end
+            unless line_indent.length == resource_indent_length
+              warn "=> on line #{line_no} isn't aligned with the previous line"
+            end
           end
         else
-          prefix_length = $1.length
-          in_block = true
+          resource_indent_length = line_indent.length
+          in_resource = true
         end
       else
-        in_block = false
-        prefix_length = 0
+        in_resource = false
+        resource_indent_length = 0
       end
     end
   end

data/puppet-lint.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'puppet-lint'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.homepage = 'https://github.com/rodjek/puppet-lint/'
   s.summary = 'Ensure your Puppet manifests conform with the Puppetlabs style guide'
   s.description = 'Checks your Puppet manifests against the Puppetlabs
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     'README.md',
     'spec/puppet-lint/check_resources_spec.rb',
     'spec/puppet-lint/check_strings_spec.rb',
+    'spec/puppet-lint/check_whitespace_spec.rb',
     'spec/spec_helper.rb',
   ]
 

data/spec/puppet-lint/check_strings_spec.rb

@@ -17,7 +17,7 @@ describe PuppetLint::Plugins::CheckStrings do
   describe 'multiple strings in a line' do
     let(:code) { "\"aoeu\" '${foo}'" }
 
-    its(:warnings) { should be_empty }
+    its(:warnings) { should include "double quoted string containing no variables on line 1" }
     its(:errors) { should include "single quoted string containing a variable found on line 1" }
   end
 end

data/spec/puppet-lint/check_whitespace_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe PuppetLint::Plugins::CheckWhitespace do
+  subject do
+    klass = described_class.new
+    klass.test(code)
+    klass
+  end
+
+  describe 'selectors inside a resource' do
+    let(:code) { "
+      file { 'foo':
+        ensure  => $ensure,
+        require => $ensure ? {
+          present => Class['tomcat::install'],
+          absent  => undef,
+        },
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'file resource with a source line > 80c' do
+    let(:code) { "
+      file {
+        source  => 'puppet:///modules/certificates/etc/ssl/private/wildcard.example.com.crt',
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-lint
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -56,6 +56,7 @@ files:
 - README.md
 - spec/puppet-lint/check_resources_spec.rb
 - spec/puppet-lint/check_strings_spec.rb
+- spec/puppet-lint/check_whitespace_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rodjek/puppet-lint/
 licenses: []