modulesync 0.11.0

.github/ISSUE_TEMPLATE.md

@@ -1,26 +1,23 @@
-Please check the following items before submitting an issue -- thank you!
+<!--
+Thank you for contributing to this project!
+- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
+- Please check that here is no existing issue or PR that addresses your problem.
+- Please fill the following form to enable us to help you.
+-->
 
-Note that this project is released with a Contributor Code of Conduct.
-By participating in this project you agree to abide by its terms.
-[Contributor Code of Conduct](https://voxpupuli.org/coc/).
-
-- [ ] There is no existing issue or PR that addresses this problem
-
-Optional, but makes our lives much easier:
-
-- [ ] The issue affects the latest release of this module at the time of
-  submission
+### Affected Puppet, Ruby, OS and module versions/distributions
 
-- - -
+- Puppet:
+- Ruby:
+- Distribution:
+- Module version:
 
-### Affected Puppet, Ruby, OS and module versions/distributions
+### How to reproduce (e.g Puppet code you use)
 
 ### What are you seeing
 
 ### What behaviour did you expect instead
 
-### How did this behaviour get triggered
-
 ### Output log
 
 ### Any additional information you'd like to impart

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,33 +1,5 @@
-Please check the following items before submitting a PR -- thank you!
-
-Note that this project is released with a Contributor Code of Conduct.
-By participating in this project you agree to abide by its terms.
-[Contributor Code of Conduct](https://voxpupuli.org/coc/).
-
-- [ ] There is no existing PR that addresses this problem
-- [ ] Mentioned any existing issues in your commit so they get linked and
-  closed once this PR gets merged, i.e: `Closes #1554` in the body of a commit
-- [ ] Followed the instructions in the [Contributing](CONTRIBUTING.md) document
-- [ ] Ran the unit/spec tests and ensured they still pass
-- [ ] Added tests to cover the new behaviour
-- [ ] Updated the documentation to match the changes
-- [ ] When possible, add an entry to the CHANGELOG file
-- [ ] Squashed your PR down to a single commit. You may forego this if the PR
-  tries to address multiple issues. Though we prefer one PR per feature/fix,
-  sometimes that's not feasible. In that case ensure that a single feature/fix
-  and associated tests and documentation is bundled up in one commit
-
-Optional, but extra points:
-
-- [ ] Added tests to ensure the old behaviour cannot accidentally be
-  reintroduced
-
-- - -
-
 <!--
-Please provide further information about your PR.
-It should contain all the necessary information for the maintainers to be
-able to understand the issue at hand and the code behind fixing it.
-
-PROVIDE THIS INFORMATION OUTSIDE OF THIS COMMENT BLOCK OR DELETE THIS BLOCK
+Thank you for contributing to this project!
+- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
+- Please check that here is no existing issue or PR that addresses your problem.
 -->

.msync.yml

@@ -0,0 +1 @@
+modulesync_config_version: '0.11.0'

.rubocop.yml

@@ -258,7 +258,7 @@ Style/Documentation:
 Style/DefWithParentheses:
   Enabled: true
 
-Style/DeprecatedHashMethods:
+Style/PreferredHashMethods:
   Enabled: true
 
 Style/DotPosition:

.travis.yml

@@ -25,6 +25,8 @@ matrix:
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.2
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=build
   - rvm: 2.3.1
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
   - rvm: 2.3.1
@@ -41,4 +43,4 @@ deploy:
     # all_branches is required to use tags
     all_branches: true
     # Only publish if our main Ruby target builds
-    rvm: 2.2
+    rvm: 2.3.1

Gemfile

@@ -27,9 +27,9 @@ end
 
 
 if facterversion = ENV['FACTER_GEM_VERSION']
-gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
+  gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
 else
-gem 'facter', :require => false, :groups => [:test]
+  gem 'facter', :require => false, :groups => [:test]
 end
 
 ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s

Rakefile

@@ -1,12 +1,15 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
 require 'voxpupuli/release/rake_tasks'
-require 'rubocop/rake_task'
 require 'puppet-strings/rake_tasks'
 
-RuboCop::RakeTask.new(:rubocop) do |task|
-  # These make the rubocop experience maybe slightly less terrible
-  task.options = ['-D', '-S', '-E']
+if RUBY_VERSION >= '2.0.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}'

spec/default_facts.yml

@@ -0,0 +1,6 @@
+---
+concat_basedir: "/tmp"
+ipaddress: "172.16.254.254"
+is_pe: false
+macaddress: "AA:AA:AA:AA:AA:AA"
+selinux_config_mode: "disabled"

spec/spec_helper.rb

@@ -3,15 +3,14 @@
 include RspecPuppetFacts
 
 RSpec.configure do |c|
-  c.default_facts = {
-    concat_basedir: '/tmp',
-    is_pe: false,
-    selinux_config_mode: 'disabled',
+  default_facts = {
     puppetversion: Puppet.version,
-    facterversion: Facter.version,
-    ipaddress: '172.16.254.254',
-    macaddress: 'AA:AA:AA:AA:AA:AA',
+    facterversion: Facter.version
   }
+  default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_facts.yml')
+  default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_module_facts.yml')
+  c.default_facts = default_facts
 end
- require 'spec_helper_methods'
+
+require 'spec_helper_methods'
 # vim: syntax=ruby