Merge pull request #1004 from voxpupuli/pr_1001

Modulesync 0.19.3
voxpupuli · Jan 20, 2017 · ad35502 · ad35502
2 parents 1b578f5 + a6282fa
commit ad35502
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 22 deletions.
diff --git 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
@@ -0,0 +1 @@
+docs/
diff --git 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
@@ -1 +1,2 @@
 --markup markdown
+--output-dir docs/
diff --git 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

diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		modulesync_config_version: '0.19.0'
		modulesync_config_version: '0.19.3'
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@