puppet-lint 0.1.9 → 0.1.10

data/spec/puppet-lint/check_strings_spec.rb

@@ -3,79 +3,69 @@ require 'spec_helper'
 describe PuppetLint::Plugins::CheckStrings do
   subject do
     klass = described_class.new
-    klass.test(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(path).nil? ? '' : path, code)
     klass
   end
 
   describe 'double quoted string containing a variable insinde single quotes' do
     let(:code) { "exec { \"/usr/bin/wget -O - '${source}' | /usr/bin/apt-key add -\": }" }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'multiple strings in a line' do
     let(:code) { "\"aoeu\" '${foo}'" }
 
-    its(:warnings) { should include "double quoted string containing no variables on line 1" }
-    its(:errors) { should include "single quoted string containing a variable found on line 1" }
+    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'
+    }
   end
 
   describe 'string containing only a variable' do
     let(:code) { '"${foo}"' }
 
-    its(:warnings) { should include "string containing only a variable on line 1" }
-    its(:errors) { should be_empty }
+    its(:problems) {
+      should only_have_problem :kind => :warning, :message => "string containing only a variable", :linenumber => '1'
+    }
   end
 
   describe 'variable not enclosed in {}' do
     let(:code) { '" $gronk"' }
 
-    its(:warnings) { should include "variable not enclosed in {} on line 1" }
-    its(:errors) { should be_empty }
-  end
-
-  if Puppet.version.start_with? "2.7"
-    describe 'variable containing a dash' do
-      let(:code) { '" $foo-bar"' }
+    its(:problems) {
+      should only_have_problem :kind => :warning, :message => "variable not enclosed in {}", :linenumber => '1'
+    }
 
-      its(:warnings) { should include "variable contains a dash on line 1" }
-      its(:errors) { should be_empty }
-    end
   end
 
   describe 'double quoted string nested in a single quoted string' do
     let(:code) { "'grep \"status=sent\" /var/log/mail.log'" }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'double quoted string after a comment' do
     let(:code) { "service { 'foo': } # \"bar\"" }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'double quoted string containing newline but no variables' do
     let(:code) { '"foo\n"' }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'quoted false' do
     let(:code) { "class { 'foo': boolFlag => 'false' }" }
 
-    its(:warnings) { should include "quoted boolean value found on line 1" }
-    its(:errors) { should be_empty }
+    its(:problems) { should only_have_problem :kind => :warning, :message => "quoted boolean value found", :linenumber => 1 }
   end
 
   describe 'quoted true' do
     let(:code) { "class { 'foo': boolFlag => 'true' }" }
 
-    its(:warnings) { should include "quoted boolean value found on line 1" }
-    its(:errors) { should be_empty }
+    its(:problems) { should only_have_problem :kind => :warning, :message => "quoted boolean value found", :linenumber => 1 }
   end
 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.test(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(path).nil? ? '' : path, code)
     klass
   end
 
@@ -11,8 +11,13 @@ describe PuppetLint::Plugins::CheckVariables do
     describe 'a variable containing a dash' do
       let(:code) { "$foo-bar" }
 
-      its(:warnings) { should include "Variable contains a dash on line 1" }
-      its(:errors) { should be_empty }
+      its(:problems) { should have_problem :kind => :warning, :message => "variable contains a dash", :linenumber => 1 }
+    end
+
+    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
   end
 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.test(defined?(path).nil? ? '' : path, code)
+    klass.run(defined?(path).nil? ? '' : path, code)
     klass
   end
 
@@ -18,8 +18,7 @@ describe PuppetLint::Plugins::CheckWhitespace do
       }"
     }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'selectors in the middle of a resource' do
@@ -33,8 +32,7 @@ describe PuppetLint::Plugins::CheckWhitespace do
       }"
     }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'file resource with a source line > 80c' do
@@ -44,8 +42,7 @@ describe PuppetLint::Plugins::CheckWhitespace do
       }"
     }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'selector inside a resource' do
@@ -58,8 +55,7 @@ describe PuppetLint::Plugins::CheckWhitespace do
     group  => 'foo4',
     mode   => '0755'," }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'selector inside a hash inside a resource' do
@@ -75,8 +71,7 @@ describe PuppetLint::Plugins::CheckWhitespace do
     group  => 'foo4',
     mode   => '0755'," }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 
   describe 'issue #37' do
@@ -107,7 +102,6 @@ describe PuppetLint::Plugins::CheckWhitespace do
       }"
     }
 
-    its(:warnings) { should be_empty }
-    its(:errors) { should be_empty }
+    its(:problems) { should be_empty }
   end
 end

data/spec/spec_helper.rb

@@ -9,3 +9,101 @@ require 'puppet-lint'
 #PuppetLint::CheckPlugin.any_instance.stub(:error) do |arg|
 #  raise PuppetLint::Error
 #end
+
+#     filter_array_of_hashes(array, filter) -> an_array
+#
+# Filters out hashes by applying filter_hash to each hash
+# in the array. All set value/key pairs in filter_hash must
+# match before a hash is allowed.
+# Returns all hashes that matched in an array.
+#
+#   filter_array_of_hashes(
+#     [
+#       {:filter => 1, :name => 'one'},
+#       {:filter => 2, :name => 'two'},
+#       {:filter => 3, :name => 'three'},
+#     ],
+#     { :filter => 2 }
+#   )
+#   => [{:filter=>2, :name=>"two"}]
+#
+#   filter_array_of_hashes([{:f => 1}, {:f => 2}], {})
+#   => [{:f=>1}, {:f=>2}]
+#
+def filter_array_of_hashes(array_of_hashes, filter_hash)
+  array_of_hashes.select { |hash_to_check|
+    val = true
+    filter_hash.each do |k,v|
+      if ! hash_to_check.key?(k)
+        val = false
+        break
+      elsif hash_to_check[k].to_s != v.to_s
+        val = false
+        break
+      end
+    end
+    val
+  }
+end
+
+RSpec::Matchers.define :have_problem do |filter|
+
+  match do |problems|
+    filter_array_of_hashes(problems, filter).length > 0
+  end
+
+  failure_message_for_should do |problems|
+    message = "could not find any problems matching the filter."
+    message << "
+    * filter = #{filter.inspect}
+    * problems = [
+    "
+    problems.each { |prob| message << "    #{prob.inspect}," }
+    message << "
+      ]"
+    message
+  end
+
+  failure_message_for_should_not do |problems|
+    message = "some problems matched the filter."
+    message << "
+    * filter = #{filter.inspect}
+    * matched = [
+    "
+    filter_array_of_hashes(problems, filter).each { |prob| message << "    #{prob.inspect}," }
+    message << "
+      ]"
+    message
+  end
+
+end
+
+RSpec::Matchers.define :only_have_problem do |filter|
+
+  match do |actual|
+    res = filter_array_of_hashes(actual, filter)
+    res.length == actual.length
+  end
+
+  failure_message_for_should do |problems|
+    left = problems - filter_problems(actual, filter)
+    message = "There were problems not matching filter."
+    message << "
+    * filter = #{filter.inspect}
+    * unmatched = [
+    "
+    left.each { |prob| message << "    #{prob.inspect}," }
+    message << "
+      ]"
+    message
+  end
+
+  failure_message_for_should_not do |problems|
+    message = "There were no problems found besides the ones matched with filter."
+    message << "
+    * filter = #{filter.inspect}
+    "
+    message
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-lint
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-27 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -31,6 +31,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: |-
   Checks your Puppet manifests against the Puppetlabs
     style guide and alerts you to any discrepancies.
@@ -43,6 +57,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/puppet-lint
+- lib/puppet-lint/configuration.rb
 - lib/puppet-lint/plugin.rb
 - lib/puppet-lint/plugins/check_classes.rb
 - lib/puppet-lint/plugins/check_conditionals.rb