Skip to content

Commit

Permalink
Merge pull request #37 from dhoppe/modulesync
Browse files Browse the repository at this point in the history
Update based on voxpupuli/modulesync_config 0.14.1
  • Loading branch information
bastelfreak committed Oct 21, 2016
2 parents 4362d89 + 35e3e1e commit 6f0b4ee
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.13.0'
modulesync_config_version: '0.14.1'
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 23 additions & 5 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
---
.travis.yml:
secure: "h219k17UboHUoE8kLonLW7R4qKxlkyUS/lKaFUZaSGpv7vhlRSRV37eozAN8WUSYzkEDWHa7a1kg3a8SBcTrIlc/rj7132AAk4qFXJo7waWxZt0zjqqbWxZyx/PmrqbAAtSHEZGo3jq+eZzmZijlAXlgC8qopTJJbxZArQlLcaU="
spec/acceptance/nodesets/docker/centos-5.yml:
unmanaged: true
spec/acceptance/nodesets/docker/centos-6.yml:
unmanaged: true
spec/acceptance/nodesets/docker/centos-7.yml:
unmanaged: true
spec/acceptance/nodesets/docker/debian-7.yml:
unmanaged: true
spec/acceptance/nodesets/docker/debian-8.yml:
unmanaged: true
spec/acceptance/nodesets/docker/ubuntu-12.04.yml:
unmanaged: true
spec/acceptance/nodesets/docker/ubuntu-14.04.yml:
unmanaged: true
spec/acceptance/nodesets/docker/ubuntu-16.04.yml:
unmanaged: true
spec/acceptance/nodesets/centos-511-x64.yml:
unmanaged: true
spec/acceptance/nodesets/centos-66-x64-pe.yml:
Expand All @@ -7,13 +25,13 @@ spec/acceptance/nodesets/centos-66-x64.yml:
unmanaged: true
spec/acceptance/nodesets/centos-72-x64.yml:
unmanaged: true
spec/acceptance/nodesets/debian-78-x64.yml:
unmanaged: true
spec/acceptance/nodesets/debian-82-x64.yml:
unmanaged: true
spec/acceptance/nodesets/ubuntu-server-1204-x64.yml:
unmanaged: true
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml:
unmanaged: true
spec/acceptance/nodesets/debian-78-x64.yml:
spec/acceptance/nodesets/ubuntu-server-1604-x64.yml:
unmanaged: true
spec/acceptance/nodesets/debian-82-x64.yml:
unmanaged: true
.travis.yml:
secure: "h219k17UboHUoE8kLonLW7R4qKxlkyUS/lKaFUZaSGpv7vhlRSRV37eozAN8WUSYzkEDWHa7a1kg3a8SBcTrIlc/rj7132AAk4qFXJo7waWxZt0zjqqbWxZyx/PmrqbAAtSHEZGo3jq+eZzmZijlAXlgC8qopTJJbxZArQlLcaU="
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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'

PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
PuppetLint.configuration.fail_on_warnings = true
Expand Down
5 changes: 5 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6f0b4ee

Please sign in to comment.