Merge pull request #28 from svanharmelen/master

Version 0.3.1

CHANGELOG.md

@@ -1,6 +1,10 @@
 Chef-Guard CHANGELOG
 ====================
 
+0.3.1
+-----
+- Miguel Ferreira - Fixed syntax error in the custom foodcritic tests
+
 0.3.0
 -----
 - Sander van Harmelen - Updated the cookbook to use Chef-Guard v0.6.0 which requires some config changes

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache 2.0'
 description 'Installs/Configures Chef-Guard'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.3.0'
+version '0.3.1'
 
 %w(redhat centos ubuntu).each do |os|
  supports os

templates/default/cg_foodcritic_tests.rb.erb

@@ -42,17 +42,22 @@ end
 
 rule 'CG001', 'Ensure all cookbook dependencies depend on a specific version' do
  tags %w(correctness metadata)
+ matches = []
+
  metadata do |ast|
- matches = []
  name = ast.xpath(%q{//command[ident/@value='name']})
 
  if name.to_s.match('<%= @matches %>')
  # Get and loop through the hash with dependencies
  # and check if they depend on a specific version
  dependency_versions(ast).each do |name,version|
- matches << name unless version.to_s != '' && /^(?:= )?\d+\.\d+\.\d+$/ === version.xpath(%q{@value}).to_s
+ unless version.to_s != '' && /^(?:= )?\d+\.\d+\.\d+$/ === version.xpath(%q{@value}).to_s
+ matches << name
+ end
  end
  end
- matches
  end
+
+ # Return any matches that we may have found
+ matches
 end