diff --git a/.sync.yml b/.sync.yml index 6bf1277..4dc0d21 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,37 +1,40 @@ --- .rubocop.yml: default_configs: RSpec/InstanceVariable: Enabled: false Gemfile: optional: ":development": - gem: beaker version: '~> 4.30' from_env: BEAKER_VERSION - gem: beaker-abs from_env: BEAKER_ABS_VERSION version: '~> 0.9' - gem: beaker-pe - gem: beaker-hostgenerator from_env: BEAKER_HOSTGENERATOR_VERSION - gem: beaker-rspec from_env: BEAKER_RSPEC_VERSION - gem: beaker-puppet from_env: BEAKER_PUPPET_VERSION version: '~> 1.22' - gem: github_changelog_generator + # We can unpin async when we move to Ruby 3 + - gem: async + version: '~> 1' - gem: beaker-module_install_helper - gem: beaker-puppet_install_helper - gem: nokogiri appveyor.yml: delete: true .travis.yml: delete: true .github/workflows/auto_release.yml: unmanaged: false .github/workflows/release.yml: unmanaged: false .gitlab-ci.yml: delete: true diff --git a/Gemfile b/Gemfile index 26f0def..b48e755 100644 --- a/Gemfile +++ b/Gemfile @@ -1,72 +1,73 @@ 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 "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.30') gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.9') gem "beaker-pe", require: false gem "beaker-hostgenerator" gem "beaker-rspec" gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.22') gem "github_changelog_generator", require: false + gem "async", '~> 1', require: false gem "beaker-module_install_helper", require: false gem "beaker-puppet_install_helper", require: false gem "nokogiri", 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 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 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/metadata.json b/metadata.json index 419a5ef..d3b1e2f 100644 --- a/metadata.json +++ b/metadata.json @@ -1,27 +1,27 @@ { "name": "puppetlabs-zfs_core", "version": "1.3.0", "author": "puppetlabs", "summary": "Manage zfs. Create destroy and set properties on zfs instances.", "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-zfs_core", "project_page": "https://github.com/puppetlabs/puppetlabs-zfs_core", "issues_url": "https://tickets.puppetlabs.com/projects/MODULES", "dependencies": [ ], "operatingsystem_support": [ { "operatingsystem": "Solaris" } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 6.0.0 < 8.0.0" } ], - "pdk-version": "2.2.0", + "pdk-version": "2.3.0", "template-url": "https://github.com/puppetlabs/pdk-templates#2.2.0", "template-ref": "tags/2.2.0-0-g2381db6" }