Merge pull request #2 from liamjbennett/issue_1

Adding support for checking the contain and require functions
voxpupuli · Jun 5, 2016 · e963d91 · e963d91
2 parents 5934614 + 47c47f0
commit e963d91
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 6 deletions.
diff --git a/lib/puppet-lint/plugins/check_absolute_classname.rb b/lib/puppet-lint/plugins/check_absolute_classname.rb
@@ -1,7 +1,7 @@
 PuppetLint.new_check(:relative_classname_inclusion) do
   def check
     tokens.each_with_index do |token, token_idx|
-      if token.type == :NAME && token.value == 'include'
+      if token.type == :NAME && ['include','contain','require'].include?(token.value)
         s = token.next_code_token
         in_function = 0
         while s.type != :NEWLINE

diff --git a/puppet-lint-absolute_classname-check.gemspec b/puppet-lint-absolute_classname-check.gemspec
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-collection_matchers', '~> 1.0'
   spec.add_development_dependency 'mime-types', '~> 1.0' # 2.x dropped Ruby 1.8 support
   spec.add_development_dependency 'coveralls', '~> 0.7' unless RUBY_VERSION =~ /^1\.8/
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 10.5' # 11.x dropped Ruby 1.8 support
 end
diff --git a/spec/puppet-lint/plugins/check_absolute_classname/relative_classname_inclusion_spec.rb b/spec/puppet-lint/plugins/check_absolute_classname/relative_classname_inclusion_spec.rb
@@ -19,6 +19,16 @@ class { '::foobar': }
 
         class foobar {
         }
+
+        contain ::foobar
+        contain('::foobar')
+        contain(foobar(baz))
+        contain(foobar('baz'))
+
+        require ::foobar
+        require('::foobar')
+        require(foobar(baz))
+        require(foobar('baz'))
         EOS
       end
 
@@ -33,17 +43,25 @@ class foobar {
         include foobar
         include(foobar)
         class { 'foobar': }
+        contain foobar
+        contain(foobar)
+        require foobar
+        require(foobar)
         EOS
       end
 
-      it 'should detect 3 problems' do
-        expect(problems).to have(3).problems
+      it 'should detect 7 problems' do
+        expect(problems).to have(7).problems
       end
 
       it 'should create warnings' do
         expect(problems).to contain_warning(msg).on_line(1).in_column(17)
         expect(problems).to contain_warning(msg).on_line(2).in_column(17)
         expect(problems).to contain_warning(msg).on_line(3).in_column(17)
+        expect(problems).to contain_warning(msg).on_line(4).in_column(17)
+        expect(problems).to contain_warning(msg).on_line(5).in_column(17)
+        expect(problems).to contain_warning(msg).on_line(6).in_column(17)
+        expect(problems).to contain_warning(msg).on_line(7).in_column(17)
       end
     end
   end
@@ -72,6 +90,16 @@ class { '::foobar': }
 
         class foobar {
         }
+
+        contain ::foobar
+        contain('::foobar')
+        contain(foobar(baz))
+        contain(foobar('baz'))
+
+        require ::foobar
+        require('::foobar')
+        require(foobar(baz))
+        require(foobar('baz'))
         EOS
       end
 
@@ -86,17 +114,25 @@ class foobar {
         include foobar
         include(foobar)
         class { 'foobar': }
+        contain foobar
+        contain(foobar)
+        require foobar
+        require(foobar)
         EOS
       end
 
-      it 'should detect 3 problems' do
-        expect(problems).to have(3).problems
+      it 'should detect 7 problems' do
+        expect(problems).to have(7).problems
       end
 
       it 'should fix the problems' do
         expect(problems).to contain_fixed(msg).on_line(1).in_column(17)
         expect(problems).to contain_fixed(msg).on_line(2).in_column(17)
         expect(problems).to contain_fixed(msg).on_line(3).in_column(17)
+        expect(problems).to contain_fixed(msg).on_line(4).in_column(17)
+        expect(problems).to contain_fixed(msg).on_line(5).in_column(17)
+        expect(problems).to contain_fixed(msg).on_line(6).in_column(17)
+        expect(problems).to contain_fixed(msg).on_line(7).in_column(17)
       end
 
       it 'should should add colons' do
@@ -105,6 +141,10 @@ class { 'foobar': }
         include ::foobar
         include(::foobar)
         class { '::foobar': }
+        contain ::foobar
+        contain(::foobar)
+        require ::foobar
+        require(::foobar)
         EOS
         )
       end