Merge pull request #570 from voxpupuli/modulesync

modulesync 2.10.1

Author: dhoppe

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.9.0'
+modulesync_config_version: '2.10.1'

.rubocop.yml

@@ -1,6 +1,6 @@
 require: rubocop-rspec
 AllCops:
-  TargetRubyVersion: 1.9
+  TargetRubyVersion: 2.1
   Include:
     - ./**/*.rb
   Exclude:
@@ -545,4 +545,4 @@ RSpec/FilePath:
   Enabled: false
 
 RSpec/MessageSpies:
-  EnforcedStyle: receive
+   EnforcedStyle: receive

.travis.yml

@@ -3,8 +3,7 @@ dist: bionic
 language: ruby
 cache: bundler
 before_install:
-  - gem update --system
-  - gem update bundler
+  - yes | gem update --system
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
@@ -37,6 +36,7 @@ branches:
   - /^v\d/
 notifications:
   email: false
+  webhooks: https://voxpupu.li/incoming/travis
   irc:
     on_success: always
     on_failure: always

Gemfile

@@ -20,7 +20,7 @@ group :test do
   gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
   gem 'puppet-lint-unquoted_string-check',                          :require => false
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
-  gem 'puppet-lint-absolute_classname-check',                       :require => false
+  gem 'puppet-lint-absolute_classname-check', '>= 2.0.0',           :require => false
   gem 'puppet-lint-topscope-variable-check',                        :require => false
   gem 'puppet-lint-legacy_facts-check',                             :require => false
   gem 'puppet-lint-anchor-check',                                   :require => false

Rakefile

@@ -8,16 +8,6 @@ rescue LoadError
 end
 
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
-PuppetLint.configuration.absolute_classname_reverse = true
-
-exclude_paths = %w(
-  pkg/**/*
-  vendor/**/*
-  .vendor/**/*
-  spec/**/*
-)
-PuppetLint.configuration.ignore_paths = exclude_paths
-PuppetSyntax.exclude_paths = exclude_paths
 
 desc 'Auto-correct puppet-lint offenses'
 task 'lint:auto_correct' do

spec/spec_helper.rb

@@ -48,10 +48,14 @@
   # Otherwise we need to match the correct facter version to the used puppet version.
   # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
   # https://puppet.com/docs/puppet/5.5/about_agent.html
+  #
+  # The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
+  # if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
   c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
                                ENV['FACTERDB_FACTS_VERSION']
                              else
-                               Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
+                               puppet_version = ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : Gem.loaded_specs['puppet'].version.to_s
+                               Gem::Dependency.new('', puppet_version).match?('', '5') ? '3.11.0' : '3.14.0'
                              end
 
   # Coverage generation