Merge pull request #23 from TelekomLabs/update-common

thank you
dev-sec · Oct 28, 2014 · 8b6a416 · 8b6a416
2 parents 8b140c4 + 347e022
commit 8b6a416
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,11 +1,8 @@
+---
 AllCops:
-  Excludes:
-    - vendor/**
-    - metadata.rb
-    - '**/Puppetfile'
-    - Puppetfile
-
-
+  Exclude:
+  - vendor/**/*
+  - "*/puppet/Puppetfile"
 Documentation:
   Enabled: false
 AlignParameters:
@@ -17,6 +14,10 @@ HashSyntax:
 LineLength:
   Enabled: false
 MethodLength:
-  Max: 30
+  Max: 40
 NumericLiterals:
   MinDigits: 10
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10
diff --git a/default/serverspec/spec_helper.rb b/default/serverspec/spec_helper.rb
@@ -60,10 +60,4 @@
   require 'serverspec'
 
   set :backend, :exec
-
-  RSpec.configure do |c|
-    c.before :all do
-      c.path = '/sbin:/usr/sbin'
-    end
-  end
 end
diff --git a/lockdown/serverspec/spec_helper.rb b/lockdown/serverspec/spec_helper.rb
@@ -60,10 +60,4 @@
   require 'serverspec'
 
   set :backend, :exec
-
-  RSpec.configure do |c|
-    c.before :all do
-      c.path = '/sbin:/usr/sbin'
-    end
-  end
 end