mirror of
https://github.com/philippdieter/puppet-ldapquery.git
synced 2025-10-13 04:54:47 +00:00
Update from xaque208 modulesync_config
This commit is contained in:
parent
3314361cb4
commit
dd2e078af7
@ -1 +1 @@
|
|||||||
modulesync_config_version: '2.5.0'
|
modulesync_config_version: '2.6.1'
|
||||||
|
10
.travis.yml
10
.travis.yml
@ -3,9 +3,9 @@ dist: xenial
|
|||||||
language: ruby
|
language: ruby
|
||||||
cache: bundler
|
cache: bundler
|
||||||
before_install:
|
before_install:
|
||||||
- 'rm -f Gemfile.lock'
|
- gem update --system
|
||||||
- 'gem update --system'
|
- gem update bundler
|
||||||
- 'gem install bundler'
|
- bundle --version
|
||||||
script:
|
script:
|
||||||
- 'bundle exec rake $CHECK'
|
- 'bundle exec rake $CHECK'
|
||||||
matrix:
|
matrix:
|
||||||
@ -13,7 +13,7 @@ matrix:
|
|||||||
include:
|
include:
|
||||||
- rvm: 2.4.4
|
- rvm: 2.4.4
|
||||||
bundler_args: --without system_tests development release
|
bundler_args: --without system_tests development release
|
||||||
env: PUPPET_VERSION="~> 5.0" CHECK=test
|
env: PUPPET_VERSION="~> 5.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
|
||||||
- rvm: 2.5.3
|
- rvm: 2.5.3
|
||||||
bundler_args: --without system_tests development release
|
bundler_args: --without system_tests development release
|
||||||
env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
|
env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
|
||||||
@ -22,7 +22,7 @@ matrix:
|
|||||||
env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
|
env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
|
||||||
- rvm: 2.4.4
|
- rvm: 2.4.4
|
||||||
bundler_args: --without system_tests development release
|
bundler_args: --without system_tests development release
|
||||||
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
|
env: PUPPET_VERSION="~> 6.0" CHECK=build DEPLOY_TO_FORGE=yes
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
19
Gemfile
19
Gemfile
@ -14,22 +14,23 @@ group :test do
|
|||||||
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
|
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
|
||||||
gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
|
gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
|
||||||
gem 'rspec-puppet-utils', :require => false
|
gem 'rspec-puppet-utils', :require => false
|
||||||
|
gem 'pdk', :require => false
|
||||||
|
gem 'puppet-module', :require => false
|
||||||
gem 'puppet-lint-leading_zero-check', :require => false
|
gem 'puppet-lint-leading_zero-check', :require => false
|
||||||
gem 'puppet-lint-trailing_comma-check', :require => false
|
gem 'puppet-lint-trailing_comma-check', :require => false
|
||||||
gem 'puppet-lint-version_comparison-check', :require => false
|
gem 'puppet-lint-version_comparison-check', :require => false
|
||||||
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
|
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
|
||||||
gem 'puppet-lint-unquoted_string-check', :require => false
|
gem 'puppet-lint-unquoted_string-check', :require => false
|
||||||
gem 'puppet-lint-variable_contains_upcase', :require => false
|
gem 'puppet-lint-variable_contains_upcase', :require => false
|
||||||
|
gem 'puppet-lint-absolute_classname-check', :require => false
|
||||||
gem 'metadata-json-lint', :require => false
|
gem 'metadata-json-lint', :require => false
|
||||||
gem 'redcarpet', :require => false
|
gem 'redcarpet', :require => false
|
||||||
gem 'rubocop', '~> 0.49.1', :require => false if RUBY_VERSION >= '2.3.0'
|
gem 'rubocop', '~> 0.49.1', :require => false
|
||||||
gem 'rubocop-rspec', '~> 1.15.0', :require => false if RUBY_VERSION >= '2.3.0'
|
gem 'rubocop-rspec', '~> 1.15.0', :require => false
|
||||||
gem 'mocha', '~> 1.4.0', :require => false
|
gem 'mocha', '~> 1.4.0', :require => false
|
||||||
gem 'coveralls', :require => false
|
gem 'coveralls', :require => false
|
||||||
gem 'simplecov-console', :require => false
|
gem 'simplecov-console', :require => false
|
||||||
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
|
gem 'parallel_tests', :require => false
|
||||||
gem 'parallel_tests', '2.24.0', :require => false if RUBY_VERSION < '2.2.0'
|
|
||||||
gem 'parallel_tests', :require => false if RUBY_VERSION >= '2.2.0'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
@ -57,13 +58,13 @@ group :system_tests do
|
|||||||
gem 'beaker-puppet', :require => false
|
gem 'beaker-puppet', :require => false
|
||||||
gem 'beaker-puppet_install_helper', :require => false
|
gem 'beaker-puppet_install_helper', :require => false
|
||||||
gem 'beaker-module_install_helper', :require => false
|
gem 'beaker-module_install_helper', :require => false
|
||||||
gem 'rbnacl', '>= 4', :require => false if RUBY_VERSION >= '2.2.6'
|
gem 'rbnacl', '>= 4', :require => false
|
||||||
gem 'rbnacl-libsodium', :require => false if RUBY_VERSION >= '2.2.6'
|
gem 'rbnacl-libsodium', :require => false
|
||||||
gem 'bcrypt_pbkdf', :require => false
|
gem 'bcrypt_pbkdf', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
group :release do
|
group :release do
|
||||||
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
|
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator'
|
||||||
gem 'puppet-blacksmith', :require => false
|
gem 'puppet-blacksmith', :require => false
|
||||||
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
|
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
|
||||||
gem 'puppet-strings', '>= 1.0', :require => false
|
gem 'puppet-strings', '>= 1.0', :require => false
|
||||||
@ -86,7 +87,7 @@ else
|
|||||||
gem 'facter', :require => false, :groups => [:test]
|
gem 'facter', :require => false, :groups => [:test]
|
||||||
end
|
end
|
||||||
|
|
||||||
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 5.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
|
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 6.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
|
||||||
gem 'puppet', puppetversion, :require => false, :groups => [:test]
|
gem 'puppet', puppetversion, :require => false, :groups => [:test]
|
||||||
|
|
||||||
# vim: syntax=ruby
|
# vim: syntax=ruby
|
||||||
|
30
Rakefile
30
Rakefile
@ -11,6 +11,7 @@ end
|
|||||||
|
|
||||||
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
|
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
|
||||||
PuppetLint.configuration.fail_on_warnings = true
|
PuppetLint.configuration.fail_on_warnings = true
|
||||||
|
PuppetLint.configuration.absolute_classname_reverse = true
|
||||||
PuppetLint.configuration.send('relative')
|
PuppetLint.configuration.send('relative')
|
||||||
PuppetLint.configuration.send('disable_140chars')
|
PuppetLint.configuration.send('disable_140chars')
|
||||||
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
|
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
|
||||||
@ -37,12 +38,27 @@ RSpec::Core::RakeTask.new(:acceptance) do |t|
|
|||||||
t.pattern = 'spec/acceptance'
|
t.pattern = 'spec/acceptance'
|
||||||
end
|
end
|
||||||
|
|
||||||
desc 'Run tests metadata_lint, release_checks'
|
desc 'Run tests release_checks'
|
||||||
task test: [
|
task test: [
|
||||||
:metadata_lint,
|
|
||||||
:release_checks,
|
:release_checks,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
namespace :check do
|
||||||
|
desc 'Check for trailing whitespace'
|
||||||
|
task :trailing_whitespace do
|
||||||
|
Dir.glob('**/*.md', File::FNM_DOTMATCH).sort.each do |filename|
|
||||||
|
next if filename =~ %r{^((modules|acceptance|\.?vendor|spec/fixtures|pkg)/|REFERENCE.md)}
|
||||||
|
File.foreach(filename).each_with_index do |line, index|
|
||||||
|
if line =~ %r{\s\n$}
|
||||||
|
puts "#{filename} has trailing whitespace on line #{index + 1}"
|
||||||
|
exit 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
Rake::Task[:release_checks].enhance ['check:trailing_whitespace']
|
||||||
|
|
||||||
desc "Run main 'test' task and report merged results to coveralls"
|
desc "Run main 'test' task and report merged results to coveralls"
|
||||||
task test_with_coveralls: [:test] do
|
task test_with_coveralls: [:test] do
|
||||||
if Dir.exist?(File.expand_path('../lib', __FILE__))
|
if Dir.exist?(File.expand_path('../lib', __FILE__))
|
||||||
@ -89,4 +105,14 @@ begin
|
|||||||
end
|
end
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
end
|
end
|
||||||
|
|
||||||
|
begin
|
||||||
|
Blacksmith::RakeTask.new do |t|
|
||||||
|
t.tag_message_pattern = "Version %s"
|
||||||
|
t.tag_pattern = "%s"
|
||||||
|
end
|
||||||
|
rescue
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
# vim: syntax=ruby
|
# vim: syntax=ruby
|
||||||
|
Loading…
x
Reference in New Issue
Block a user