puppet-lint 0.0.3 → 0.0.4

data/bin/puppet-lint

@@ -41,7 +41,13 @@ if ARGV[0].nil?
   exit
 end
 
-l = PuppetLint.new
-l.file = ARGV[0]
-l.run
+begin
+  l = PuppetLint.new
+  l.file = ARGV[0]
+  l.run
+rescue PuppetLint::NoCodeError
+  puts "puppet-lint: no file specified or specified file does not exist"
+  puts "puppet-lint: try 'puppet-lint --help' for more information"
+  exit
+end
 

data/lib/puppet-lint.rb

@@ -1,8 +1,11 @@
 require 'puppet-lint/plugin'
 require 'puppet-lint/plugins'
+require 'puppet'
+
+class PuppetLint::NoCodeError < StandardError; end
 
 class PuppetLint
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   attr_reader :code, :file
 
@@ -41,6 +44,10 @@ class PuppetLint
   end
 
   def run
+    if @data.nil?
+      raise PuppetLint::NoCodeError
+    end
+
     PuppetLint::CheckPlugin.repository.each do |plugin|
       problems = plugin.new.run(@data)
       problems[:errors].each { |error| report :errors, error }
@@ -48,3 +55,4 @@ class PuppetLint
     end
   end
 end
+

data/lib/puppet-lint/plugin.rb

@@ -18,6 +18,7 @@ end
 
 class PuppetLint::CheckPlugin
   include PuppetLint::Plugin
+  attr_reader :warnings, :errors
 
   def initialize
     @warnings = []

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

@@ -3,50 +3,58 @@
 
 class PuppetLint::Plugins::CheckResources < PuppetLint::CheckPlugin
   def test(data)
-    line_no = 0
-    in_resource = true
-    first_attribute = false
-    data.split("\n").each do |line|
-      line_no += 1
+    lexer = Puppet::Parser::Lexer.new
+    lexer.string = data
+    tokens = lexer.fullscan
 
-      if line.include? "{"
-        in_resource = true
-        first_attribute = true
-        line = line.slice(line.index('{')..-1)
+    title_tokens = []
+    resource_indexes = []
+    tokens.each_index do |token_idx|
+      if tokens[token_idx].first == :COLON
+        # gather a list of tokens that are resource titles
+        if tokens[token_idx-1].first == :RBRACK
+          title_array_tokens = tokens[tokens.rindex { |r| r.first == :LBRACK }+1..token_idx-2]
+          title_tokens += title_array_tokens.select { |token| [:STRING, :NAME].include? token.first }
+        else
+          title_tokens << tokens[token_idx-1]
+        end
+
+        # gather a list of start and end indexes for resource attribute blocks
+        resource_indexes << {:start => token_idx+1, :end => tokens[token_idx+1..-1].index { |r| [:SEMIC, :RBRACE].include? r.first }+token_idx}
       end
+    end
 
-      if in_resource
-        # Resource titles SHOULD be quoted
-        line.scan(/[^'"]\s*:/) do |match|
-          unless line =~ /\$[\w:]+\s*:/
-            warn "unquoted resource title on line #{line_no}"
-          end
+    title_tokens.each do |token|
+      if token.first == :NAME
+        warn "unquoted resource title on line #{token.last[:line]}"
+      end
+    end
+
+    resource_indexes.each do |resource|
+      resource_tokens = tokens[resource[:start]..resource[:end]]
+      ensure_attr_index = resource_tokens.index { |token| token.first == :NAME and token.last[:value] == 'ensure' }
+      unless ensure_attr_index.nil?
+        if ensure_attr_index > 1
+          ensure_attr_line_no = resource_tokens[ensure_attr_index].last[:line]
+          warn "ensure found on line #{ensure_attr_line_no} but it's not the first attribute"
         end
+      end
 
-        line.scan(/(\w+)\s*=>\s*([^\n,;]+)/) do |attr, value|
-          # Ensure SHOULD be the first attribute listed
-          if attr == 'ensure'
-            unless first_attribute
-              warn "ensure found on line #{line_no} but it's not the first attribute"
+      resource_type_token = tokens[tokens[0..resource[:start]].rindex { |r| r.first == :LBRACE } - 1]
+      if resource_type_token.last[:value] == "file"
+        resource_tokens.each_index do |resource_token_idx|
+          attr_token = resource_tokens[resource_token_idx]
+          if attr_token.first == :NAME and attr_token.last[:value] == 'mode'
+            value_token = resource_tokens[resource_token_idx + 2]
+            if value_token.first == :NAME
+              warn "unquoted file mode on line #{value_token.last[:line]}"
             end
-          end
-
-          # File modes SHOULD be represented as a 4 digits instead of 3, to
-          # explicitly show that they are octal values.
-          if attr == 'mode'
-            unless value =~ /'\d{4}'/
-              warn "mode should be represented as a 4 digit octal value on line #{line_no}"
+            if value_token.last[:value] !~ /\d{4}/
+              warn "mode should be represented as a 4 digit octal value on line #{value_token.last[:line]}"
             end
           end
-
-          first_attribute = false
         end
       end
-
-      if line.include? "}"
-        in_resource = false
-        first_attribute = false
-      end
     end
   end
 end

data/puppet-lint.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'puppet-lint'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-lint
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec