puppet-lint 0.1.13 → 0.2.0.pre1

data/spec/puppet-lint/check_classes_spec.rb

@@ -3,25 +3,30 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckClasses do
   subject do
     klass = described_class.new
-    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
+    fileinfo = {}
+    fileinfo[:fullpath] = defined?(fullpath).nil? ? '' : fullpath
+    klass.run(fileinfo, code)
     klass
   end
 
-  if Puppet::PUPPETVERSION !~ /^0\.2/
-    describe 'chain 2 resources left to right' do
-      let(:code) { "Class[foo] -> Class[bar]" }
+  describe 'chain 2 resources left to right' do
+    let(:code) { "Class[foo] -> Class[bar]" }
 
-      its(:problems) { should be_empty }
-    end
+    its(:problems) { should be_empty }
+  end
 
-    describe 'chain 2 resources right to left' do
-      let(:code) { "Class[foo] <- Class[bar]" }
+  describe 'chain 2 resources right to left' do
+    let(:code) { "Class[foo] <- Class[bar]" }
 
-      its(:problems) {
-        should have_problem :kind => :warning, :message => "right-to-left (<-) relationship", :linenumber => 1
-        should_not have_problem :kind => :error
-      }
-    end
+    its(:problems) {
+      should have_problem({
+        :kind       => :warning,
+        :message    => "right-to-left (<-) relationship",
+        :linenumber => 1,
+        :column     => 12,
+      })
+      should_not have_problem :kind => :error
+    }
   end
 
   describe 'class on its own' do
@@ -39,7 +44,12 @@ describe PuppetLint::Plugins::CheckClasses do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "class defined inside a class", :linenumber => 3
+      should have_problem({
+        :kind       => :warning,
+        :message    => "class defined inside a class",
+        :linenumber => 3,
+        :column     => 9,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -53,7 +63,12 @@ describe PuppetLint::Plugins::CheckClasses do
     }
 
   its(:problems) {
-      should have_problem :kind => :warning, :message => "define defined inside a class", :linenumber => 3
+      should have_problem({
+        :kind       => :warning,
+        :message    => "define defined inside a class",
+        :linenumber => 3,
+        :column     => 9,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -68,7 +83,12 @@ describe PuppetLint::Plugins::CheckClasses do
     let(:code) { "class foo::bar inherits baz { }" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "class inherits across namespaces", :linenumber => 1
+      should have_problem({
+        :kind       => :warning,
+        :message    => "class inherits across namespaces",
+        :linenumber => 1,
+        :column     => 25,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -83,7 +103,12 @@ describe PuppetLint::Plugins::CheckClasses do
     let(:code) { "class foo($bar='baz', $gronk) { }" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "optional parameter listed before required parameter", :linenumber => 1
+      should have_problem({
+        :kind       => :warning,
+        :message    => "optional parameter listed before required parameter",
+        :linenumber => 1,
+        :column     => 23,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -98,7 +123,12 @@ describe PuppetLint::Plugins::CheckClasses do
     let(:code) { "define foo($bar='baz', $gronk) { }" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "optional parameter listed before required parameter", :linenumber => 1
+      should have_problem({
+        :kind       => :warning,
+        :message    => "optional parameter listed before required parameter",
+        :linenumber => 1,
+        :column     => 24,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -111,7 +141,12 @@ describe PuppetLint::Plugins::CheckClasses do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "top-scope variable being used without an explicit namespace", :linenumber => 3
+      should have_problem({
+        :kind       => :warning,
+        :message    => "top-scope variable being used without an explicit namespace",
+        :linenumber => 3,
+        :column     => 16,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -155,7 +190,12 @@ describe PuppetLint::Plugins::CheckClasses do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "top-scope variable being used without an explicit namespace", :linenumber => 3
+      should have_problem({
+        :kind       => :warning,
+        :message    => "top-scope variable being used without an explicit namespace",
+        :linenumber => 3,
+        :column     => 16,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -223,7 +263,12 @@ describe PuppetLint::Plugins::CheckClasses do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "optional parameter listed before required parameter", :linenumber => 2
+      should have_problem({
+        :kind       => :warning,
+        :message    => "optional parameter listed before required parameter",
+        :linenumber => 2,
+        :column     => 32,
+      })
       should_not have_problem :kind => :error
     }
   end
@@ -254,7 +299,12 @@ describe PuppetLint::Plugins::CheckClasses do
     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
+      should only_have_problem({
+        :kind       => :error,
+        :message    => "foo::bar not in autoload module layout",
+        :linenumber => 1,
+        :column     => 7,
+      })
     }
   end
 
@@ -269,6 +319,5 @@ describe PuppetLint::Plugins::CheckClasses do
     }
     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,9 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckConditionals do
   subject do
     klass = described_class.new
-    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
+    fileinfo = {}
+    fileinfo[:fullpath] = defined?(fullpath).nil? ? '' : fullpath
+    klass.run(fileinfo, code)
     klass
   end
 
@@ -17,7 +19,14 @@ describe PuppetLint::Plugins::CheckConditionals do
       }"
     }
 
-    its(:problems) { should only_have_problem :kind => :warning, :message => "selector inside resource block", :linenumber => 3 }
+    its(:problems) do
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'selector inside resource block',
+        :linenumber => 3,
+        :column     => 16,
+      })
+    end
   end
 
   describe 'resource with a variable as a attr value' do
@@ -49,6 +58,13 @@ describe PuppetLint::Plugins::CheckConditionals do
       }"
     }
 
-    its(:problems) { should only_have_problem :kind => :warning, :message => "case statement without a default case", :linenumber => 2 }
+    its(:problems) do
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'case statement without a default case',
+        :linenumber => 2,
+        :column     => 7,
+      })
+    end
   end
 end

data/spec/puppet-lint/check_resources_spec.rb

@@ -8,11 +8,10 @@ describe PuppetLint::Plugins::CheckResources do
   end
 
   describe '3 digit file mode' do
-    let(:code) { "file { 'foo': mode => 777 }" }
+    let(:code) { "file { 'foo': mode => '777' }" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "mode should be represented as a 4 digit octal value or symbolic file mode", :linenumber => 1
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "mode should be represented as a 4 digit octal value or symbolic mode", :linenumber => 1
     }
   end
 
@@ -26,8 +25,7 @@ describe PuppetLint::Plugins::CheckResources do
     let(:code) { "file { 'foo': mode => 0777 }" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "unquoted file mode"
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "unquoted file mode"
     }
   end
 
@@ -68,8 +66,7 @@ describe PuppetLint::Plugins::CheckResources do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "ensure found on line but it's not the first attribute", :linenumber => 4
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "ensure found on line but it's not the first attribute", :linenumber => 4
     }
   end
 
@@ -94,8 +91,7 @@ describe PuppetLint::Plugins::CheckResources do
     let(:code) { "file { foo: }" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 1
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 1
     }
   end
 
@@ -115,8 +111,7 @@ describe PuppetLint::Plugins::CheckResources do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 2
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 2
     }
   end
 
@@ -140,8 +135,7 @@ describe PuppetLint::Plugins::CheckResources do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 4
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 4
     }
   end
 
@@ -162,7 +156,7 @@ describe PuppetLint::Plugins::CheckResources do
       }"
     }
 
-    its(:problems) { should be_empty }
+    its(:problems) { should == [] }
   end
 
   describe 'file resource creating a symlink with seperate target attr' do
@@ -184,8 +178,7 @@ describe PuppetLint::Plugins::CheckResources do
     }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => "symlink target specified in ensure attr", :linenumber => 3
-      should_not have_problem :kind => :error
+      should only_have_problem :kind => :warning, :message => "symlink target specified in ensure attr", :linenumber => 3
     }
   end
 end

data/spec/puppet-lint/check_strings_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckStrings do
   subject do
     klass = described_class.new
-    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
+    fileinfo = {}
+    fileinfo[:fullpath] = defined?(fullpath).nil? ? '' : fullpath
+    klass.run(fileinfo, code)
     klass
   end
 
@@ -17,8 +19,18 @@ describe PuppetLint::Plugins::CheckStrings do
     let(:code) { "\"aoeu\" '${foo}'" }
 
     its(:problems) {
-      should have_problem :kind => :warning, :message => 'double quoted string containing no variables', :linenumber => '1'
-      should have_problem :kind => :error, :message => 'single quoted string containing a variable found', :linenumber => '1'
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'double quoted string containing no variables',
+        :linenumber => 1,
+        :column     => 1,
+      })
+      should have_problem({
+        :kind       => :error,
+        :message    => 'single quoted string containing a variable found',
+        :linenumber => 1,
+        :column     => 8,
+      })
     }
   end
 
@@ -26,7 +38,12 @@ describe PuppetLint::Plugins::CheckStrings do
     let(:code) { '"${foo}"' }
 
     its(:problems) {
-      should only_have_problem :kind => :warning, :message => "string containing only a variable", :linenumber => '1'
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'string containing only a variable',
+        :linenumber => 1,
+        :column     => 3,
+      })
     }
   end
 
@@ -34,11 +51,29 @@ describe PuppetLint::Plugins::CheckStrings do
     let(:code) { '" $gronk"' }
 
     its(:problems) {
-      should only_have_problem :kind => :warning, :message => "variable not enclosed in {}", :linenumber => '1'
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'variable not enclosed in {}',
+        :linenumber => 1,
+        :column     => 3,
+      })
     }
+  end
+
+  describe 'variable not enclosed in {} after many tokens' do
+    let(:code) { ("'groovy'\n" * 20) + '" $gronk"' }
 
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'variable not enclosed in {}',
+        :linenumber => 21,
+        :column     => 3,
+      })
+    }
   end
 
+
   describe 'double quoted string nested in a single quoted string' do
     let(:code) { "'grep \"status=sent\" /var/log/mail.log'" }
 
@@ -60,12 +95,64 @@ describe PuppetLint::Plugins::CheckStrings do
   describe 'quoted false' do
     let(:code) { "class { 'foo': boolFlag => 'false' }" }
 
-    its(:problems) { should only_have_problem :kind => :warning, :message => "quoted boolean value found", :linenumber => 1 }
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
   end
 
   describe 'quoted true' do
     let(:code) { "class { 'foo': boolFlag => 'true' }" }
 
-    its(:problems) { should only_have_problem :kind => :warning, :message => "quoted boolean value found", :linenumber => 1 }
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :warning,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
+  end
+
+  describe 'double quoted true' do
+    let(:code) { "class { 'foo': boolFlag => \"true\" }" }
+
+    its(:problems) {
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'double quoted string containing no variables',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
+  end
+
+  describe 'double quoted false' do
+    let(:code) { "class { 'foo': boolFlag => \"false\" }" }
+
+    its(:problems) {
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'double quoted string containing no variables',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
   end
 end

data/spec/puppet-lint/check_variables_spec.rb

@@ -3,21 +3,31 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckVariables do
   subject do
     klass = described_class.new
-    klass.run(defined?(fullpath).nil? ? {:fullpath => ''} : {:fullpath => fullpath}, code)
+    fileinfo = {}
+    fileinfo[:fullpath] = defined?(fullpath).nil? ? '' : fullpath
+    klass.run(fileinfo, code)
     klass
   end
 
-  if Puppet.version.start_with? "2.7"
-    describe 'a variable containing a dash' do
-      let(:code) { "$foo-bar" }
+  describe 'a variable containing a dash' do
+    let(:code) { '$foo-bar' }
 
-      its(:problems) { should have_problem :kind => :warning, :message => "variable contains a dash", :linenumber => 1 }
-    end
+    its(:problems) { should have_problem({
+      :kind       => :warning,
+      :message    => 'variable contains a dash',
+      :linenumber => 1,
+      :column     => 1,
+    }) }
+  end
 
-    describe 'variable containing a dash' do
-      let(:code) { '" $foo-bar"' }
+  describe 'variable containing a dash' do
+    let(:code) { '" $foo-bar"' }
 
-      its(:problems) { should have_problem :kind => :warning, :message => "variable contains a dash", :linenumber => 1 }
-    end
+    its(:problems) { should have_problem({
+      :kind       => :warning,
+      :message    => 'variable contains a dash',
+      :linenumber => 1,
+      :column     => 3,
+    }) }
   end
 end