Skip to content
This repository has been archived by the owner on Jan 10, 2023. It is now read-only.

Commit

Permalink
Manual fix of modulesync managed files
Browse files Browse the repository at this point in the history
ruby 2.1.9 had to be removed because of beaker gem which requires
ruby >= 2.2.5
  • Loading branch information
vinzent committed Jan 20, 2017
1 parent ce937ee commit f711d50
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 3 deletions.
20 changes: 20 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -522,3 +522,23 @@ RSpec/NestedGroups:
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Security/YAMLLoad:
Enabled: false


#------------------------------
# CUSTOM

# Offense count: 2
# Configuration parameters: AssignmentOnly.
RSpec/InstanceVariable:
Exclude:
- 'spec/unit/puppet/provider/puppetserver_config/augeas_spec.rb'

# Offense count: 4
RSpec/MultipleExpectations:
Max: 3

# Offense count: 1
Style/AccessorMethodName:
Exclude:
- 'lib/puppet/provider/puppetserver_config/augeas.rb'

2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ script:
matrix:
fast_finish: true
include:
- rvm: 2.1.9
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.2.6
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.3.3
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 'ruby-augeas', :require => false
end

group :development do
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/docker/centos-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/usr/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which'
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss'
CONFIG:
trace_limit: 200
masterless: true
Expand Down
12 changes: 12 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
require 'rspec-puppet-facts'
include RspecPuppetFacts

# Setup augeasproviders
require 'pathname'
dir = Pathname.new(__FILE__).parent
$LOAD_PATH.unshift(dir, File.join(dir, 'fixtures/modules/augeasproviders_core/spec/lib'), File.join(dir, '..', 'lib'))
require 'augeas_spec'
require 'pathname'
dir = Pathname.new(__FILE__).parent
Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules')
puts 'augeasproviders: setting Puppet[:libdir] to work around broken type autoloading'
# libdir is only a single dir, so it can only workaround loading of one external module
Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib"

if Dir.exist?(File.expand_path('../../lib', __FILE__))
require 'coveralls'
require 'simplecov'
Expand Down

0 comments on commit f711d50

Please sign in to comment.