Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ Gemfile:
from_env: BEAKER_HOSTGENERATOR_VERSION
- gem: beaker-rspec
from_env: BEAKER_RSPEC_VERSION
# Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies
- gem: beaker-puppet
from_env: BEAKER_PUPPET_VERSION
version: '~> 3.0'
condition: Gem::Requirement.create('< 3.1.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
- gem: async
version: '~> 1'
- gem: beaker-module_install_helper
Expand All @@ -57,4 +59,5 @@ appveyor.yml:
# We still use the Vox acceptance Rake task instead of Litmus
Rakefile:
requires:
- voxpupuli/acceptance/rake
- require: voxpupuli/acceptance/rake
conditional: Gem.loaded_specs.key? 'voxpupuli-acceptance'
File renamed without changes.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
require 'voxpupuli/acceptance/rake'
require 'voxpupuli/acceptance/rake' if Gem.loaded_specs.key? 'voxpupuli-acceptance'

def changelog_user
return unless Rake.application.top_level_tasks.include? "changelog"
Expand Down
2 changes: 2 additions & 0 deletions lib/puppet/provider/augeas/augeas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
require_relative '../../../puppet_x/augeas/util/parser'

Puppet::Type.type(:augeas).provide(:augeas) do
desc 'The Augeas provider'

include Puppet::Util
include Puppet::Util::Diff
include Puppet::Util::Package
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet_x/augeas/util/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module PuppetX::Augeas::Util::Parser
# support the full quite of escape sequences that Ruby allows in
# double-quoted strings.
#
# @param [String] The string to be parsed.
# @param string [String] The string to be parsed.
# @return [Array<String>] The parsed array elements, including handling any
# escape sequences.
def parse_to_array(string)
Expand Down