puppet-lint-use_ensure_packages-check 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 429d64b939da27bc66f50a566fd01afbc3a0822a
-  data.tar.gz: 7f06639bcb642f4ad70590b2de8d486ce64970cf
+  metadata.gz: e86e5c8317c917d5b961274644c11b1d77d2ad1e
+  data.tar.gz: 02df872a3f35342b5403328eaf8ca8b3eafd932d
 SHA512:
-  metadata.gz: 13062a56166ba14cea81eac802baf04104c1af6d8bce6cffb489ef85b89ba3fe06906b01c830df7ad5c880a1c78fa4b8b38b5c2800a4695b83869a05b8bba78b
-  data.tar.gz: 06a37b1250c9c3d13570b9bd886698aa475111dc5a5131e2d8d0bb89d6fa19d76b5d53d5b76d1f0fd289781813e6b5c52d7d3ba3db61e5fc7e4e8b0331f993fe
+  metadata.gz: 5b9ac063a2e50fe41924edc4559605fe3a4fd28ca22324b59c9151af0506fb608084baac18b074ee5aa9370323b01f9238024d5873837000b7ad5ecdd3c91b7e
+  data.tar.gz: 2dff02cdc2cbb9b141f2c36890e4e2b6ec85fa1dfed6301ac40c6e545e4023381744c3dbe35d389536dc9b5c3f6e85437a74c867498a059438ac843a342e233a

data/README.md

@@ -1,6 +1,7 @@
 # puppet-lint use ensure_packages check
 
 [![Build Status](https://travis-ci.org/ninech/puppet-lint-use_ensure_packages-check.svg?branch=master)](https://travis-ci.org/ninech/puppet-lint-use_ensure_packages-check)
+[![Gem Version](https://badge.fury.io/rb/puppet-lint-use_ensure_packages-check.svg)](https://badge.fury.io/rb/puppet-lint-use_ensure_packages-check)
 
 ## Installation
 

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

@@ -35,6 +35,7 @@ PuppetLint.new_check(:use_ensure_packages) do
 
   def check
     if_indexes.each do |cond|
+      next if check_if_else(cond)
       next if check_if(cond)
 
       notify :warning,
@@ -44,6 +45,15 @@ PuppetLint.new_check(:use_ensure_packages) do
     end
   end
 
+  def check_if_else(cond)
+    tokens = filter_code_tokens(cond[:tokens])
+
+    return true if tokens.last.next_code_token &&
+                   [:ELSE, :ELSIF].include?(tokens.last.next_code_token.type)
+
+    false
+  end
+
   def check_if(cond)
     tokens = filter_code_tokens(cond[:tokens])
 
@@ -59,6 +69,7 @@ PuppetLint.new_check(:use_ensure_packages) do
     return false if tokens.empty?
 
     return true unless OPTINAL_CONTENT.index do |c|
+      next unless tokens.length == c[:sequence].length
       match_tokens(tokens, c[:sequence], c[:values])
     end
 

data/spec/puppet-lint/plugins/check_use_ensure_packages_spec.rb

@@ -62,6 +62,46 @@ describe 'use_ensure_packages' do
       end
     end
 
+    context 'if not defined package w/ notify' do
+      let(:code) do
+        "if ! defined (Package['foo']) {
+          package {'foo': ensure => present, notify => Service['apache2'];}
+        }"
+      end
+
+      it 'should not detect any problem' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+    context 'if not defined package w/ else' do
+      let(:code) do
+        "if ! defined (Package['foo']) {
+           package {'foo': ensure => present; }
+         } else {
+           package {'bar': ensure => present; }
+         }"
+      end
+
+      it 'should not detect any problem' do
+        expect(problems).to have(0).problems
+      end
+    end
+
+    context 'if not defined package w/ elsis' do
+      let(:code) do
+        "if ! defined (Package['foo']) {
+           package {'foo': ensure => present; }
+         } elsif ! defined (Package['bar']) {
+           package {'bar': ensure => present; }
+         }"
+      end
+
+      it 'should not detect any problem' do
+        expect(problems).to have(0).problems
+      end
+    end
+
     context 'if not defined package twice' do
       let(:code) do
         "if ! defined (Package['foo']) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-use_ensure_packages-check
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Marius Rieder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint