puppet-lint 0.4.0.pre1 → 1.0.0

data/spec/puppet-lint/plugins/check_whitespace/hard_tabs_spec.rb

@@ -1,20 +1,23 @@
 require 'spec_helper'
 
 describe 'hard_tabs' do
-  describe 'hard tabs indents' do
-    let(:code) { "\tfoo => bar," }
-
-    its(:problems) {
-      should have_problem({
-        :kind       => :error,
-        :message    => 'tab character found',
-        :linenumber => 1,
-        :column     => 1,
-      })
-    }
+  let(:msg) { 'tab character found' }
+
+  context 'with fix disabled' do
+    context 'hard tabs indents' do
+      let(:code) { "\tfoo => bar," }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create an error' do
+        expect(problems).to contain_error(msg).on_line(1).in_column(1)
+      end
+    end
   end
 
-  describe 'hard tabs indents' do
+  context 'with fix enabled' do
     before do
       PuppetLint.configuration.fix = true
     end
@@ -23,16 +26,20 @@ describe 'hard_tabs' do
       PuppetLint.configuration.fix = false
     end
 
-    let(:code) { "\tfoo => bar," }
-
-    its(:problems) {
-      should have_problem({
-        :kind       => :fixed,
-        :message    => 'tab character found',
-        :linenumber => 1,
-        :column     => 1,
-      })
-    }
-    its(:manifest) { should == "  foo => bar," }
+    context 'hard tabs indents' do
+      let(:code) { "\tfoo => bar," }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(1)
+      end
+
+      it 'should convert the tab characters into spaces' do
+        expect(manifest).to eq("  foo => bar,")
+      end
+    end
   end
 end

data/spec/puppet-lint/plugins/check_whitespace/trailing_whitespace_spec.rb

@@ -1,20 +1,23 @@
 require 'spec_helper'
 
 describe 'trailing_whitespace' do
-  describe 'line with trailing whitespace' do
-    let(:code) { "foo " }
-
-    its(:problems) {
-      should have_problem({
-        :kind       => :error,
-        :message    => 'trailing whitespace found',
-        :linenumber => 1,
-        :column     => 4,
-      })
-    }
+  let(:msg) { 'trailing whitespace found' }
+
+  context 'with fix disabled' do
+    context 'line with trailing whitespace' do
+      let(:code) { "foo " }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create an error' do
+        expect(problems).to contain_error(msg).on_line(1).in_column(4)
+      end
+    end
   end
 
-  describe 'single line with trailing whitespace w/fix' do
+  context 'with fix enabled' do
     before do
       PuppetLint.configuration.fix = true
     end
@@ -23,38 +26,36 @@ describe 'trailing_whitespace' do
       PuppetLint.configuration.fix = false
     end
 
-    let(:code) { "foo " }
-
-    its(:problems) {
-      should have_problem({
-        :kind       => :fixed,
-        :message    => 'trailing whitespace found',
-        :linenumber => 1,
-        :column     => 4,
-      })
-    }
-    its(:manifest) { should == 'foo' }
-  end
+    context 'single line with trailing whitespace' do
+      let(:code) { "foo " }
 
-  describe 'multiple lines with trailing whitespace w/fix' do
-    before do
-      PuppetLint.configuration.fix = true
-    end
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
 
-    after do
-      PuppetLint.configuration.fix = false
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
+      end
+
+      it 'should remove the trailing whitespace' do
+        expect(manifest).to eq('foo')
+      end
     end
 
-    let(:code) { "foo    \nbar" }
-
-    its(:problems) {
-      should have_problem({
-        :kind       => :fixed,
-        :message    => 'trailing whitespace found',
-        :linenumber => 1,
-        :column     => 4,
-      })
-    }
-    its(:manifest) { should == "foo\nbar" }
+    context 'multiple lines with trailing whitespace' do
+      let(:code) { "foo    \nbar" }
+
+      it 'should only detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the manifest' do
+        expect(problems).to contain_fixed(msg).on_line(1).in_column(4)
+      end
+
+      it 'should remove the trailing whitespace' do
+        expect(manifest).to eq("foo\nbar")
+      end
+    end
   end
 end

data/spec/puppet-lint_spec.rb

@@ -5,16 +5,16 @@ describe PuppetLint do
 
   it 'should accept manifests as a string' do
     subject.code = "class foo { }"
-    subject.code.should_not be_nil
+    expect(subject.code).to_not be_nil
   end
 
   it 'should have support for % with a hash' do
     string = 'replace %{hash}' % {:hash => 'replaced'}
-    string.should match 'replace replaced'
+    expect(string).to match('replace replaced')
   end
 
   it 'should not break regular % support' do
     string = 'replace %s %s' % ['get','replaced']
-    string.should match 'replace get replaced'
+    expect(string).to match('replace get replaced')
   end
 end

data/spec/spec_helper.rb

@@ -1,136 +1,129 @@
-require 'rspec/autorun'
 require 'puppet-lint'
+require 'rspec/its'
+require 'rspec/collection_matchers'
 
 module RSpec
   module LintExampleGroup
-    def subject
-      klass = PuppetLint::Checks.new
-      fileinfo = {}
-      fileinfo[:fullpath] = self.respond_to?(:fullpath) ? fullpath : ''
-      klass.load_data(fileinfo, code)
-      klass.send("lint_check_#{self.class.top_level_description}")
-      klass
-    end
-  end
-end
+    class HaveProblem
+      def initialize(method, message)
+        @expected_problem = {
+          :kind    => method.to_s.gsub(/\Acontain_/, '').to_sym,
+          :message => message,
+        }
+        @description = ["contain a #{@expected_problem[:kind]}"]
+      end
 
-RSpec.configure do |c|
-  c.mock_framework = :rspec
-  c.include RSpec::LintExampleGroup, :type => :lint, :example_group => {
-    :file_path => Regexp.compile(%w{spec puppet-lint plugins}.join('[\\\/]'))
-  }
-end
+      def on_line(line)
+        @expected_problem[:line] = line
+        @description << "on line #{line}"
+        self
+      end
 
-#class PuppetLint::Warning < Exception; end
-#class PuppetLint::Error < Exception; end
-#PuppetLint::CheckPlugin.any_instance.stub(:warn) do |arg|
-#  raise PuppetLint::Warning
-#end
-
-#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
+      def in_column(column)
+        @expected_problem[:column] = column
+        @description << "starting in column #{column}"
+        self
       end
-    end
-    val
-  }
-end
 
-RSpec::Matchers.define :have_problem do |filter|
+      def with_reason(reason)
+        @expected_problem[:reason] = reason
+        @description << "with reason '#{reason}'"
+        self
+      end
 
-  match do |problems|
-    filter_array_of_hashes(problems, filter).length > 0
-  end
+      def matches?(problems)
+        @problems = problems
+
+        problems.any? do |problem|
+          ret = true
+          @expected_problem.each do |key, value|
+            if !problem.key?(key)
+              ret = false
+              break
+            elsif problem[key] != value
+              ret = false
+              break
+            end
+          end
+          ret
+        end
+      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
+      def description
+        @description.join(' ')
+      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
+      def check_attr(attr, prefix)
+        unless @expected_problem[attr] == @problems.first[attr]
+          expected = @expected_problem[attr].inspect
+          actual = @problems.first[attr].inspect
+          "#{prefix} #{expected}, but it was #{actual}"
+        end
+      end
 
-end
+      def failure_message
+        case @problems.length
+        when 0
+          "expected that the check would create a problem but it did not"
+        when 1
+          messages = ["expected that the problem"]
+
+          messages << check_attr(:kind, 'would be of kind')
+          messages << check_attr(:message, 'would have the message')
+          messages << check_attr(:linenumber, 'would be on line')
+          messages << check_attr(:column, 'would start on column')
+
+          messages.compact.join("\n  ")
+        else
+          [
+            "expected that the check would create",
+            PP.pp(@expected_problem, '').strip,
+            "but it instead created",
+            PP.pp(@problems, ''),
+          ].join("\n")
+        end
+      end
 
-RSpec::Matchers.define :only_have_problem do |filter|
+      def failure_message_when_negated
+        "expected that the check would not create the problem, but it did"
+      end
+    end
 
-  match do |actual|
-    res = filter_array_of_hashes(actual, filter)
-    res.length == actual.length && res.length == 1
-  end
+    def method_missing(method, *args, &block)
+      return HaveProblem.new(method, args.first) if method.to_s =~ /\Acontain_/
+      super
+    end
 
-  failure_message_for_should do |problems|
-    filtered_problems = filter_array_of_hashes(actual, filter)
-    if filtered_problems.length > 1
-      message = "Multiple problems found matching the filter."
-    else
-      left = problems - filter_array_of_hashes(actual, filter)
-      message = "There were problems not matching filter."
-      message << "
-      * filter = #{filter.inspect}
-      * unmatched = [
-      "
-      left.each { |prob| message << "    #{prob.inspect}," }
-      message << "
-        ]"
+    def problems
+      subject.problems
     end
-    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
+    def manifest
+      subject.manifest
+    end
 
+    def subject
+      klass = PuppetLint::Checks.new
+      filepath = self.respond_to?(:path) ? path : ''
+      klass.load_data(filepath, code)
+      check_name = self.class.top_level_description.to_sym
+      check = PuppetLint.configuration.check_object[check_name].new
+      klass.problems = check.run
+      if PuppetLint.configuration.fix
+        klass.problems = check.fix_problems
+      end
+      klass
+    end
+  end
 end
 
+RSpec.configure do |config|
+  config.mock_framework = :rspec
+  config.include RSpec::LintExampleGroup, {
+    :type      => :lint,
+    :file_path => Regexp.compile(%w{spec puppet-lint plugins}.join('[\\\/]')),
+  }
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,56 +1,94 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puppet-lint
-version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2014-08-18 00:00:00 +10:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 10
+        - 0
+        version: "10.0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-its
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-collection_matchers
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "Checks your Puppet manifests against the Puppetlabs\n  style guide
-  and alerts you to any discrepancies."
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id004
+description: |-
+  Checks your Puppet manifests against the Puppetlabs
+    style guide and alerts you to any discrepancies.
 email: tim@sharpe.id.au
-executables:
+executables: 
 - puppet-lint
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -63,16 +101,19 @@ files:
 - lib/puppet-lint/checkplugin.rb
 - lib/puppet-lint/checks.rb
 - lib/puppet-lint/configuration.rb
+- lib/puppet-lint/data.rb
 - lib/puppet-lint/lexer.rb
 - lib/puppet-lint/lexer/token.rb
 - lib/puppet-lint/monkeypatches.rb
 - lib/puppet-lint/monkeypatches/string_percent.rb
 - lib/puppet-lint/monkeypatches/string_prepend.rb
+- lib/puppet-lint/optparser.rb
 - lib/puppet-lint/plugins.rb
 - lib/puppet-lint/plugins/check_classes.rb
 - lib/puppet-lint/plugins/check_comments.rb
 - lib/puppet-lint/plugins/check_conditionals.rb
 - lib/puppet-lint/plugins/check_documentation.rb
+- lib/puppet-lint/plugins/check_nodes.rb
 - lib/puppet-lint/plugins/check_resources.rb
 - lib/puppet-lint/plugins/check_strings.rb
 - lib/puppet-lint/plugins/check_variables.rb
@@ -81,16 +122,18 @@ files:
 - lib/puppet-lint/version.rb
 - puppet-lint.gemspec
 - spec/fixtures/test/manifests/fail.pp
+- spec/fixtures/test/manifests/ignore.pp
+- spec/fixtures/test/manifests/ignore_reason.pp
 - spec/fixtures/test/manifests/init.pp
 - spec/fixtures/test/manifests/malformed.pp
 - spec/fixtures/test/manifests/warning.pp
 - spec/puppet-lint/bin_spec.rb
 - spec/puppet-lint/configuration_spec.rb
+- spec/puppet-lint/ignore_overrides_spec.rb
 - spec/puppet-lint/lexer/token_spec.rb
 - spec/puppet-lint/lexer_spec.rb
 - spec/puppet-lint/plugins/check_classes/autoloader_layout_spec.rb
 - spec/puppet-lint/plugins/check_classes/class_inherits_from_params_class_spec.rb
-- spec/puppet-lint/plugins/check_classes/class_parameter_defaults_spec.rb
 - spec/puppet-lint/plugins/check_classes/inherits_across_namespaces_spec.rb
 - spec/puppet-lint/plugins/check_classes/names_containing_dash_spec.rb
 - spec/puppet-lint/plugins/check_classes/nested_classes_or_defines_spec.rb
@@ -102,6 +145,7 @@ files:
 - spec/puppet-lint/plugins/check_conditionals/case_without_default_spec.rb
 - spec/puppet-lint/plugins/check_conditionals/selector_inside_resource_spec.rb
 - spec/puppet-lint/plugins/check_documentation/documentation_spec.rb
+- spec/puppet-lint/plugins/check_nodes/unquoted_node_name_spec.rb
 - spec/puppet-lint/plugins/check_resources/duplicate_params_spec.rb
 - spec/puppet-lint/plugins/check_resources/ensure_first_param_spec.rb
 - spec/puppet-lint/plugins/check_resources/ensure_not_symlink_target_spec.rb
@@ -110,6 +154,7 @@ files:
 - spec/puppet-lint/plugins/check_resources/unquoted_resource_title_spec.rb
 - spec/puppet-lint/plugins/check_strings/double_quoted_strings_spec.rb
 - spec/puppet-lint/plugins/check_strings/only_variable_string_spec.rb
+- spec/puppet-lint/plugins/check_strings/puppet_url_without_modules_spec.rb
 - spec/puppet-lint/plugins/check_strings/quoted_booleans_spec.rb
 - spec/puppet-lint/plugins/check_strings/single_quote_string_with_variables_spec.rb
 - spec/puppet-lint/plugins/check_strings/variables_not_enclosed_spec.rb
@@ -121,42 +166,54 @@ files:
 - spec/puppet-lint/plugins/check_whitespace/trailing_whitespace_spec.rb
 - spec/puppet-lint_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/rodjek/puppet-lint/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ensure your Puppet manifests conform with the Puppetlabs style guide
-test_files:
+test_files: 
 - spec/fixtures/test/manifests/fail.pp
+- spec/fixtures/test/manifests/ignore.pp
+- spec/fixtures/test/manifests/ignore_reason.pp
 - spec/fixtures/test/manifests/init.pp
 - spec/fixtures/test/manifests/malformed.pp
 - spec/fixtures/test/manifests/warning.pp
 - spec/puppet-lint/bin_spec.rb
 - spec/puppet-lint/configuration_spec.rb
+- spec/puppet-lint/ignore_overrides_spec.rb
 - spec/puppet-lint/lexer/token_spec.rb
 - spec/puppet-lint/lexer_spec.rb
 - spec/puppet-lint/plugins/check_classes/autoloader_layout_spec.rb
 - spec/puppet-lint/plugins/check_classes/class_inherits_from_params_class_spec.rb
-- spec/puppet-lint/plugins/check_classes/class_parameter_defaults_spec.rb
 - spec/puppet-lint/plugins/check_classes/inherits_across_namespaces_spec.rb
 - spec/puppet-lint/plugins/check_classes/names_containing_dash_spec.rb
 - spec/puppet-lint/plugins/check_classes/nested_classes_or_defines_spec.rb
@@ -168,6 +225,7 @@ test_files:
 - spec/puppet-lint/plugins/check_conditionals/case_without_default_spec.rb
 - spec/puppet-lint/plugins/check_conditionals/selector_inside_resource_spec.rb
 - spec/puppet-lint/plugins/check_documentation/documentation_spec.rb
+- spec/puppet-lint/plugins/check_nodes/unquoted_node_name_spec.rb
 - spec/puppet-lint/plugins/check_resources/duplicate_params_spec.rb
 - spec/puppet-lint/plugins/check_resources/ensure_first_param_spec.rb
 - spec/puppet-lint/plugins/check_resources/ensure_not_symlink_target_spec.rb
@@ -176,6 +234,7 @@ test_files:
 - spec/puppet-lint/plugins/check_resources/unquoted_resource_title_spec.rb
 - spec/puppet-lint/plugins/check_strings/double_quoted_strings_spec.rb
 - spec/puppet-lint/plugins/check_strings/only_variable_string_spec.rb
+- spec/puppet-lint/plugins/check_strings/puppet_url_without_modules_spec.rb
 - spec/puppet-lint/plugins/check_strings/quoted_booleans_spec.rb
 - spec/puppet-lint/plugins/check_strings/single_quote_string_with_variables_spec.rb
 - spec/puppet-lint/plugins/check_strings/variables_not_enclosed_spec.rb