Merge pull request #45 from voxpupuli/modulesync

modulesync 2.7.0

4 files changed, 14 insertions, 36 deletions

diff --git a/.msync.yml b/.msync.yml
index 5cef8c2..5519891 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.6.0'
+modulesync_config_version: '2.7.0'
diff --git a/Gemfile b/Gemfile
index 6a74c57..24dbb7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'puppetlabs_spec_helper', '>= 2.11.0',                        :require => false
+  gem 'puppetlabs_spec_helper', '>= 2.14.0',                        :require => false
   gem 'rspec-puppet-facts', '>= 1.8.0',                             :require => false
   gem 'rspec-puppet-utils',                                         :require => false
   gem 'puppet-lint-leading_zero-check',                             :require => false
@@ -65,7 +65,7 @@ group :release do
   gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator'
   gem 'puppet-blacksmith',           :require => false
   gem 'voxpupuli-release',           :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
-  gem 'puppet-strings', '>= 1.0',    :require => false
+  gem 'puppet-strings', '>= 2.2',    :require => false
 end
 
 
diff --git a/Rakefile b/Rakefile
index a6cf0ac..09701d0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,20 +3,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
 # load optional tasks for releases
 # only available if gem group releases is installed
 begin
-  require 'puppet_blacksmith/rake_tasks'
   require 'voxpupuli/release/rake_tasks'
-  require 'puppet-strings/tasks'
 rescue LoadError
 end
 
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
-PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.absolute_classname_reverse = true
-PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_140chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 
 exclude_paths = %w(
   pkg/**/*
@@ -29,8 +21,7 @@ PuppetSyntax.exclude_paths = exclude_paths
 
 desc 'Auto-correct puppet-lint offenses'
 task 'lint:auto_correct' do
-  PuppetLint.configuration.fix = true
-  Rake::Task[:lint].invoke
+  Rake::Task[:lint_fix].invoke
 end
 
 desc 'Run acceptance tests'
@@ -38,10 +29,8 @@ RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
 end
 
-desc 'Run tests release_checks'
-task test: [
-  :release_checks,
-]
+desc 'Run tests'
+task test: [:release_checks]
 
 namespace :check do
   desc 'Check for trailing whitespace'
@@ -70,25 +59,10 @@ task test_with_coveralls: [:test] do
   end
 end
 
-desc "Print supported beaker sets"
-task 'beaker_sets', [:directory] do |t, args|
-  directory = args[:directory]
-
-  metadata = JSON.load(File.read('metadata.json'))
-
-  (metadata['operatingsystem_support'] || []).each do |os|
-    (os['operatingsystemrelease'] || []).each do |release|
-      if directory
-        beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
-      else
-        beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
-      end
-
-      filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
-
-      puts beaker_set if File.exists? filename
-    end
-  end
+desc 'Generate REFERENCE.md'
+task :reference, [:debug, :backtrace] do |t, args|
+  patterns = ''
+  Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
 end
 
 begin
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2f2279d..c53e703 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,10 @@
 # This file is managed via modulesync
 # https://github.com/voxpupuli/modulesync
 # https://github.com/voxpupuli/modulesync_config
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 include RspecPuppetFacts