puppet-lint-roles-profiles 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b945872a2eb66807e4b1d9ecb5f96ad20dc03ce
-  data.tar.gz: e5c4b11b9c66a5b85581a3bc7ae48780670d3823
+  metadata.gz: c617ba6a13ec44e4c41a130c446564a297dd45d3
+  data.tar.gz: 5623bfe60411cecfdb68a469206642daab28f7c1
 SHA512:
-  metadata.gz: 9e40e268d84f92c85cca3ed00402e02c4a1a6c594e975908e44bcbbaa77406c3bd647c5b2a8afd5b53b8dd59a5d2010c87b8839877ddce048282634976a6ce08
-  data.tar.gz: df7b1bdbad9ba0810c5027b7c058c5dbf8e6e135a42cb77a244d0c3aef421459a3ee0fe4e4c6ef20660b9e221491edcb317276de79a7ac3e8667582b40369fb9
+  metadata.gz: 898397f3e133513d2e184a9cc3ddb0f0e32e6e19f651a45c5d33207ebc2563db6689ef02a81b7d487ad7c4aa37c082f41fd4d5fc8b7c1d3bf0a90a68710c027c
+  data.tar.gz: 89658130c10d3b8b1d8edddbbe0ac88ee237d54122a192211d8ea6352d8984853cc2213e9c35d0a0a02714d03239f52c0b2607e51a49fd0de7a88181365c954d

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

@@ -5,7 +5,7 @@ PuppetLint.new_check(:roles_with_params) do
       # breaks when roles have params that have variables as defaults
       c[:param_tokens].select { |t| t.type == :VARIABLE }.each do |t|
         notify :warning, {
-          :message => 'roles must not have parameters',
+          :message => 'Roles must not have parameters',
           :line => t.line,
           :column => t.column,
         }
@@ -15,33 +15,29 @@ PuppetLint.new_check(:roles_with_params) do
 end
 
 PuppetLint.new_check(:roles_include_profiles) do
+  def warn(t)
+    notify :warning, {
+      :message => "Roles must only include profiles",
+      :line => t.line,
+      :column => t.column
+    }
+  end
+
   def check
     class_indexes.select { |c| c[:name_token].value =~ /^roles?(::|$)/ }.each do |c|
       # As only `include profile` is allowed any resource is bad
       resource_indexes.select { |r| r[:start] >= c[:start] and r[:end] <= c[:end] }.each do |r|
-        notify :warning, {
-          :message => "Roles must only `include profiles`",
-          :line => r[:type].line,
-          :column => r[:type].column,
-        }
+        warn(r[:type])
       end
       # each include must be followed with a profile
       tokens[c[:start]..c[:end]].select { |t| t.value == 'include' }.each do |t|
         unless t.next_code_token.value =~ /^(::)?profiles?(::|$)/
-          notify :warning, {
-            :message => "Roles must only `include profiles`",
-            :line => t.line,
-            :column => t.column
-          }
+          warn(t)
         end
       end
       # Conditional logic should be avoided
       tokens[c[:start]..c[:end]].select { |t| [ :IF, :ELSE, :ELSIF, :UNLESS, :CASE].include?(t.type) }.each do |t|
-        notify :warning, {
-          :message => "Roles must only `include profiles`",
-          :line => t.line,
-          :column => t.column
-        }
+        warn(t)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-roles-profiles
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Hostnet