diff --git a/.fixtures.yml b/.fixtures.yml index 76561a6..3e876ff 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,9 +1,4 @@ --- fixtures: - repositories: - archive: 'https://github.com/voxpupuli/puppet-archive.git' - cron: 'https://github.com/voxpupuli/puppet-cron.git' - stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git' - yumrepo_core: - repo: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core' - puppet_version: '>= 6.0.0' + symlinks: + zookeeper: "#{source_dir}" diff --git a/.gitignore b/.gitignore index 2767022..d545a3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,28 @@ .git/ .*.sw[op] .metadata .yardoc .yardwarns *.iml /.bundle/ /.idea/ /.vagrant/ /coverage/ /bin/ /doc/ /Gemfile.local /Gemfile.lock /junit/ /log/ /pkg/ /spec/fixtures/manifests/ /spec/fixtures/modules/ /tmp/ /vendor/ /convert_report.txt /update_report.txt .DS_Store .project .envrc /inventory.yaml +.tmp/* diff --git a/.sync.yml b/.sync.yml index 75dbd33..6651f82 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,47 +1,51 @@ --- .github/CONTRIBUTING.md: delete: true .github/ISSUE_TEMPLATE.md: delete: true .github/PULL_REQUEST_TEMPLATE.md: delete: true .gitlab-ci.yml: delete: true .travis.yml: remove_branches: - main - /^v\d/ docker_sets: - set: debian9-64 - set: debian10-64 - set: ubuntu1804-64 - set: centos7-64 irc: false user: 'deric' secure: 'K3gfvfUtsZ4l6TTChG5jBLIB4j9ZG3zQECBCMI0ZcYiyiFYIihDtraO6sTf0qOcocRg5TpihBNJ8IpBPdDvd8bOrQCIWnSor2hP6NKA8J0XCDX5H4hmyieJhFCuGydaopia6rATEbj4TIOzMk8zPVc/lavg4yRkpwcxCy7UQVKc=' Rakefile: config.user: 'deric' spec/spec_helper.rb: spec_overrides: "require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))" coverage_report: true Gemfile: required: ":development": - gem: 'github_changelog_generator' version: '~> 1.15' condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')" - gem: overcommit + - gem: librarian-puppet optional: ':acceptance': - gem: beaker - gem: beaker-rspec - gem: beaker-docker - gem: beaker-puppet_install_helper - gem: beaker-module_install_helper +.gitignore: + paths: + - .tmp/* diff --git a/Gemfile b/Gemfile index 819e80a..885f2ea 100644 --- a/Gemfile +++ b/Gemfile @@ -1,81 +1,82 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' def location_for(place_or_version, fake_version = nil) git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} file_url_regex = %r{\Afile:\/\/(?.*)} if place_or_version && (git_url = place_or_version.match(git_url_regex)) [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] else [place_or_version, { require: false }] end end ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments minor_version = ruby_version_segments[0..1].join('.') group :development do gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby] gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby] gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "github_changelog_generator", '~> 1.15', require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') gem "overcommit", require: false + gem "librarian-puppet", require: false end group :system_tests do gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby] gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw] end group :acceptance do gem "beaker", require: false gem "beaker-rspec", require: false gem "beaker-docker", require: false gem "beaker-puppet_install_helper", require: false gem "beaker-module_install_helper", require: false end puppet_version = ENV['PUPPET_GEM_VERSION'] facter_version = ENV['FACTER_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION'] gems = {} gems['puppet'] = location_for(puppet_version) # If facter or hiera versions have been specified via the environment # variables gems['facter'] = location_for(facter_version) if facter_version gems['hiera'] = location_for(hiera_version) if hiera_version if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} # If we're using a Puppet gem on Windows which handles its own win32-xxx gem # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). gems['win32-dir'] = ['<= 0.4.9', require: false] gems['win32-eventlog'] = ['<= 0.6.5', require: false] gems['win32-process'] = ['<= 0.7.5', require: false] gems['win32-security'] = ['<= 0.2.5', require: false] gems['win32-service'] = ['0.8.8', require: false] end gems.each do |gem_name, gem_params| gem gem_name, *gem_params end # Evaluate Gemfile.local and ~/.gemfile if they exist extra_gemfiles = [ "#{__FILE__}.local", File.join(Dir.home, '.gemfile'), ] extra_gemfiles.each do |gemfile| if File.file?(gemfile) && File.readable?(gemfile) eval(File.read(gemfile), binding) end end # vim: syntax=ruby diff --git a/Puppetfile.lock b/Puppetfile.lock index bd3efce..8f141d5 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -1,15 +1,15 @@ FORGE remote: https://forgeapi.puppetlabs.com specs: puppet-archive (4.4.0) puppetlabs-stdlib (< 7.0.0, >= 4.18.0) puppet-cron (2.0.0) puppetlabs-stdlib (6.2.0) puppetlabs-yumrepo_core (1.0.6) DEPENDENCIES puppet-archive (< 5.0.0, >= 0.4.4) - puppet-cron (>= 1.3.1) + puppet-cron (< 3.0.0, >= 1.3.1) puppetlabs-stdlib (< 7.0.0, >= 2.3.3) - puppetlabs-yumrepo_core (>= 1.0.3) + puppetlabs-yumrepo_core (< 2.0.0, >= 1.0.3) diff --git a/rakelib/librarian.rake b/rakelib/librarian.rake new file mode 100644 index 0000000..fb6a2f6 --- /dev/null +++ b/rakelib/librarian.rake @@ -0,0 +1,5 @@ +task :librarian_spec_prep do + sh 'librarian-puppet install --path=spec/fixtures/modules/' +end +task :spec_prep => :librarian_spec_prep +