puppet-lint 0.1.5 → 0.1.6

data/lib/puppet-lint.rb

@@ -1,11 +1,19 @@
+# We're doing this instead of a gem dependency so folks using Puppet
+# from their distro packages don't have to install the gem.
+begin
+  require 'puppet'
+rescue LoadError
+  puts 'Unable to require puppet.  Please gem install puppet and try again.'
+  exit 1
+end
+
 require 'puppet-lint/plugin'
 require 'puppet-lint/plugins'
-require 'puppet'
 
 class PuppetLint::NoCodeError < StandardError; end
 
 class PuppetLint
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 
   attr_reader :code, :file
 

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

@@ -65,11 +65,19 @@ class PuppetLint::Plugins::CheckClasses < PuppetLint::CheckPlugin
 
     class_indexes.each do |class_idx|
       class_tokens = tokens[class_idx[:start]..class_idx[:end]]
-      class_tokens[1..-1].select { |r| r.first == :CLASS }.each do |token|
-        warn "class defined inside a class on line #{token.last[:line]}"
-      end
-      class_tokens[1..-1].select { |r| r.first == :DEFINE }.each do |token|
-        warn "define defined inside a class on line #{token.last[:line]}"
+      class_tokens[1..-1].each_index do |token_idx|
+        token = class_tokens[1..-1][token_idx]
+        next_token = class_tokens[1..-1][token_idx + 1]
+
+        if token.first == :CLASS
+          if next_token.first != :LBRACE
+            warn "class defined inside a class on line #{token.last[:line]}"
+          end
+        end
+
+        if token.first == :DEFINE
+          warn "define defined inside a class on line #{token.last[:line]}"
+        end
       end
     end
 

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

@@ -1,5 +1,3 @@
-require 'puppet'
-
 class PuppetLint::Plugins::CheckStrings < PuppetLint::CheckPlugin
   class ::Puppet::Parser::Lexer
     class TokenList

data/puppet-lint.gemspec

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

data/spec/puppet-lint/check_classes_spec.rb

@@ -171,4 +171,30 @@ describe PuppetLint::Plugins::CheckClasses do
     its(:warnings) { should be_empty }
     its(:errors) { should be_empty }
   end
+
+  describe 'instantiating a parametised class inside a class' do
+    let(:code) { "
+      class bar {
+        class { 'foo':
+          bar => 'foobar'
+        }
+      }"
+    }
+
+    its(:warnings) { should be_empty }
+    its(:errors) { should be_empty }
+  end
+
+  describe 'instantiating a parametised class inside a define' do
+    let(:code) { "
+      define bar() {
+        class { 'foo':
+          bar => 'foobar'
+        }
+      }"
+    }
+
+    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: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec