puppet-lint 0.1.11 → 0.1.12

data/lib/puppet-lint.rb

@@ -74,7 +74,7 @@ end
 class PuppetLint::NoCodeError < StandardError; end
 
 class PuppetLint
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 
   attr_reader :code, :file
 
@@ -155,7 +155,7 @@ class PuppetLint
     end
 
     PuppetLint::CheckPlugin.repository.each do |plugin|
-      report plugin.new.run(@fileinfo[:path], @data)
+      report plugin.new.run(@fileinfo, @data)
     end
   end
 end

data/lib/puppet-lint/plugin.rb

@@ -53,14 +53,13 @@ class PuppetLint::CheckPlugin
     message_hash
   end
 
-  def run(path, data)
+  def run(fileinfo, data)
     lexer = Puppet::Parser::Lexer.new
     lexer.string = data
     @tokens = lexer.fullscan
-    @path = path
+    @fileinfo = fileinfo
     @data = data
 
-    test(path, data) if self.respond_to? :test
     self.public_methods.select { |method|
       method.to_s.start_with? 'lint_check_'
     }.each { |method|
@@ -103,8 +102,10 @@ class PuppetLint::CheckPlugin
           elsif @tokens[idx].first == :RBRACE
             lbrace_count -= 1
             if lbrace_count == 0
-              class_indexes << {:start => token_idx, :end => idx} if @tokens[token_idx].first == :CLASS
-              defined_type_indexes << {:start => token_idx, :end => idx} if @tokens[token_idx].first == :DEFINE
+              if @tokens[token_idx].first == :CLASS and @tokens[token_idx + 1].first != :LBRACE
+                @class_indexes << {:start => token_idx, :end => idx}
+              end
+              @defined_type_indexes << {:start => token_idx, :end => idx} if @tokens[token_idx].first == :DEFINE
               break
             end
           end
@@ -118,7 +119,11 @@ class PuppetLint::CheckPlugin
   end
 
   def path
-    @path
+    @fileinfo[:path]
+  end
+
+  def fullpath
+    @fileinfo[:fullpath]
   end
 
   def data

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

@@ -6,7 +6,7 @@ class PuppetLint::Plugins::CheckClasses < PuppetLint::CheckPlugin
   end
 
   check 'autoloader_layout' do
-    unless path == ""
+    unless fullpath == ""
       (class_indexes + defined_type_indexes).each do |class_idx|
         title_token = tokens[class_idx[:start]+1]
         split_title = title_token.last[:value].split('::')
@@ -16,7 +16,7 @@ class PuppetLint::Plugins::CheckClasses < PuppetLint::CheckPlugin
           expected_path = "#{title_token.last[:value]}/manifests/init.pp"
         end
 
-        unless path.end_with? expected_path
+        unless fullpath.end_with? expected_path
           notify :error, :message =>  "#{title_token.last[:value]} not in autoload module layout", :linenumber => title_token.last[:line]
         end
       end

data/puppet-lint.gemspec

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

data/spec/puppet-lint/check_classes_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckClasses do
   subject do
     klass = described_class.new
-    klass.run(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
     klass
   end
 
@@ -228,31 +228,45 @@ describe PuppetLint::Plugins::CheckClasses do
 
   describe 'foo::bar in foo/manifests/bar.pp' do
     let(:code) { "class foo::bar { }" }
-    let(:path) { '/etc/puppet/modules/foo/manifests/bar.pp' }
+    let(:fullpath) { '/etc/puppet/modules/foo/manifests/bar.pp' }
 
     its(:problems) { should be_empty }
   end
 
   describe 'foo::bar::baz in foo/manifests/bar/baz.pp' do
     let(:code) { 'define foo::bar::baz() { }' }
-    let(:path) { '/etc/puppet/modules/foo/manifests/bar/baz.pp' }
+    let(:fullpath) { '/etc/puppet/modules/foo/manifests/bar/baz.pp' }
 
     its(:problems) { should be_empty }
   end
 
   describe 'foo in foo/manifests/init.pp' do
     let(:code) { 'class foo { }' }
-    let(:path) { '/etc/puppet/modules/foo/manifests/init.pp' }
+    let(:fullpath) { '/etc/puppet/modules/foo/manifests/init.pp' }
 
     its(:problems) { should be_empty }
   end
 
   describe 'foo::bar in foo/manifests/init.pp' do
     let(:code) { 'class foo::bar { }' }
-    let(:path) { '/etc/puppet/modules/foo/manifests/init.pp' }
+    let(:fullpath) { '/etc/puppet/modules/foo/manifests/init.pp' }
 
     its(:problems) {
       should only_have_problem :kind => :error, :message => "foo::bar not in autoload module layout", :linenumber => 1
     }
   end
+
+  describe 'foo included in bar/manifests/init.pp' do
+    let(:code) { "
+      class bar {
+        class {'foo':
+          someparam => 'somevalue',
+        }
+      }
+      "
+    }
+    let(:fullpath) { '/etc/puppet/modules/bar/manifests/init.pp' }
+    its(:problems) { should be_empty }
+
+  end
 end

data/spec/puppet-lint/check_conditionals_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckConditionals do
   subject do
     klass = described_class.new
-    klass.run(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
     klass
   end
 

data/spec/puppet-lint/check_resources_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckResources do
   subject do
     klass = described_class.new
-    klass.run(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
     klass
   end
 

data/spec/puppet-lint/check_strings_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckStrings do
   subject do
     klass = described_class.new
-    klass.run(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
     klass
   end
 

data/spec/puppet-lint/check_variables_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckVariables do
   subject do
     klass = described_class.new
-    klass.run(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
     klass
   end
 

data/spec/puppet-lint/check_whitespace_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckWhitespace do
   subject do
     klass = described_class.new
-    klass.run(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
     klass
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-lint
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 Z
+date: 2012-01-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec