Merge pull request #225 from voxpupuli/modulesync

Modulesync + Release
voxpupuli · May 20, 2016 · b684258 · b684258
2 parents df89e6c + 520cd6a
commit b684258
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,4 @@
+require: rubocop-rspec
 AllCops:
   TargetRubyVersion: 1.9
   Include:
@@ -60,6 +61,7 @@ Style/RedundantSelf:
 Metrics/MethodLength:
   Enabled: false
 
+# Module length is not necessarily an indicator of code quality
 Metrics/ModuleLength:
   Enabled: false
 
@@ -159,6 +161,7 @@ Style/ClassAndModuleChildren:
 Style/ClassCheck:
   Enabled: true
 
+# Class length is not necessarily an indicator of code quality
 Metrics/ClassLength:
   Enabled: false
 
@@ -243,6 +246,7 @@ Style/ColonMethodCall:
 Style/CommentAnnotation:
   Enabled: true
 
+# 'Complexity' is very relative
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -291,6 +295,7 @@ Style/EmptyLinesAroundAccessModifier:
 Style/EmptyLiteral:
   Enabled: true
 
+# Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Enabled: false
 
@@ -474,11 +479,11 @@ Style/BlockDelimiters:
 Style/MultilineBlockLayout:
   Enabled: true
 
-# These cops are enabled by default, they have been disabled to get started with Rubocop
-# They should be re-evaluated soonish - rnelson0, 2/1/2016
+# 'Complexity' is very relative
 Metrics/AbcSize:
   Enabled: False
 
+# 'Complexity' is very relative
 Metrics/PerceivedComplexity:
   Enabled: False
 
@@ -487,3 +492,7 @@ Lint/UselessAssignment:
 
 Style/ClosingParenthesisIndentation:
   Enabled: false
+
+# RSpec
+RSpec/DescribeClass:
+  Enabled: False
diff --git a/.sync.yml b/.sync.yml
@@ -1,3 +1,5 @@
 ---
 .travis.yml:
   secure: "ijm7hKPYWr1eg7151g5oK6MzZL4ojrgWjKlxgoBHXAdXdY88opMgvixfSJK5IMUbtanPfWRkqqABx+MYO78nfQBWDlghUzZ8sQXFeO2Ie0PgWl4nFV0kKWz+ejVaZC4dKSZlWha5pO1ek+sx7KnjIBZY82OXs/GXbjwhHx6d56YugXLuCyvfFxC7mXC9wF58bPwcYRCBSZt9CRl0OMBAFybxjdwsFMloRRhdz7f3hhlqF8Nrs1sxG1HhgiMcnrZqovNfb3Tw9K1RPYATazXxQrjcI7YHvJx0AvtHFUsn+/A0GtpKUuuPbaVdkYgE1Tye0AsAcey6RW4xhJywZglKrzDk7vfyUiU5CObeLh4/dhub3k111rDPL8v6v9t40fteduJoFLziHotQwdl37UALL7PwWZY5HuJvaBqHY2LsGs/ptGMB9ZCzxA85jfDw8lrZQ7P97SAoC34Ihs8D6vkKT9HUKHIXh19O5AAa70jReru0ej179IBjvs8m9nDwDNdY3sIsdhUU8WQ3BftDF6M8OzvgyLKDvjSs1Izag+Asl2Ze7RAQfQ2RvbfkDm9KEFnDQtXtzF4Cu1Ed6io2j1zI71JFQpIf6zb1qeNrhqulbJ15owGkQmHBgD8K+bDd1CCU4kA26axypV00XDsjfwdtFHgtUO3AlUVUim0QTMk9ATc="
+spec_helper.rb:
+  spec_overrides: "require 'spec_helper_methods'"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2016-5-19 Release 2.3.1
+
+  * Fix: correct path to DB schema on all RHEL systems
+  * Fix: don't deal with selinux on non RHEL systems
+  * Maintenance: modulesync with voxpupuli defaults
+  * enhance test matrix
+  * enhance code coverage
+  * bump required stdlib version from 4.1.0 to 4.4.0
+
 ## 2016-5-08 Release 2.3.0
 
   * fix typo/missing code in userparameters

diff --git a/Gemfile b/Gemfile
@@ -27,7 +27,7 @@ group :test do
   gem 'puppet-blacksmith',                                          :require => false, :git => 'https://github.com/voxpupuli/puppet-blacksmith.git'
   gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
   gem 'puppet-strings',                                             :require => false, :git => 'https://github.com/puppetlabs/puppetlabs-strings.git'
-  gem 'rubocop', '~> 0.39',                                         :require => false
+  gem 'rubocop-rspec', '~> 1.4',                                    :require => false
 end
 
 group :development do

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-zabbix",
-  "version": "2.3.1-rc0",
+  "version": "2.3.1",
   "summary": "Installing and maintaining Zabbix. Will install server, proxy, java-gateway and agent on RedHat/Debian/Ubuntu (Incl. exported resources).",
   "author": "Voxpupuli",
   "dependencies": [

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,11 +1,4 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
+require 'spec_helper_methods'
 include RspecPuppetFacts
-
-def mocked_facts
-  {
-    concat_basedir: '/tmp',
-    is_pe: false,
-    selinux_config_mode: 'disabled'
-  }
-end
diff --git a/spec/spec_helper_methods.rb b/spec/spec_helper_methods.rb
@@ -0,0 +1,7 @@
+def mocked_facts
+  {
+    concat_basedir: '/tmp',
+    is_pe: false,
+    selinux_config_mode: 'disabled'
+  }
+end