From 5dd9b20abb2250c0a94fc680acd985f9fd649377 Mon Sep 17 00:00:00 2001
From: David Hollinger III <david.hollinger@egov.com>
Date: Wed, 18 Jan 2017 15:36:57 -0600
Subject: [PATCH 1/2] modulesync 0.19.3

---
 .msync.yml   | 2 +-
 .pmtignore   | 1 +
 .rubocop.yml | 8 ++++++--
 .yardopts    | 1 +
 Gemfile      | 4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .pmtignore

diff --git a/.msync.yml b/.msync.yml
index acaa237ff..b42c48761 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.19.0'
+modulesync_config_version: '0.19.3'
diff --git a/.pmtignore b/.pmtignore
new file mode 100644
index 000000000..77f12ae2e
--- /dev/null
+++ b/.pmtignore
@@ -0,0 +1 @@
+docs/
diff --git a/.rubocop.yml b/.rubocop.yml
index 0e2866701..ef85ceb41 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -74,7 +74,7 @@ Style/WhileUntilModifier:
 Lint/AmbiguousRegexpLiteral:
   Enabled: True
 
-Lint/Eval:
+Security/Eval:
   Enabled: True
 
 Lint/BlockAlignment:
@@ -302,7 +302,7 @@ Style/EmptyLiteral:
 Metrics/LineLength:
   Enabled: False
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: True
 
 Style/MethodDefParentheses:
@@ -518,3 +518,7 @@ RSpec/RepeatedDescription:
 
 RSpec/NestedGroups:
   Enabled: False
+
+# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
+Security/YAMLLoad:
+  Enabled: false
diff --git a/.yardopts b/.yardopts
index 29c933bcf..3687f5184 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1 +1,2 @@
 --markup markdown
+--output-dir docs/
diff --git a/Gemfile b/Gemfile
index 09a4303d7..3bbbce90c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,9 @@ group :test do
   gem 'puppet-blacksmith',                                          :require => false
   gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
   gem 'puppet-strings', '~> 1.0.0',                                 :require => false
-  gem 'rubocop-rspec', '~> 1.9.0',                                  :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'redcarpet',                                                  :require => false
+  gem 'rubocop', '~> 0.47.0',                                       :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop-rspec', '~> 1.10.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
   gem 'mocha', '>= 1.2.1',                                          :require => false
   gem 'coveralls',                                                  :require => false
   gem 'simplecov-console',                                          :require => false

From a6282fa4421a0969f439ea8be6dbd5eb0d4c96e7 Mon Sep 17 00:00:00 2001
From: Rob Nelson <rnelson0@gmail.com>
Date: Fri, 20 Jan 2017 21:12:40 +0000
Subject: [PATCH 2/2] Remove repeated examples (rubocop)

---
 spec/classes/nginx_spec.rb | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
index 327aa1d9c..53ad6ddf5 100644
--- a/spec/classes/nginx_spec.rb
+++ b/spec/classes/nginx_spec.rb
@@ -1076,24 +1076,6 @@
             )
           )
         end
-        it do
-          is_expected.to contain_file('/etc/nginx/streams-available').without(
-            %w(
-              ignore
-              purge
-              recurse
-            )
-          )
-        end
-        it do
-          is_expected.to contain_file('/etc/nginx/streams-enabled').without(
-            %w(
-              ignore
-              purge
-              recurse
-            )
-          )
-        end
       end
 
       context 'when daemon_user = www-data' do