puppet-lint 2.3.0 → 2.3.1

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

@@ -38,7 +38,7 @@ describe 'hard_tabs' do
       end
 
       it 'should convert the tab characters into spaces' do
-        expect(manifest).to eq("  foo => bar,")
+        expect(manifest).to eq('  foo => bar,')
       end
     end
   end

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

@@ -5,7 +5,7 @@ describe 'trailing_whitespace' do
 
   context 'with fix disabled' do
     context 'line with trailing whitespace' do
-      let(:code) { "foo " }
+      let(:code) { 'foo ' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -17,18 +17,20 @@ describe 'trailing_whitespace' do
     end
 
     context 'line without code and trailing whitespace' do
-      let(:code) { "
-class {
-  
-}
-" }
+      let(:code) do
+        [
+          'class {',
+          '  ',
+          '}',
+        ].join("\n")
+      end
 
       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(3).in_column(1)
+        expect(problems).to contain_error(msg).on_line(2).in_column(1)
       end
     end
   end
@@ -43,7 +45,7 @@ class {
     end
 
     context 'single line with trailing whitespace' do
-      let(:code) { "foo " }
+      let(:code) { 'foo ' }
 
       it 'should only detect a single problem' do
         expect(problems).to have(1).problem
@@ -75,22 +77,28 @@ class {
     end
 
     context 'line without code and trailing whitespace' do
-      let(:code) { "
-class foo {
-  
-}
-" }
-      let(:fixed) { "
-class foo {
-
-}
-" }
+      let(:code) do
+        [
+          'class foo {',
+          '  ',
+          '}',
+        ].join("\n")
+      end
+
+      let(:fixed) do
+        [
+          'class foo {',
+          '',
+          '}',
+        ].join("\n")
+      end
+
       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_fixed(msg).on_line(3).in_column(1)
+        expect(problems).to contain_fixed(msg).on_line(2).in_column(1)
       end
 
       it 'should remove the trailing whitespace' do

data/spec/puppet-lint_spec.rb

@@ -4,23 +4,13 @@ describe PuppetLint do
   subject { PuppetLint.new }
 
   it 'should accept manifests as a string' do
-    subject.code = "class foo { }"
+    subject.code = 'class foo { }'
     expect(subject.code).to_not be_nil
   end
 
-  it 'should have support for % with a hash' do
-    string = 'replace %{hash}' % {:hash => 'replaced'}
-    expect(string).to match('replace replaced')
-  end
-
-  it 'should not break regular % support' do
-    string = 'replace %s %s' % ['get','replaced']
-    expect(string).to match('replace get replaced')
-  end
-
   it 'should return empty manifest when empty one given as the input' do
     subject.code = ''
     subject.run
-    expect(subject.manifest).to eq ''
+    expect(subject.manifest).to eq('')
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter('/spec/')
+  add_filter('/vendor/')
+  add_group('Checks', 'lib/puppet-lint/plugins')
+end
+
 require 'puppet-lint'
 require 'rspec/its'
 require 'rspec/collection_matchers'
@@ -12,7 +19,7 @@ module RSpec
     class HaveProblem
       def initialize(method, message)
         @expected_problem = {
-          :kind    => method.to_s.gsub(/\Acontain_/, '').to_sym,
+          :kind    => method.to_s.gsub(%r{\Acontain_}, '').to_sym,
           :message => message,
         }
         @description = ["contain a #{@expected_problem[:kind]}"]
@@ -40,17 +47,9 @@ module RSpec
         @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
+          @expected_problem.all? do |key, value|
+            problem.key?(key) && problem[key] == value
           end
-          ret
         end
       end
 
@@ -59,19 +58,19 @@ module RSpec
       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
+        return if @expected_problem[attr] == @problems.first[attr]
+
+        expected = @expected_problem[attr].inspect
+        actual = @problems.first[attr].inspect
+        "#{prefix} #{expected}, but it was #{actual}"
       end
 
       def failure_message
         case @problems.length
         when 0
-          "expected that the check would create a problem but it did not"
+          'expected that the check would create a problem but it did not'
         when 1
-          messages = ["expected that the problem"]
+          messages = ['expected that the problem']
 
           messages << check_attr(:kind, 'would be of kind')
           messages << check_attr(:message, 'would have the message')
@@ -82,24 +81,28 @@ module RSpec
           messages.compact.join("\n  ")
         else
           [
-            "expected that the check would create",
+            'expected that the check would create',
             PP.pp(@expected_problem, '').strip,
-            "but it instead created",
+            'but it instead created',
             PP.pp(@problems, ''),
           ].join("\n")
         end
       end
 
       def failure_message_when_negated
-        "expected that the check would not create the problem, but it did"
+        'expected that the check would not create the problem, but it did'
       end
     end
 
     def method_missing(method, *args, &block)
-      return HaveProblem.new(method, args.first) if method.to_s =~ /\Acontain_/
+      return HaveProblem.new(method, args.first) if method.to_s.start_with?('contain_')
       super
     end
 
+    def respond_to_missing?(method, *)
+      method.to_s.start_with?('contain_') || super
+    end
+
     def problems
       subject.problems
     end
@@ -110,14 +113,14 @@ module RSpec
 
     def subject
       klass = PuppetLint::Checks.new
-      filepath = self.respond_to?(:path) ? path : ''
+      filepath = 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.problems = check.fix_problems if PuppetLint.configuration.fix
+
       klass
     end
   end
@@ -125,11 +128,13 @@ end
 
 RSpec.configure do |config|
   config.mock_framework = :rspec
-  config.include RSpec::LintExampleGroup, {
+  config.include(
+    RSpec::LintExampleGroup,
     :type      => :lint,
-    :file_path => Regexp.compile(%w{spec puppet-lint plugins}.join('[\\\/]')),
-  }
-  config.expect_with :rspec do |c|
+    :file_path => Regexp.compile(%w[spec puppet-lint plugins].join('[\\\/]')),
+  )
+
+  config.expect_with(:rspec) do |c|
     c.syntax = :expect
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Checks your Puppet manifests against the Puppetlabs
@@ -21,6 +21,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -37,9 +39,6 @@ files:
 - 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/arrow_on_right_operand_line.rb
@@ -94,7 +93,9 @@ files:
 - spec/fixtures/test/manifests/url_interpolation.pp
 - spec/fixtures/test/manifests/warning.pp
 - spec/puppet-lint/bin_spec.rb
+- spec/puppet-lint/checks_spec.rb
 - spec/puppet-lint/configuration_spec.rb
+- spec/puppet-lint/data_spec.rb
 - spec/puppet-lint/ignore_overrides_spec.rb
 - spec/puppet-lint/lexer/token_spec.rb
 - spec/puppet-lint/lexer_spec.rb

data/lib/puppet-lint/monkeypatches.rb

@@ -1,2 +0,0 @@
-require 'puppet-lint/monkeypatches/string_prepend'
-require 'puppet-lint/monkeypatches/string_percent'

data/lib/puppet-lint/monkeypatches/string_percent.rb

@@ -1,52 +0,0 @@
-# If we are using an older ruby version, we back-port the basic functionality
-# we need for formatting output: 'somestring' % <hash>
-begin
-  if ('%{test}' % {:test => 'replaced'} == 'replaced')
-    # If this works, we are all good to go.
-  end
-rescue
-  # If the test failed (threw a error), monkeypatch String.
-  # Most of this code came from http://www.ruby-forum.com/topic/144310 but was
-  # simplified for our use.
-
-  # Basic implementation of 'string' % { } like we need it. needs work.
-  class String
-    Percent = instance_method '%' unless defined? Percent
-    def % *a, &b
-      a.flatten!
-
-      string = case a.last
-      when Hash
-        expand a.pop
-      else
-        self
-      end
-
-      if a.empty?
-        string
-      else
-        Percent.bind(string).call(a, &b)
-      end
-
-    end
-    def expand! vars = {}
-      loop do
-        changed = false
-        vars.each do |var, value|
-          var = var.to_s
-          var.gsub! %r/[^a-zA-Z0-9_]/, ''
-          [
-            %r/\%\{#{ var }\}/,
-          ].each do |pat|
-            changed = gsub! pat, "#{ value }"
-          end
-        end
-        break unless changed
-      end
-      self
-    end
-    def expand opts = {}
-      dup.expand! opts
-    end
-  end
-end

data/lib/puppet-lint/monkeypatches/string_prepend.rb

@@ -1,13 +0,0 @@
-unless String.respond_to?('prepend')
-  # Internal: Monkey patching String.
-  class String
-    # Internal: Prepends a String to self.
-    #
-    # lead - The String to prepend self with.
-    #
-    # Returns a String which is lead and self concatenated.
-    def prepend(lead)
-      self.replace "#{lead}#{self}"
-    end
-  end
-end