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 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