modulesync 0.11.0

5 files changed, 24 insertions, 16 deletions

diff --git a/.msync.yml b/.msync.yml
index efd68b6..365ad97 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.9.1'
+modulesync_config_version: '0.11.0'
diff --git a/Gemfile b/Gemfile
index 90188fe..20a6af0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,10 +23,11 @@ group :test do
   gem 'puppet-lint-unquoted_string-check',                          :require => false
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
   gem 'metadata-json-lint',                                         :require => false
-  gem 'puppet-blacksmith',                                          :require => false, :git => 'https://github.com/voxpupuli/puppet-blacksmith.git'
+  gem 'puppet-blacksmith',                                          :require => false
   gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
   gem 'puppet-strings',                                             :require => false, :git => 'https://github.com/puppetlabs/puppetlabs-strings.git'
-  gem 'rubocop-rspec', '~> 1.5',                                    :require => false
+  gem 'rubocop-rspec', '~> 1.5',                                    :require => false if RUBY_VERSION >= '2.0.0'
+  gem 'json_pure', '<= 2.0.1',                                      :require => false if RUBY_VERSION < '2.0.0'
 end
 
 group :development do
@@ -50,9 +51,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
diff --git a/Rakefile b/Rakefile
index 56ffc74..f741443 100644
--- a/Rakefile
+++ b/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}'
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
new file mode 100644
index 0000000..a3f52bf
--- /dev/null
+++ b/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"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 047b126..92c8cbe 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,15 +3,13 @@ require 'rspec-puppet-facts'
 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
 
 # vim: syntax=ruby