puppet-lint 2.3.0 → 2.3.1

data/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb

@@ -5,13 +5,14 @@
 PuppetLint.new_check(:single_quote_string_with_variables) do
   def check
     tokens.select { |r|
-      r.type == :SSTRING && r.value.include?('${') && (! r.prev_token.prev_token.value.match(%r{inline_(epp|template)}) )
+      r.type == :SSTRING && r.value.include?('${') && !r.prev_token.prev_token.value.match(%r{inline_(epp|template)})
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'single quoted string containing a variable found',
         :line    => token.line,
         :column  => token.column,
-      }
+      )
     end
   end
 end

data/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb

@@ -8,12 +8,13 @@ PuppetLint.new_check(:variables_not_enclosed) do
     tokens.select { |r|
       r.type == :UNENC_VARIABLE
     }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message => 'variable not enclosed in {}',
         :line    => token.line,
         :column  => token.column,
         :token   => token,
-      }
+      )
     end
   end
 

data/lib/puppet-lint/plugins/check_variables/variable_contains_dash.rb

@@ -7,15 +7,16 @@ PuppetLint.new_check(:variable_contains_dash) do
 
   def check
     tokens.select { |r|
-      VARIABLE_DASH_TYPES.include? r.type
+      VARIABLE_DASH_TYPES.include?(r.type)
     }.each do |token|
-      if token.value.gsub(/\[.+?\]/, '').match(/-/)
-        notify :warning, {
-          :message => 'variable contains a dash',
-          :line    => token.line,
-          :column  => token.column,
-        }
-      end
+      next unless token.value.gsub(%r{\[.+?\]}, '') =~ %r{-}
+
+      notify(
+        :warning,
+        :message => 'variable contains a dash',
+        :line    => token.line,
+        :column  => token.column,
+      )
     end
   end
 end

data/lib/puppet-lint/plugins/check_variables/variable_is_lowercase.rb

@@ -7,15 +7,16 @@ PuppetLint.new_check(:variable_is_lowercase) do
 
   def check
     tokens.select { |r|
-      VARIABLE_LOWERCASE_TYPES.include? r.type
+      VARIABLE_LOWERCASE_TYPES.include?(r.type)
     }.each do |token|
-      if token.value.gsub(/\[.+?\]/, '').match(/[A-Z]/)
-        notify :warning, {
-          :message => 'variable contains an uppercase letter',
-          :line    => token.line,
-          :column  => token.column,
-        }
-      end
+      next unless token.value.gsub(%r{\[.+?\]}, '') =~ %r{[A-Z]}
+
+      notify(
+        :warning,
+        :message => 'variable contains an uppercase letter',
+        :line    => token.line,
+        :column  => token.column,
+      )
     end
   end
 end

data/lib/puppet-lint/plugins/check_whitespace/140chars.rb

@@ -7,15 +7,15 @@
 PuppetLint.new_check(:'140chars') do
   def check
     manifest_lines.each_with_index do |line, idx|
-      unless line =~ /:\/\// || line =~ /template\(/
-        if line.scan(/./mu).size > 140
-          notify :warning, {
-            :message => 'line has more than 140 characters',
-            :line    => idx + 1,
-            :column  => 140,
-          }
-        end
-      end
+      next if line =~ %r{://} || line =~ %r{template\(}
+      next unless line.scan(%r{.}mu).size > 140
+
+      notify(
+        :warning,
+        :message => 'line has more than 140 characters',
+        :line    => idx + 1,
+        :column  => 140,
+      )
     end
   end
 end

data/lib/puppet-lint/plugins/check_whitespace/2sp_soft_tabs.rb

@@ -7,13 +7,14 @@ PuppetLint.new_check(:'2sp_soft_tabs') do
     tokens.select { |r|
       r.type == :INDENT
     }.reject { |r|
-      r.value.length % 2 == 0
+      r.value.length.even?
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'two-space soft tabs not used',
         :line    => token.line,
         :column  => token.column,
-      }
+      )
     end
   end
 end

data/lib/puppet-lint/plugins/check_whitespace/80chars.rb

@@ -6,16 +6,16 @@
 PuppetLint.new_check(:'80chars') do
   def check
     manifest_lines.each_with_index do |line, idx|
-      unless line =~ /:\/\// || line =~ /template\(/
-        if line.scan(/./mu).size > 80
-          notify :warning, {
-            :message => 'line has more than 80 characters',
-            :line    => idx + 1,
-            :column  => 80,
-          }
-        end
-      end
+      next if line =~ %r{://} || line =~ %r{template\(}
+      next unless line.scan(%r{.}mu).size > 80
+
+      notify(
+        :warning,
+        :message => 'line has more than 80 characters',
+        :line    => idx + 1,
+        :column  => 80,
+      )
     end
   end
 end
-PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.send('disable_80chars')

data/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb

@@ -13,7 +13,7 @@ PuppetLint.new_check(:arrow_alignment) do
       param_column = [nil]
       resource_tokens = res_idx[:tokens]
       resource_tokens.reject! do |token|
-        COMMENT_TYPES.include? token.type
+        COMMENT_TYPES.include?(token.type)
       end
 
       # If this is a single line resource, skip it
@@ -23,7 +23,7 @@ PuppetLint.new_check(:arrow_alignment) do
       next if last_arrow.nil?
       next if resource_tokens[first_arrow].line == resource_tokens[last_arrow].line
 
-      resource_tokens.each_with_index do |token, idx|
+      resource_tokens.each do |token|
         if token.type == :FARROW
           (level_tokens[level_idx] ||= []) << token
           param_token = token.prev_code_token
@@ -31,7 +31,7 @@ PuppetLint.new_check(:arrow_alignment) do
           if param_token.type == :DQPOST
             param_length = 0
             iter_token = param_token
-            while iter_token.type != :DQPRE do
+            while iter_token.type != :DQPRE
               param_length += iter_token.to_manifest.length
               iter_token = iter_token.prev_token
             end
@@ -41,11 +41,11 @@ PuppetLint.new_check(:arrow_alignment) do
           end
 
           if param_column[level_idx].nil?
-            if param_token.type == :DQPOST
-              param_column[level_idx] = iter_token.column
-            else
-              param_column[level_idx] = param_token.column
-            end
+            param_column[level_idx] = if param_token.type == :DQPOST
+                                        iter_token.column
+                                      else
+                                        param_token.column
+                                      end
           end
 
           this_arrow_column = param_column[level_idx] + param_length + 1
@@ -62,18 +62,19 @@ PuppetLint.new_check(:arrow_alignment) do
         elsif token.type == :RBRACE || token.type == :SEMIC
           if (level_tokens[level_idx] ||= []).map(&:line).uniq.length > 1
             level_tokens[level_idx].each do |arrow_tok|
-              unless arrow_tok.column == arrow_column[level_idx] || level_tokens[level_idx].size == 1
-                arrows_on_line = level_tokens[level_idx].select { |t| t.line == arrow_tok.line }
-                notify :warning, {
-                  :message        => "indentation of => is not properly aligned (expected in column #{arrow_column[level_idx]}, but found it in column #{arrow_tok.column})",
-                  :line           => arrow_tok.line,
-                  :column         => arrow_tok.column,
-                  :token          => arrow_tok,
-                  :arrow_column   => arrow_column[level_idx],
-                  :newline        => !(arrows_on_line.index(arrow_tok) == 0),
-                  :newline_indent => param_column[level_idx] - 1,
-                }
-              end
+              next if arrow_tok.column == arrow_column[level_idx] || level_tokens[level_idx].size == 1
+
+              arrows_on_line = level_tokens[level_idx].select { |t| t.line == arrow_tok.line }
+              notify(
+                :warning,
+                :message        => "indentation of => is not properly aligned (expected in column #{arrow_column[level_idx]}, but found it in column #{arrow_tok.column})",
+                :line           => arrow_tok.line,
+                :column         => arrow_tok.column,
+                :token          => arrow_tok,
+                :arrow_column   => arrow_column[level_idx],
+                :newline        => arrows_on_line.index(arrow_tok) != 0,
+                :newline_indent => param_column[level_idx] - 1,
+              )
             end
           end
           arrow_column[level_idx] = 0
@@ -89,7 +90,7 @@ PuppetLint.new_check(:arrow_alignment) do
     if problem[:newline]
       index = tokens.index(problem[:token].prev_code_token.prev_token)
 
-      #insert newline
+      # insert newline
       tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
 
       # indent the parameter to the correct depth
@@ -99,7 +100,7 @@ PuppetLint.new_check(:arrow_alignment) do
 
     end_param_idx = tokens.index(problem[:token].prev_code_token)
     start_param_idx = tokens.index(problem[:token].prev_token_of([:INDENT, :NEWLINE])) + 1
-    param_length = tokens[start_param_idx..end_param_idx].map { |r| r.to_manifest.length }.inject(0) { |sum,x| sum + x }
+    param_length = tokens[start_param_idx..end_param_idx].map { |r| r.to_manifest.length }.reduce(0) { |sum, x| sum + x }
     new_ws_len = (problem[:arrow_column] - (problem[:newline_indent] + param_length + 1))
     new_ws = ' ' * new_ws_len
 

data/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb

@@ -9,12 +9,13 @@ PuppetLint.new_check(:hard_tabs) do
     tokens.select { |r|
       WHITESPACE_TYPES.include?(r.type) && r.value.include?("\t")
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'tab character found',
         :line    => token.line,
         :column  => token.column,
         :token   => token,
-      }
+      )
     end
   end
 

data/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb

@@ -9,12 +9,13 @@ PuppetLint.new_check(:trailing_whitespace) do
     }.select { |token|
       token.next_token.nil? || token.next_token.type == :NEWLINE
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'trailing whitespace found',
         :line    => token.line,
         :column  => token.column,
         :token   => token,
-      }
+      )
     end
   end
 

data/lib/puppet-lint/tasks/puppet-lint.rb

@@ -13,7 +13,7 @@ class PuppetLint
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    DEFAULT_PATTERN = '**/*.pp'
+    DEFAULT_PATTERN = '**/*.pp'.freeze
 
     attr_accessor :name
     attr_accessor :pattern
@@ -59,7 +59,7 @@ class PuppetLint
           PuppetLint.configuration.send("disable_#{check}")
         end
 
-        %w{with_filename fail_on_warnings error_level log_format with_context fix show_ignored relative}.each do |config|
+        %w[with_filename fail_on_warnings error_level log_format with_context fix show_ignored relative].each do |config|
           value = instance_variable_get("@#{config}")
           PuppetLint.configuration.send("#{config}=".to_sym, value) unless value.nil?
         end
@@ -83,7 +83,7 @@ class PuppetLint
             linter.run
             linter.print_problems
 
-            if PuppetLint.configuration.fix && !linter.problems.any? { |e| e[:check] == :syntax }
+            if PuppetLint.configuration.fix && linter.problems.none? { |e| e[:check] == :syntax }
               IO.write(puppet_file, linter.manifest)
             end
           end

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'.freeze
 end

data/puppet-lint.gemspec

@@ -1,9 +1,9 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push(File.expand_path('../lib', __FILE__))
 require 'puppet-lint/version'
 
 Gem::Specification.new do |s|
   s.name = 'puppet-lint'
-  s.version = PuppetLint::VERSION
+  s.version = PuppetLint::VERSION.dup
   s.homepage = 'https://github.com/rodjek/puppet-lint/'
   s.summary = 'Ensure your Puppet manifests conform with the Puppetlabs style guide'
   s.description = 'Checks your Puppet manifests against the Puppetlabs
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.authors = ['Tim Sharpe']
   s.email = 'tim@sharpe.id.au'

data/spec/puppet-lint/bin_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'rspec/mocks'
 require 'optparse'
+require 'tempfile'
 
 class CommandRun
   attr_accessor :stdout, :stderr, :exitstatus
@@ -26,11 +27,11 @@ end
 
 describe PuppetLint::Bin do
   subject do
-    if args.is_a? Array
-      sane_args = args
-    else
-      sane_args = [args]
-    end
+    sane_args = if args.is_a?(Array)
+                  args
+                else
+                  [args]
+                end
 
     CommandRun.new(sane_args)
   end
@@ -55,209 +56,267 @@ describe PuppetLint::Bin do
   end
 
   context 'when passed multiple files' do
-    let(:args) { [
-      'spec/fixtures/test/manifests/warning.pp',
-      'spec/fixtures/test/manifests/fail.pp',
-    ] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/warning.pp',
+        'spec/fixtures/test/manifests/fail.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to eq([
-      "#{args[0]} - WARNING: optional parameter listed before required parameter on line 2",
-      "#{args[1]} - ERROR: test::foo not in autoload module layout on line 2",
-    ].join("\n")) }
+    its(:stdout) do
+      is_expected.to eq(
+        [
+          "#{args[0]} - WARNING: optional parameter listed before required parameter on line 2",
+          "#{args[1]} - ERROR: test::foo not in autoload module layout on line 2",
+        ].join("\n"),
+      )
+    end
   end
 
   context 'when passed a malformed file' do
     let(:args) { 'spec/fixtures/test/manifests/malformed.pp' }
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to eq('ERROR: Syntax error (try running `puppet parser validate <file>`) on line 1') }
+    its(:stdout) { is_expected.to eq('ERROR: Syntax error on line 1') }
+    its(:stderr) { is_expected.to eq('Try running `puppet parser validate <file>`') }
   end
 
   context 'when limited to errors only' do
-    let(:args) { [
-      '--error-level', 'error',
-      'spec/fixtures/test/manifests/warning.pp',
-      'spec/fixtures/test/manifests/fail.pp',
-    ] }
+    let(:args) do
+      [
+        '--error-level',
+        'error',
+        'spec/fixtures/test/manifests/warning.pp',
+        'spec/fixtures/test/manifests/fail.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to match(/^#{args.last} - ERROR/) }
+    its(:stdout) { is_expected.to match(%r{^#{args.last} - ERROR}) }
   end
 
   context 'when limited to warnings only' do
-    let(:args) { [
-      '--error-level', 'warning',
-      'spec/fixtures/test/manifests/warning.pp',
-      'spec/fixtures/test/manifests/fail.pp',
-    ] }
+    let(:args) do
+      [
+        '--error-level',
+        'warning',
+        'spec/fixtures/test/manifests/warning.pp',
+        'spec/fixtures/test/manifests/fail.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to match(/WARNING/) }
-    its(:stdout) { is_expected.to_not match(/ERROR/) }
+    its(:stdout) { is_expected.to match(%r{WARNING}) }
+    its(:stdout) { is_expected.to_not match(%r{ERROR}) }
   end
 
   context 'when specifying a specific check to run' do
-    let(:args) { [
-      '--only-checks', 'parameter_order',
-      'spec/fixtures/test/manifests/warning.pp',
-      'spec/fixtures/test/manifests/fail.pp',
-    ] }
+    let(:args) do
+      [
+        '--only-checks',
+        'parameter_order',
+        'spec/fixtures/test/manifests/warning.pp',
+        'spec/fixtures/test/manifests/fail.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to_not match(/ERROR/) }
-    its(:stdout) { is_expected.to match(/WARNING/) }
+    its(:stdout) { is_expected.to_not match(%r{ERROR}) }
+    its(:stdout) { is_expected.to match(%r{WARNING}) }
   end
 
   context 'when asked to display filenames ' do
-    let(:args) { ['--with-filename', 'spec/fixtures/test/manifests/fail.pp'] }
+    let(:args) do
+      [
+        '--with-filename',
+        'spec/fixtures/test/manifests/fail.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(1) }
     its(:stdout) { is_expected.to match(%r{^spec/fixtures/test/manifests/fail\.pp -}) }
   end
 
   context 'when not asked to fail on warnings' do
-    let(:args) { ['spec/fixtures/test/manifests/warning.pp'] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/warning.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to match(/optional parameter/) }
+    its(:stdout) { is_expected.to match(%r{optional parameter}) }
   end
 
   context 'when asked to provide context to problems' do
-    let(:args) { [
-      '--with-context',
-      'spec/fixtures/test/manifests/warning.pp',
-    ] }
+    let(:args) do
+      [
+        '--with-context',
+        'spec/fixtures/test/manifests/warning.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to eq([
-      'WARNING: optional parameter listed before required parameter on line 2',
-      '',
-      "  define test::warning($foo='bar', $baz) { }",
-      '                                   ^',
-    ].join("\n"))
-    }
+    its(:stdout) do
+      is_expected.to eq(
+        [
+          'WARNING: optional parameter listed before required parameter on line 2',
+          '',
+          "  define test::warning($foo='bar', $baz) { }",
+          '                                   ^',
+        ].join("\n"),
+      )
+    end
   end
 
   context 'when asked to fail on warnings' do
-    let(:args) { [
-      '--fail-on-warnings',
-      'spec/fixtures/test/manifests/warning.pp',
-    ] }
+    let(:args) do
+      [
+        '--fail-on-warnings',
+        'spec/fixtures/test/manifests/warning.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to match(/optional parameter/) }
+    its(:stdout) { is_expected.to match(%r{optional parameter}) }
   end
 
   context 'when used with an invalid option' do
     let(:args) { '--foo-bar-baz' }
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to match(/invalid option/) }
+    its(:stdout) { is_expected.to match(%r{invalid option}) }
   end
 
   context 'when passed a file that does not exist' do
     let(:args) { 'spec/fixtures/test/manifests/enoent.pp' }
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to match(/specified file does not exist/) }
+    its(:stdout) { is_expected.to match(%r{specified file does not exist}) }
   end
 
   context 'when passed a directory' do
     let(:args) { 'spec/fixtures/' }
 
     its(:exitstatus) { is_expected.to eq(1) }
-    its(:stdout) { is_expected.to match(/ERROR/) }
+    its(:stdout) { is_expected.to match(%r{ERROR}) }
   end
 
   context 'when disabling a check' do
-    let(:args) { [
-      '--no-autoloader_layout',
-      'spec/fixtures/test/manifests/fail.pp'
-    ] }
+    let(:args) do
+      [
+        '--no-autoloader_layout',
+        'spec/fixtures/test/manifests/fail.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to eq("") }
+    its(:stdout) { is_expected.to eq('') }
   end
 
   context 'when changing the log format' do
     context 'to print %{filename}' do
-      let(:args) { [
-        '--log-format', '%{filename}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{filename}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('fail.pp') }
     end
 
     context 'to print %{path}' do
-      let(:args) { [
-        '--log-format', '%{path}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{path}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('spec/fixtures/test/manifests/fail.pp') }
     end
 
     context 'to print %{fullpath}' do
-      let(:args) { [
-        '--log-format', '%{fullpath}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{fullpath}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
-      its(:stdout) {
+      its(:stdout) do
         is_expected.to match(%r{^(/|[A-Za-z]\:).+/spec/fixtures/test/manifests/fail\.pp$})
-      }
+      end
     end
 
     context 'to print %{line}' do
-      let(:args) { [
-        '--log-format', '%{line}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{line}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('2') }
     end
 
     context 'to print %{kind}' do
-      let(:args) { [
-        '--log-format', '%{kind}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{kind}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('error') }
     end
 
     context 'to print %{KIND}' do
-      let(:args) { [
-        '--log-format', '%{KIND}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{KIND}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('ERROR') }
     end
 
     context 'to print %{check}' do
-      let(:args) { [
-        '--log-format', '%{check}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{check}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('autoloader_layout') }
     end
 
     context 'to print %{message}' do
-      let(:args) { [
-        '--log-format', '%{message}',
-        'spec/fixtures/test/manifests/fail.pp'
-      ] }
+      let(:args) do
+        [
+          '--log-format',
+          '%{message}',
+          'spec/fixtures/test/manifests/fail.pp',
+        ]
+      end
 
       its(:exitstatus) { is_expected.to eq(1) }
       its(:stdout) { is_expected.to eq('test::foo not in autoload module layout') }
@@ -265,100 +324,169 @@ describe PuppetLint::Bin do
   end
 
   context 'when displaying results as json' do
-    let(:args) { [
-      '--json',
-      'spec/fixtures/test/manifests/warning.pp',
-    ] }
+    let(:args) do
+      [
+        '--json',
+        'spec/fixtures/test/manifests/warning.pp',
+      ]
+    end
+
     its(:exitstatus) { is_expected.to eq(0) }
     its(:stdout) do
       if respond_to?(:include_json)
-        is_expected.to include_json([[{'KIND' => 'WARNING'}]])
+        is_expected.to include_json([[{ 'KIND' => 'WARNING' }]])
       else
-        is_expected.to match(/\[\n  \{/)
+        is_expected.to match(%r{\[\n  \{})
       end
     end
   end
 
   context 'when displaying results for multiple targets as json' do
+    let(:args) do
+      [
+        '--json',
+        'spec/fixtures/test/manifests/fail.pp',
+        'spec/fixtures/test/manifests/warning.pp',
+      ]
+    end
 
-    let(:args) { [
-      '--json',
-      'spec/fixtures/test/manifests/fail.pp',
-      'spec/fixtures/test/manifests/warning.pp',
-    ] }
     its(:exitstatus) { is_expected.to eq(1) }
     its(:stdout) do
       if respond_to?(:include_json)
-        is_expected.to include_json([[{'KIND' => 'ERROR'}],[{'KIND' => 'WARNING'}]])
+        is_expected.to include_json([[{ 'KIND' => 'ERROR' }], [{ 'KIND' => 'WARNING' }]])
       else
-        is_expected.to match(/\[\n  \{/)
+        is_expected.to match(%r{\[\n  \{})
       end
     end
   end
 
   context 'when hiding ignored problems' do
-    let(:args) { [
-      'spec/fixtures/test/manifests/ignore.pp'
-    ] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/ignore.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to_not match(/IGNORED/) }
+    its(:stdout) { is_expected.to_not match(%r{IGNORED}) }
   end
 
   context 'when showing ignored problems' do
-    let(:args) { [
-      '--show-ignored',
-      'spec/fixtures/test/manifests/ignore.pp',
-    ] }
+    let(:args) do
+      [
+        '--show-ignored',
+        'spec/fixtures/test/manifests/ignore.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to match(/IGNORED/) }
+    its(:stdout) { is_expected.to match(%r{IGNORED}) }
   end
 
   context 'when showing ignored problems with a reason' do
-    let(:args) { [
-      '--show-ignored',
-      'spec/fixtures/test/manifests/ignore_reason.pp',
-    ] }
+    let(:args) do
+      [
+        '--show-ignored',
+        'spec/fixtures/test/manifests/ignore_reason.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to eq([
-      "IGNORED: double quoted string containing no variables on line 3",
-      "  for a good reason",
-    ].join("\n")) }
+    its(:stdout) do
+      is_expected.to eq(
+        [
+          'IGNORED: double quoted string containing no variables on line 3',
+          '  for a good reason',
+        ].join("\n"),
+      )
+    end
   end
 
   context 'ignoring multiple checks on a line' do
-    let(:args) { [
-      'spec/fixtures/test/manifests/ignore_multiple_line.pp',
-    ] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/ignore_multiple_line.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
   end
 
   context 'ignoring multiple checks in a block' do
-    let(:args) { [
-      'spec/fixtures/test/manifests/ignore_multiple_block.pp',
-    ] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/ignore_multiple_block.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to match(/^.*line 6$/) }
+    its(:stdout) { is_expected.to match(%r{^.*line 6$}) }
   end
 
   context 'when an lint:endignore control comment exists with no opening lint:ignore comment' do
-    let(:args) { [
-      'spec/fixtures/test/manifests/mismatched_control_comment.pp',
-    ] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/mismatched_control_comment.pp',
+      ]
+    end
 
     its(:exitstatus) { is_expected.to eq(0) }
-    its(:stdout) { is_expected.to match(/WARNING: lint:endignore comment with no opening lint:ignore:<check> comment found on line 1/) }
+    its(:stdout) { is_expected.to match(%r{WARNING: lint:endignore comment with no opening lint:ignore:<check> comment found on line 1}) }
   end
 
   context 'when a lint:ignore control comment block is not terminated properly' do
-    let(:args) { [
-      'spec/fixtures/test/manifests/unterminated_control_comment.pp',
-    ] }
+    let(:args) do
+      [
+        'spec/fixtures/test/manifests/unterminated_control_comment.pp',
+      ]
+    end
+
+    its(:stdout) { is_expected.to match(%r{WARNING: lint:ignore:140chars comment on line 2 with no closing lint:endignore comment}) }
+  end
+
+  context 'when fixing a file with \n line endings' do
+    before(:context) do
+      @windows_file = Tempfile.new('windows')
+      @posix_file = Tempfile.new('posix')
 
-    its(:stdout) { is_expected.to match(/WARNING: lint:ignore:140chars comment on line 2 with no closing lint:endignore comment/) }
+      @windows_file.binmode
+      @posix_file.binmode
+
+      @windows_file.write("\r\n")
+      @posix_file.write("\n")
+
+      @windows_file.close
+      @posix_file.close
+    end
+
+    after(:context) do
+      @windows_file.unlink
+      @posix_file.unlink
+    end
+
+    let(:args) do
+      [
+        '--fix',
+        @posix_file.path,
+        @windows_file.path,
+      ]
+    end
+
+    its(:exitstatus) { is_expected.to eq(0) }
+
+    it 'does not change the line endings' do
+      File.open(@posix_file.path, 'rb') do |f|
+        data = f.read
+
+        expect(data).to match(%r{\n\Z}m)
+        expect(data).to_not match(%r{\r\n\Z}m)
+      end
+
+      File.open(@windows_file.path, 'rb') do |f|
+        data = f.read
+
+        expect(data).to match(%r{\r\n\Z}m)
+      end
+    end
   end
 end