File tree Expand file tree Collapse file tree 5 files changed +8
-3
lines changed Expand file tree Collapse file tree 5 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -33,9 +33,11 @@ Gemfile:
3333 from_env : BEAKER_HOSTGENERATOR_VERSION
3434 - gem : beaker-rspec
3535 from_env : BEAKER_RSPEC_VERSION
36+ # Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies
3637 - gem : beaker-puppet
3738 from_env : BEAKER_PUPPET_VERSION
3839 version : ' ~> 3.0'
40+ condition : Gem::Requirement.create('< 3.1.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
3941 - gem : async
4042 version : ' ~> 1'
4143 - gem : beaker-module_install_helper
@@ -57,4 +59,5 @@ appveyor.yml:
5759# We still use the Vox acceptance Rake task instead of Litmus
5860Rakefile :
5961 requires :
60- - voxpupuli/acceptance/rake
62+ - require : voxpupuli/acceptance/rake
63+ conditional : Gem.loaded_specs.key? 'voxpupuli-acceptance'
File renamed without changes.
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
66require 'puppet-syntax/tasks/puppet-syntax'
77require 'github_changelog_generator/task' if Gem . loaded_specs . key? 'github_changelog_generator'
88require 'puppet-strings/tasks' if Gem . loaded_specs . key? 'puppet-strings'
9- require 'voxpupuli/acceptance/rake'
9+ require 'voxpupuli/acceptance/rake' if Gem . loaded_specs . key? 'voxpupuli-acceptance'
1010
1111def changelog_user
1212 return unless Rake . application . top_level_tasks . include? "changelog"
Original file line number Diff line number Diff line change 2121require_relative '../../../puppet_x/augeas/util/parser'
2222
2323Puppet ::Type . type ( :augeas ) . provide ( :augeas ) do
24+ desc 'The Augeas provider'
25+
2426 include Puppet ::Util
2527 include Puppet ::Util ::Diff
2628 include Puppet ::Util ::Package
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ module PuppetX::Augeas::Util::Parser
3030 # support the full quite of escape sequences that Ruby allows in
3131 # double-quoted strings.
3232 #
33- # @param [String] The string to be parsed.
33+ # @param string [String] The string to be parsed.
3434 # @return [Array<String>] The parsed array elements, including handling any
3535 # escape sequences.
3636 def parse_to_array ( string )
You can’t perform that action at this time.
0 commit comments