puppet-lint 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d618e442c08c4d3e79853fc370348c9ee8e8970
-  data.tar.gz: 82099093c21a374e137a39bd0323443e16015e95
+  metadata.gz: d38c3e980312a05a89ce9927adb0f804a9bb2b3a
+  data.tar.gz: 9ed350e5a31848d582093b528b516c8834250bd8
 SHA512:
-  metadata.gz: 179cd2b6f7ada144261bf630064a4ca26a212d3693fba9244a9a4fbd2b8c75ec78f6935f50175845bf2d743e53671f19c683e9e5ccb14b950e7d6e9e86c269d4
-  data.tar.gz: 8d5f9a973d53c47e8ce6a7caac88c4aa8ab7637e95221e95676b7adf40b8cc8c2ed9b615d09f19857aeadbc36d7629d86518ba644fbaf08845050ae2c2018201
+  metadata.gz: 29ed416ab704c80e28e01fff7c024fb92406a5dc091f2ebbd4e247b214b49560aca37e71e03730adfd71846f08c8396122fc4e30d043881e20434a920b43d6ac
+  data.tar.gz: dbf341808a24b94dbaa7e1b01145832b5995f7c197fa651300aac7e38bdb5f688c6f1b57271b9496648bf9604788a278cb522e3679d3e4e4a669b0bfafb85123

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [2.2.1](https://github.com/rodjek/puppet-lint/tree/2.2.1) (2017-03-29)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.2.0...2.2.1)
+
+**Closed issues:**
+
+- "undefined method `map' for nil:NilClass" when running check\_whitespace [\#681](https://github.com/rodjek/puppet-lint/issues/681)
+- "undefined method `next\_token='" when fixing with check\_whitespace [\#680](https://github.com/rodjek/puppet-lint/issues/680)
+- Release 2.2.0 planning and discussion [\#668](https://github.com/rodjek/puppet-lint/issues/668)
+
+**Merged pull requests:**
+
+- restore the links between tokens after arrow\_on\_right\_operand\_line\#fix [\#684](https://github.com/rodjek/puppet-lint/pull/684) ([rodjek](https://github.com/rodjek))
+- level\_tokens\[0\] can be nil if there is no params in the top level block [\#682](https://github.com/rodjek/puppet-lint/pull/682) ([rodjek](https://github.com/rodjek))
+
 ## [2.2.0](https://github.com/rodjek/puppet-lint/tree/2.2.0) (2017-03-29)
 [Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.1.1...2.2.0)
 
@@ -75,7 +89,6 @@
 
 **Merged pull requests:**
 
-- puppet-lint 2.1.1 release [\#628](https://github.com/rodjek/puppet-lint/pull/628) ([rnelson0](https://github.com/rnelson0))
 - Correctly handle strings-with-variables as hash keys in arrow\_alignment check [\#621](https://github.com/rodjek/puppet-lint/pull/621) ([rodjek](https://github.com/rodjek))
 - Support array of variables on left side of an assign operation [\#617](https://github.com/rodjek/puppet-lint/pull/617) ([rodjek](https://github.com/rodjek))
 - Test against Ruby 2.4.0 [\#616](https://github.com/rodjek/puppet-lint/pull/616) ([rodjek](https://github.com/rodjek))
@@ -242,6 +255,25 @@
 ## [2.0.0](https://github.com/rodjek/puppet-lint/tree/2.0.0) (2016-06-22)
 [Full Changelog](https://github.com/rodjek/puppet-lint/compare/1.1.0...2.0.0)
 
+puppet-lint 2.0.0 is a breaking change. Specifically, the renaming of the line length test was changed from `80chars` to `140chars`. You may need to adjust your configuration and lint checks. For example:
+```ruby
+# Line length test is 80 chars in puppet-lint 1.1.0
+PuppetLint.configuration.send('disable_80chars')
+# Line length test is 140 chars in puppet-lint 2.x
+PuppetLint.configuration.send('disable_140chars')
+```
+
+You may also need to adjust your Gemfile if you are pointing directly at git:
+```ruby
+# old
+gem 'puppet-lint', :require => false, :git => 'https://github.com/rodjek/puppet-lint.git'
+
+# new
+gem 'puppet-lint', '~> 2.0'
+```
+
+If the additional gems you use for checks are pinned to 1.x, you should pin puppet-lint to `'~> 1.0'` or `'>= 1.0', '< 3.0'` until updated check gems are released.
+
 **Closed issues:**
 
 - Current package [\#471](https://github.com/rodjek/puppet-lint/issues/471)

data/lib/puppet-lint/data.rb

@@ -109,7 +109,7 @@ class PuppetLint::Data
         marker = 0
         result = []
         tokens.select { |t| t.type == :COLON }.each do |colon_token|
-          if colon_token.next_code_token && colon_token.next_code_token != :LBRACE
+          if colon_token.next_code_token && colon_token.next_code_token.type != :LBRACE
             start_idx = tokens.index(colon_token)
             next if start_idx < marker
             end_token = colon_token.next_token_of([:SEMIC, :RBRACE])

data/lib/puppet-lint/plugins/check_classes.rb

@@ -35,6 +35,7 @@ PuppetLint.new_check(:arrow_on_right_operand_line) do
   def fix(problem)
     token = problem[:token]
     tokens.delete(token)
+
     # remove any excessive whitespace on the line
     temp_token = token.prev_code_token
     while (temp_token = temp_token.next_token)
@@ -42,9 +43,17 @@ PuppetLint.new_check(:arrow_on_right_operand_line) do
       break if temp_token.type == :NEWLINE
     end
 
+    temp_token.next_token = token
+    token.prev_token = temp_token
     index = tokens.index(token.next_code_token)
     tokens.insert(index, token)
-    tokens.insert(index + 1, PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', 0, 0))
+
+    whitespace_token = PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', temp_token.line + 1, 3)
+    whitespace_token.prev_token = token
+    token.next_token = whitespace_token
+    whitespace_token.next_token = tokens[index + 1]
+    tokens[index + 1].prev_token = whitespace_token
+    tokens.insert(index + 1, whitespace_token)
   end
 
   def whitespace?(token)

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

@@ -178,7 +178,7 @@ PuppetLint.new_check(:arrow_alignment) do
           level_tokens[level_idx] ||= []
           param_column << nil
         elsif token.type == :RBRACE || token.type == :SEMIC
-          if level_tokens[level_idx].map(&:line).uniq.length > 1
+          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 }

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

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

@@ -424,6 +424,23 @@ describe 'arrow_alignment' do
         expect(problems).to have(0).problems
       end
     end
+
+    context 'where the top level of the block has no parameters' do
+      let(:code) { "
+        case $::osfamily {
+          'RedHat': {
+            $datadir = $::operatingsystem ? {
+              'Amazon' => pick($datadir, 'value'),
+              default  => pick($datadir, 'value'),
+            }
+          }
+        }
+      " }
+
+      it 'should not detect any problems' do
+        expect(problems).to have(0).problems
+      end
+    end
   end
 
   context 'with fix enabled' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tim Sharpe