puppet-lint-absolute_classname-check 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE5NTQ1ZmIwYjNmOTJkMDAxNTIwNThiZTk5NzkzNmY4MGI2NWM5OA==
+    MWE2YWIwM2QzN2NhZjA2NWQ4MjUzYjBiMjc0NzMxZjIyZjAwYzMyOQ==
   data.tar.gz: !binary |-
-    MDg2NWMyNWEwNmVhODdmYzlhYzVlZjgwZDgyYTVjMjc0MTJmODgyYQ==
+    MTI1ZjVjNWNiZDY5NGQ5YjJlNWE1Y2E5YWIxNzg1Y2JjZjI4NTBkZA==
 SHA512:
   metadata.gz: !binary |-
-    MjkwMzFhMmYwYWU2OGI2OWRhZGYyMDUzN2I1YjhiMzU2YzU1ZWE1YTc5ZjI1
-    MDY5NjFjMmNkMjE4YWIwMjY2NDNmYTQ3OTc3M2I5ZmQ2NTMwNTBlMGJiOTBl
-    ZTNlNDhiMjUzNmFkOGZiZjE3ZGE4ZDgxODE3NjgxZjU2YTNiNGQ=
+    OTFmNmQzM2E1NDFmYWJhY2IxNGE3MzMyZTczZWNkYTRlNDkyZWZiOTNlNTgz
+    MjI5MGJmNWJjMDhlMDhjYTI0YTk5ZTAzZjkxOGRkNWI0YWFiMDQ1YTZkZjQz
+    NzQ1MGY5NWYwYjFiYmQ2MzcyOTA2Zjk2NTRjMWNhNGNiNTg5OTE=
   data.tar.gz: !binary |-
-    ZGJiNWRjYzFmYzBhYmE0ZTYwNTk4M2Q4MDk4ZTJiZWFkMzcyNzgzZGExNzNh
-    M2FmNzU0ODUwYzJlOGI0ZGIyZGY0NWQyMjE1MTBkODY4MjExMDcxMjU3YjEx
-    YTgwM2ZmMjRmMmQwNTQ4YjFjMGU0YjU5ZTI5YmNjZmUxNWVkYzQ=
+    ODU5NmFkZmJkNGM5YzIyMDBiMWRjOThmN2I5YTUwMjNjMWE5N2YwNjIxN2Ri
+    NGQ0ZWNiMzc5YzRkZmMwYjM5ZTIwYWQ0NWYzNjUyYzUxM2UwYTg2YWI0NTBh
+    ZWY0YzNjMGZkYWFmOWJhYmFjOGFmZmJiNjQ4NWM3MWJmOWM1MTI=

data/README.md

@@ -40,42 +40,3 @@ Alternatively, if you’re calling puppet-lint via the Rake task, you should ins
 ```ruby
 PuppetLint.configuration.send('disable_absolute_classname')
 ```
-
-
-### Unquoted string in selector
-
-Unquoted strings in selector statements are not valid with the future parser.
-
-#### What you have done
-
-```puppet
-$foo = $::osfamily ? {
-  Debian => 'bar',
-  RedHat => 'baz',
-  default => 'qux',
-}
-```
-
-#### What you should have done
-
-```puppet
-$foo = $::osfamily ? {
-  'Debian' => 'bar',
-  'RedHat' => 'baz',
-  default  => 'qux',
-}
-```
-
-#### Disabling the check
-
-To disable this check, you can add `--no-absolute_classname-check` to your puppet-lint command line.
-
-```shell
-$ puppet-lint --no-absolute_classname-check path/to/file.pp
-```
-
-Alternatively, if you’re calling puppet-lint via the Rake task, you should insert the following line to your `Rakefile`.
-
-```ruby
-PuppetLint.configuration.send('disable_absolute_classname')
-```

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

@@ -3,14 +3,21 @@ PuppetLint.new_check(:relative_classname_inclusion) do
     tokens.each_with_index do |token, token_idx|
       if token.type == :NAME && token.value == 'include'
         s = token.next_code_token
-        while ![:NEWLINE, :RBRACK].include? s.type
-          if (s.type == :NAME || s.type == :SSTRING) && s.value !~ /^::/
-            notify :warning, {
-              :message => 'class included by relative name',
-              :line    => s.line,
-              :column  => s.column,
-              :token   => s,
-            }
+        in_function = 0
+        while s.type != :NEWLINE
+          if s.type == :NAME || s.type == :SSTRING
+            if s.next_code_token.type == :LPAREN
+              in_function += 1
+            elsif in_function > 0 && s.next_code_token.type == :RPAREN
+              in_function -= 1
+            elsif in_function == 0 && s.value !~ /^::/
+              notify :warning, {
+                :message => 'class included by relative name',
+                :line    => s.line,
+                :column  => s.column,
+                :token   => s,
+              }
+            end
           end
           s = s.next_token
         end

data/spec/puppet-lint/plugins/check_absolute_classname/relative_classname_inclusion_spec.rb

@@ -9,6 +9,11 @@ describe 'relative_classname_inclusion' do
         <<-EOS
         include ::foobar
         include('::foobar')
+        include(foobar(baz))
+        include(foobar('baz'))
+
+        include ::foo, ::bar
+        include('::foo', '::bar')
 
         class { '::foobar': }
 
@@ -57,6 +62,11 @@ describe 'relative_classname_inclusion' do
         <<-EOS
         include ::foobar
         include('::foobar')
+        include(foobar(baz))
+        include(foobar('baz'))
+
+        include ::foo, ::bar
+        include('::foo', '::bar')
 
         class { '::foobar': }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-absolute_classname-check
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Camptocamp