Merge pull request #4 from TelekomLabs/update-common

updating common files

Author: chris-rock

.kitchen.yml

@@ -1,10 +1,9 @@
 ---
-
 driver:
   name: vagrant
 provisioner:
   name: puppet_apply
-  test_repo_uri: "https://github.com/TelekomLabs/tests-apache-hardening.git"
+  test_repo_uri: https://github.com/TelekomLabs/tests-apache-hardening.git
 platforms:
 - name: ubuntu-12.04
   driver_config:
@@ -20,26 +19,24 @@ platforms:
     box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
 - name: centos-6.5
   driver_config:
-     box: opscode-centos-6.5
-     box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
-# - name: oracle-6.4
-#   driver_config:
-#     box: oracle-6.4
-#     box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
+    box: opscode-centos-6.5
+    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
+- name: oracle-6.4
+  driver_config:
+    box: oracle-6.4
+    box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
 - name: oracle-6.5
   driver_config:
     box: oracle-6.5
     box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
 - name: debian-6
   driver_config:
     box: debian-6
-    box_url: https://googledrive.com/host/0B83ZToJ3fGtDeE9KWm1sWndZdGs/debian-6.0.10-amd64_virtualbox.box
+    box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-6.0.10-amd64_virtualbox.box
 - name: debian-7
   driver_config:
     box: debian-7
-    box_url: https://googledrive.com/host/0B83ZToJ3fGtDVC1DeVVzc3lkc0U/debian-7.6.0-amd64_virtualbox.box  
+    box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-7.7.0-amd64_virtualbox.box
 suites:
 - name: default
   manifest: site.pp
-
-

.rubocop.yml

@@ -1,12 +1,10 @@
+---
 AllCops:
   Exclude:
-    - vendor/**
-    - metadata.rb
-    - '**/Puppetfile'
-    - Puppetfile
-    - Gemfile
-    - 'test/integration/**/*'
-
+  - vendor/**/*
+  - test/**/*
+  - spec/fixtures/**/*
+  - Puppetfile
 Documentation:
   Enabled: false
 AlignParameters:
@@ -17,7 +15,15 @@ HashSyntax:
   Enabled: false
 LineLength:
   Enabled: false
+EmptyLinesAroundBlockBody:
+  Enabled: false
 MethodLength:
-  Max: 30
+  Max: 40
 NumericLiterals:
   MinDigits: 10
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10
+Metrics/AbcSize:
+  Max: 29

Gemfile

@@ -2,7 +2,8 @@
 
 source 'https://rubygems.org'
 
-if puppetversion = ENV['PUPPET_VERSION']
+puppetversion = ENV['PUPPET_VERSION']
+if puppetversion
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false