Merge pull request #3 from dhoppe/modulesync

Update based on voxpupuli/modulesync_config 0.14.1

.github/CONTRIBUTING.md

@@ -52,6 +52,11 @@ check various syntax and style things. You can run these locally with:
     bundle exec rake lint
     bundle exec rake validate
 
+It will also run some [Rubocop](http://batsov.com/rubocop/) tests
+against it. You can run those locally ahead of time with:
+
+    bundle exec rake rubocop
+
 ## Running the unit tests
 
 The unit test suite covers most of the code, as mentioned above please
@@ -85,9 +90,9 @@ with:
     bundle exec rake acceptance
 
 This will run the tests on an Ubuntu 12.04 virtual machine. You can also
-run the integration tests against Centos 6.5 with.
+run the integration tests against Centos 6.6 with.
 
-    BEAKER_set=centos-64-x64 bundle exec rake acceptances
+    BEAKER_set=centos-66-x64 bundle exec rake acceptances
 
 If you don't want to have to recreate the virtual machine every time you
 can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '0.12.8'
+modulesync_config_version: '0.14.1'

.rubocop.yml

@@ -57,6 +57,9 @@ Style/AndOr:
 Style/RedundantSelf:
   Enabled: True
 
+Metric/BlockLength:
+  Enabled: False
+
 # Method length is not necessarily an indicator of code quality
 Metrics/MethodLength:
   Enabled: False

.sync.yml

@@ -1,5 +1,18 @@
 ---
 .travis.yml:
+  includes:
+  - rvm: 2.1.9
+    env: PUPPET_VERSION="~> 4.0" CHECK=test
+  - rvm: 2.2.5
+    env: PUPPET_VERSION="~> 4.0" CHECK=test
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 4.0" CHECK=test
+  - rvm: 2.4.0-preview1
+    env: PUPPET_VERSION="~> 4.0" CHECK=test
   secure: "TQIJuEAqgRpwv/nBrJwZziOuLohxsA6+mH6J1VD6ld6CAwpbrW3p0wn6UE/72SdWBPuoV3FxoXQHRZKoZLG6CKxbvFJ4+XpVN5g/LFNU6AxRHC5SlZA2Ushmyo8EAUjUZqCBI/vpJD0vfHmIU6p9cTdZOqWyR49tMSxAUikQQ/cr+r/bMFU3WFNRNOdULhhHtNQRXHZKaOr5fFBuBlKDk2SrVRSzHCq4wUKooOJUsX0C4f90SZ5p22bWKvHTce7hmZ6GioZ1sEEgr/1I09ZGmAq3w0mo0llAa8mZKqqTx20rlVE96G9bIx9X6fNzXnDiGYW2EY0JNNC1pQkjnKRnF9752/Z7UKdGymyqrtZlMFsUViF5wQ3pcrmcWwObDdGHu2PYqqtSYbHJPnDHlLUL9qR/8pGZgQSbpFWynHpmqt4qXIFNqZ2TPPoc3n5EOf2IYgSuKaIYISszDhUQaCC/5rl7ojlNVfAX2tCMeWPY/ihhDdOLTg3yGutF2KCoyH6u+edYEd4L5hLRmetzrNjgwI6WnAiES9XGGDOaGVHTrn7KrvpFg8R9D7FZgAAM+0QAT4/MhOcvMHk2qNbbS2wWHHBMxqaXniF2YuM2sJxL6a8iZxLUXuUaE1TtrH7hZNIPIx5p+BDZ9AVobvQ8n/Q8vJ45AKxK9uKyN555nBE2z8s="
 Rakefile:
   exclude_paths:

.travis.yml

@@ -15,8 +15,6 @@ script:
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
   - rvm: 2.1.9
     env: PUPPET_VERSION="~> 4.0" CHECK=test
   - rvm: 2.2.5

Gemfile

@@ -25,9 +25,11 @@ group :test do
   gem 'metadata-json-lint',                                         :require => false
   gem 'puppet-blacksmith',                                          :require => false
   gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
-  gem 'puppet-strings', '0.4.0',                                    :require => false
+  gem 'puppet-strings', '~> 0.99.0',                                :require => false
   gem 'rubocop-rspec', '~> 1.6',                                    :require => false if RUBY_VERSION >= '2.3.0'
   gem 'json_pure', '<= 2.0.1',                                      :require => false if RUBY_VERSION < '2.0.0'
+  gem 'mocha', '>= 1.2.1',                                          :require => false
+  gem 'coveralls',                                                  :require => false if RUBY_VERSION >= '2.0.0'
 end
 
 group :development do
@@ -45,6 +47,7 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
+  gem 'serverspec',                    :require => false
   gem 'beaker-puppet_install_helper',  :require => false
 end
 

Rakefile

@@ -1,18 +1,9 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
 require 'voxpupuli/release/rake_tasks'
-require 'puppet-strings/rake_tasks'
+require 'puppet-strings/tasks'
 
-if RUBY_VERSION >= '2.3.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}'
+PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_140chars')

spec/acceptance/nodesets/centos-511-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   centos-511-x64:
     roles:

spec/acceptance/nodesets/centos-66-x64-pe.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   centos-66-x64:
     roles:

spec/acceptance/nodesets/centos-66-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   centos-66-x64:
     roles:

spec/acceptance/nodesets/centos-72-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   centos-72-x64:
     roles:

spec/acceptance/nodesets/debian-78-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   debian-78-x64:
     roles:

spec/acceptance/nodesets/debian-82-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   debian-82-x64:
     roles:

spec/acceptance/nodesets/docker/centos-5.yml

@@ -0,0 +1,22 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  centos-5-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: el-5-x86_64
+    hypervisor : docker
+    image: tianon/centos:5.10
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget which'
+      - 'sed -i -e "/mingetty/d" /etc/inittab'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/centos-6.yml

@@ -0,0 +1,23 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  centos-6-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: el-6-x86_64
+    hypervisor : docker
+    image: centos:6
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'rm -rf /var/run/network/*'
+      - 'yum install -y crontabs tar wget'
+      - 'rm /etc/init/tty.conf'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/centos-7.yml

@@ -0,0 +1,21 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  centos-7-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: el-7-x86_64
+    hypervisor : docker
+    image: centos:7
+    docker_preserve_image: true
+    docker_cmd: '["/usr/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget iproute'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/debian-7.yml

@@ -0,0 +1,21 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  debian-7-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: debian-7-amd64
+    hypervisor : docker
+    image: debian:7
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron locales-all net-tools wget'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/debian-8.yml

@@ -0,0 +1,22 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  debian-8-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: debian-8-amd64
+    hypervisor : docker
+    image: debian:8
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron locales-all net-tools wget'
+      - 'rm -f /usr/sbin/policy-rc.d'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/ubuntu-12.04.yml

@@ -0,0 +1,22 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  ubuntu-1204-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-12.04-amd64
+    hypervisor : docker
+    image: ubuntu:12.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/ubuntu-14.04.yml

@@ -0,0 +1,24 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  ubuntu-1404-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-14.04-amd64
+    hypervisor : docker
+    image: ubuntu:14.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/docker/ubuntu-16.04.yml

@@ -0,0 +1,22 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  ubuntu-1604-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-16.04-amd64
+    hypervisor : docker
+    image: ubuntu:16.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   ubuntu-server-1204-x64:
     roles:

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -1,4 +1,7 @@
 ---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
 HOSTS:
   ubuntu-server-1404-x64:
     roles:

spec/acceptance/nodesets/ubuntu-server-1604-x64.yml

@@ -0,0 +1,15 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  ubuntu-server-1604-x64:
+    roles:
+      - master
+    platform: ubuntu-16.04-amd64
+    box: puppetlabs/ubuntu-16.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  type: foss
+...
+# vim: syntax=yaml

spec/spec_helper.rb

@@ -2,6 +2,11 @@
 require 'rspec-puppet-facts'
 include RspecPuppetFacts
 
+unless RUBY_VERSION =~ %r{^1.9}
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 RSpec.configure do |c|
   default_facts = {
     puppetversion: Puppet.version,