Merge pull request #672 from voxpupuli/modulesync

Modulesync 0.21.3

.fixtures.yml

@@ -6,7 +6,6 @@ fixtures:
       repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
     concat:
       repo: 'git://github.com/puppetlabs/puppetlabs-concat'
-      ref: '2.1.0'
     epel:
       repo: 'https://github.com/stahnma/puppet-module-epel'
   symlinks:

.gitignore

@@ -17,3 +17,4 @@ Puppetfile.lock
 *.iml
 .*.sw?
 .yardoc/
+Guardfile

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '0.21.0'
+modulesync_config_version: '0.21.3'

.rspec_parallel

@@ -0,0 +1 @@
+--format progress

.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
     - spec/fixtures/**/*
     - Gemfile
     - Rakefile
+    - Guardfile
 Lint/ConditionPosition:
   Enabled: True
 
@@ -502,6 +503,10 @@ Style/ClosingParenthesisIndentation:
 
 # RSpec
 
+RSpec/BeforeAfterAll:
+  Exclude:
+    - spec/acceptance/**/*
+
 # We don't use rspec in this way
 RSpec/DescribeClass:
   Enabled: False
@@ -524,6 +529,7 @@ RSpec/NestedGroups:
 # this is broken on ruby1.9
 Style/IndentHeredoc:
   Enabled: False
+
 # disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
 Security/YAMLLoad:
   Enabled: false

Gemfile

@@ -35,6 +35,7 @@ group :test do
   gem 'github_changelog_generator', '~> 1.13.0',                    :require => false if RUBY_VERSION < '2.2.2'
   gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
   gem 'github_changelog_generator',                                 :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'parallel_tests',                                             :require => false
 end
 
 group :development do

spec/acceptance/nodesets/archlinux-2-x64.yml

@@ -0,0 +1,13 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  archlinux-2-x64:
+    roles:
+      - master
+    platform: archlinux-2-x64
+    box: archlinux/archlinux
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/default_module_facts.yml

@@ -1,6 +1,3 @@
 ---
 collectd_version: '5.5.0'
 python_dir: '/usr/local/lib/python2.7/dist-packages'
-operatingsystem: 'Debian'
-lsbdistid: 'Debian'
-lsbdistcodename: 'wheezy'

spec/spec_helper_methods.rb

@@ -1,5 +1,5 @@
 def os_specific_options(facts)
-  case facts[:osfamily]
+  case facts[:os]['family']
   when 'Gentoo'
     { package: 'app-admin/collectd', service: 'collectd', plugin_conf_dir: '/etc/collectd.d' }
   when 'Solaris'