diff --git a/.sync.yml b/.sync.yml index 1357ca4..b3a4f62 100644 --- a/.sync.yml +++ b/.sync.yml @@ -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 @@ -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' \ No newline at end of file diff --git a/readmes/README_ja_JP.md b/README_ja_JP.md similarity index 100% rename from readmes/README_ja_JP.md rename to README_ja_JP.md diff --git a/Rakefile b/Rakefile index a4d5cc0..a0e7eb6 100644 --- a/Rakefile +++ b/Rakefile @@ -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" diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index 8a306db..56daf92 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -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 diff --git a/lib/puppet_x/augeas/util/parser.rb b/lib/puppet_x/augeas/util/parser.rb index 271e11c..e20070c 100644 --- a/lib/puppet_x/augeas/util/parser.rb +++ b/lib/puppet_x/augeas/util/parser.rb @@ -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] The parsed array elements, including handling any # escape sequences. def parse_to_array(string)