diff --git a/lib/puppet/parser/functions/chomp.rb b/lib/puppet/parser/functions/chomp.rb deleted file mode 100644 index 84aeaf1e9..000000000 --- a/lib/puppet/parser/functions/chomp.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -# -# chomp.rb -# -module Puppet::Parser::Functions - newfunction(:chomp, type: :rvalue, doc: <<-DOC - @summary - **Deprecated** Removes the record separator from the end of a string or an array of strings. - - For example `hello\n` becomes `hello`. - Requires a single string or array as an input. - - > *Note:* - **Deprecated** from Puppet 6.0.0, this function has been replaced with a - built-in [`chomp`](https://puppet.com/docs/puppet/latest/function.html#chomp) function. - - @return [String] The converted String, if it was a String that was given - @return [Array[String]] The converted Array, if it was a Array that was given - DOC - ) do |arguments| - raise(Puppet::ParseError, "chomp(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty? - - value = arguments[0] - - unless value.is_a?(Array) || value.is_a?(String) - raise(Puppet::ParseError, 'chomp(): Requires either array or string to work with') - end - - result = if value.is_a?(Array) - # Numbers in Puppet are often string-encoded which is troublesome ... - value.map { |i| i.is_a?(String) ? i.chomp : i } - else - value.chomp - end - - return result - end -end - -# vim: set ts=2 sw=2 et : diff --git a/spec/functions/chomp_spec.rb b/spec/functions/chomp_spec.rb deleted file mode 100644 index 68b7cd3dc..000000000 --- a/spec/functions/chomp_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'chomp', if: Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0 do - it { is_expected.not_to eq(nil) } - it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Wrong number of arguments given}) } - it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires either array or string}) } - it { - pending('Current implementation ignores parameters after the first.') - is_expected.to run.with_params('a', 'b').and_raise_error(Puppet::ParseError) - } - it { is_expected.to run.with_params('one').and_return('one') } - it { is_expected.to run.with_params("one\n").and_return('one') } - it { is_expected.to run.with_params("one\n\n").and_return("one\n") } - it { is_expected.to run.with_params(["one\n", 'two', "three\n"]).and_return(['one', 'two', 'three']) } - - it { is_expected.to run.with_params(AlsoString.new('one')).and_return('one') } - it { is_expected.to run.with_params(AlsoString.new("one\n")).and_return('one') } - it { is_expected.to run.with_params(AlsoString.new("one\n\n")).and_return("one\n") } - it { is_expected.to run.with_params([AlsoString.new("one\n"), AlsoString.new('two'), "three\n"]).and_return(['one', 'two', 'three']) } - - it { is_expected.to run.with_params([1, 2, 3]).and_return([1, 2, 3]) } - - context 'with UTF8 and double byte characters' do - it { is_expected.to run.with_params("ůťƒ8\n\n").and_return("ůťƒ8\n") } - it { is_expected.to run.with_params("ネット\n\n").and_return("ネット\n") } - end -end