From 42e4a293814e124ba6baa4fe0598ab61d1265e7b Mon Sep 17 00:00:00 2001 From: Bren Briggs Date: Tue, 11 Oct 2016 09:46:30 -0400 Subject: modulesync 0.13.0 --- .github/CONTRIBUTING.md | 9 +++++++-- .msync.yml | 2 +- Rakefile | 11 +---------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5b09ea6..e61f265 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -52,6 +52,11 @@ check various syntax and style things. You can run these locally with: bundle exec rake lint bundle exec rake validate +It will also run some [Rubocop](http://batsov.com/rubocop/) tests +against it. You can run those locally ahead of time with: + + bundle exec rake rubocop + ## Running the unit tests The unit test suite covers most of the code, as mentioned above please @@ -85,9 +90,9 @@ with: bundle exec rake acceptance This will run the tests on an Ubuntu 12.04 virtual machine. You can also -run the integration tests against Centos 6.5 with. +run the integration tests against Centos 6.6 with. - BEAKER_set=centos-64-x64 bundle exec rake acceptances + BEAKER_set=centos-66-x64 bundle exec rake acceptances If you don't want to have to recreate the virtual machine every time you can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will diff --git a/.msync.yml b/.msync.yml index 42eea23..c5e3e79 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '0.12.8' +modulesync_config_version: '0.13.0' diff --git a/Rakefile b/Rakefile index 5191307..35ee06a 100644 --- a/Rakefile +++ b/Rakefile @@ -3,16 +3,7 @@ require 'puppet_blacksmith/rake_tasks' require 'voxpupuli/release/rake_tasks' require 'puppet-strings/rake_tasks' -if RUBY_VERSION >= '2.3.0' - require 'rubocop/rake_task' - - RuboCop::RakeTask.new(:rubocop) do |task| - # These make the rubocop experience maybe slightly less terrible - task.options = ['-D', '-S', '-E'] - end -end - -PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{check}:%{KIND}:%{message}' +PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}' PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.send('relative') PuppetLint.configuration.send('disable_140chars') -- cgit v1.2.3