Merge pull request #117 from voxpupuli/modulesync

modulesync 0.21.0

Author: dhoppe

.github/CONTRIBUTING.md

@@ -98,3 +98,7 @@ 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
 at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
 for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
+
+The easiest way to debug in a docker container is to open a shell:
+
+    docker exec -it -u root ${container_id_or_name} bash

.msync.yml

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

.overcommit.yml

@@ -0,0 +1,63 @@
+# Managed by https://github.com/voxpupuli/modulesync_configs
+#
+# Hooks are only enabled if you take action.
+#
+# To enable the hooks run:
+#
+# ```
+# bundle exec overcommit --install
+# # ensure .overcommit.yml does not harm to you and then
+# bundle exec overcommit --sign
+# ```
+#
+# (it will manage the .git/hooks directory):
+#
+# Examples howto skip a test for a commit or push:
+#
+# ```
+# SKIP=RuboCop git commit
+# SKIP=PuppetLint git commit
+# SKIP=RakeTask git push
+# ```
+#
+# Don't invoke overcommit at all:
+#
+# ```
+# OVERCOMMIT_DISABLE=1 git commit
+# ```
+#
+# Read more about overcommit: https://github.com/brigade/overcommit
+#
+# To manage this config yourself in your module add
+#
+# ```
+# .overcommit.yml:
+#   unmanaged: true
+# ```
+#
+# to your modules .sync.yml config
+---
+PreCommit:
+  RuboCop:
+    enabled: true
+    description: 'Runs rubocop on modified files only'
+    command: ['bundle', 'exec', 'rubocop']
+  PuppetLint:
+    enabled: true
+    description: 'Runs puppet-lint on modified files only'
+    command: ['bundle', 'exec', 'puppet-lint']
+  YamlSyntax:
+    enabled: true
+  JsonSyntax:
+    enabled: true
+  TrailingWhitespace:
+    enabled: true
+
+PrePush:
+  RakeTarget:
+    enabled: true
+    description: 'Run rake targets'
+    targets:
+      - 'test'
+      - 'rubocop'
+    command: [ 'bundle', 'exec', 'rake' ]

.rubocop.yml

@@ -9,6 +9,8 @@ AllCops:
     - .vendor/**/*
     - pkg/**/*
     - spec/fixtures/**/*
+    - Gemfile
+    - Rakefile
 Lint/ConditionPosition:
   Enabled: True
 

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 dist: trusty
 language: ruby
 cache: bundler
-bundler_args: --without system_tests development
 before_install:
   - bundle -v
   - rm Gemfile.lock || true
@@ -17,27 +16,33 @@ matrix:
   fast_finish: true
   include:
   - rvm: 2.1.9
+    bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.2.6
+  - rvm: 2.2.7
+    bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.3.3
+  - rvm: 2.3.4
+    bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.4.0
+  - rvm: 2.4.1
+    bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.4.0
+  - rvm: 2.4.1
+    bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
-  - rvm: 2.4.0
+  - rvm: 2.4.1
+    bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
   - rvm: 2.4.0
+    bundler_args: --without development
     env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_set="docker/debian-8" bundle exec rake acceptance
     services: docker
     sudo: required
-    bundler_args: --without development
   - rvm: 2.4.0
+    bundler_args: --without development
     env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_set="docker/centos-7" bundle exec rake acceptance
     services: docker
     sudo: required
-    bundler_args: --without development
 branches:
   only:
   - master

Gemfile

@@ -11,8 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'puppetlabs_spec_helper', '~> 2.0.1',                         :require => false
-  gem 'parallel_tests',                                             :require => false
+  gem 'puppetlabs_spec_helper', '~> 2.1.1',                         :require => false
   gem 'rspec-puppet', '~> 2.5',                                     :require => false
   gem 'rspec-puppet-facts',                                         :require => false
   gem 'rspec-puppet-utils',                                         :require => false
@@ -26,10 +25,10 @@ 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', '~> 1.0.0',                                 :require => false
+  gem 'puppet-strings', '~> 1.0',                                   :require => false
   gem 'redcarpet',                                                  :require => false
-  gem 'rubocop', '~> 0.47.0',                                       :require => false if RUBY_VERSION >= '2.3.0'
-  gem 'rubocop-rspec', '~> 1.10.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop', '~> 0.48.0',                                       :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop-rspec', '~> 1.15.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
   gem 'mocha', '>= 1.2.1',                                          :require => false
   gem 'coveralls',                                                  :require => false
   gem 'simplecov-console',                                          :require => false
@@ -39,9 +38,10 @@ group :test do
 end
 
 group :development do
-  gem 'travis',       :require => false
-  gem 'travis-lint',  :require => false
-  gem 'guard-rake',   :require => false
+  gem 'travis',                   :require => false
+  gem 'travis-lint',              :require => false
+  gem 'guard-rake',               :require => false
+  gem 'overcommit', '~> 0.39.1',  :require => false
 end
 
 group :system_tests do

spec/classes/client_spec.rb

@@ -6,6 +6,7 @@
       let(:facts) do
         facts
       end
+
       case facts[:osfamily]
       when 'Redhat'
         context 'with all defaults' do
@@ -25,6 +26,7 @@
               version: '3.6.1'
             }
           end
+
           it 'includes gluster::install with version 3.6.1' do
             is_expected.to create_class('gluster::install').with(
               repo: true,
@@ -39,6 +41,7 @@
               repo: false
             }
           end
+
           it 'includes gluster::install with repo=>false' do
             is_expected.to create_class('gluster::install').with(
               repo: false,
@@ -65,6 +68,7 @@
               version: '3.6.1'
             }
           end
+
           it 'includes gluster::install with version 3.6.1' do
             is_expected.to create_class('gluster::install').with(
               repo: true,
@@ -79,6 +83,7 @@
               repo: false
             }
           end
+
           it 'includes gluster::install with repo=>false' do
             is_expected.to create_class('gluster::install').with(
               repo: false,

spec/classes/init_spec.rb

@@ -6,6 +6,7 @@
       let(:facts) do
         facts
       end
+
       case facts[:osfamily]
       when 'Redhat'
         context 'with all defaults' do
@@ -42,6 +43,7 @@
               repo: false
             }
           end
+
           it 'creates gluster::install' do
             is_expected.to create_class('gluster::install').with(
               server: true,
@@ -97,6 +99,7 @@
               repo: false
             }
           end
+
           it 'creates gluster::install' do
             is_expected.to create_class('gluster::install').with(
               server: true,
@@ -139,6 +142,7 @@
             }
           }
         end
+
         it 'creates gluster::volume' do
           is_expected.to contain_gluster__volume('data1').with(
             name: 'data1',
@@ -152,9 +156,10 @@
       context 'when volumes incorrectly defined' do
         let :params do
           {
-            volumes: { 'data1' => %w(this is an array) }
+            volumes: { 'data1' => %w[this is an array] }
           }
         end
+
         it 'fails' do
           expect do
             is_expected.to contain_gluster__volume('data1')

spec/classes/install_spec.rb

@@ -9,6 +9,7 @@
       let :pre_condition do
         'require ::gluster::service'
       end
+
       context 'with defaults' do
         it { is_expected.to compile.with_all_deps }
         case facts[:osfamily]
@@ -28,12 +29,14 @@
         let :params do
           { repo: false }
         end
+
         it { is_expected.not_to create_class('gluster::repo') }
       end
       context 'when client is false' do
         let :params do
           { client: false }
         end
+
         case facts[:osfamily]
         when 'Redhat'
           it { is_expected.not_to create_package('glusterfs-fuse') }
@@ -45,6 +48,7 @@
         let :params do
           { server: false }
         end
+
         case facts[:osfamily]
         when 'Redhat', 'Debian'
           it { is_expected.not_to create_package('glusterfs-server') }
@@ -56,6 +60,7 @@
             architecture: 'zLinux'
           )
         end
+
         case facts[:osfamily]
         when 'Archlinux'
           it { is_expected.not_to create_class('gluster::repo') }

spec/classes/repo_apt_spec.rb

@@ -9,6 +9,7 @@
       let :pre_condition do
         'require ::gluster::params'
       end
+
       case facts[:osfamily]
       when 'Debian'
         context 'with all defaults' do
@@ -28,6 +29,7 @@
               architecture: 'zLinux'
             )
           end
+
           it 'does not install' do
             expect do
               is_expected.to create_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-gluster.pub')
@@ -40,6 +42,7 @@
               priority: '700'
             }
           end
+
           it 'installs' do
             is_expected.to contain_apt__source('glusterfs-LATEST').with(
               repos: 'main',
@@ -56,6 +59,7 @@
               release: '3.9'
             }
           end
+
           it 'installs' do
             is_expected.to contain_apt__source('glusterfs-LATEST').with(
               repos: 'main',
@@ -75,6 +79,7 @@
               release: '3.6'
             }
           end
+
           it 'installs' do
             is_expected.to contain_apt__source('glusterfs-LATEST').with(
               repos: 'main',
@@ -94,6 +99,7 @@
               release: '3.8'
             }
           end
+
           it 'installs' do
             is_expected.to contain_apt__source('glusterfs-LATEST').with(
               repos: 'main',