diff --git a/lib/puppet/parser/functions/chop.rb b/lib/puppet/parser/functions/chop.rb deleted file mode 100644 index 2e4b0543d..000000000 --- a/lib/puppet/parser/functions/chop.rb +++ /dev/null @@ -1,41 +0,0 @@ -# frozen_string_literal: true - -# -# chop.rb -# -module Puppet::Parser::Functions - newfunction(:chop, type: :rvalue, doc: <<-DOC - @summary - **Deprecated** Returns a new string with the last character removed. - - If the string ends with `\r\n`, both characters are removed. Applying - chop to an empty string returns an empty string. If you wish to merely - remove record separators then you should use the `chomp` function. - Requires a string or array of strings as input. - - > *Note:* **Deprecated** from Puppet 6.0.0, this function has been replaced with a - built-in [`chop`](https://puppet.com/docs/puppet/latest/function.html#chop) function. - - @return [String] The given String, sans the last character. - DOC - ) do |arguments| - raise(Puppet::ParseError, "chop(): 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, 'chop(): Requires either an 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.chop : i } - else - value.chop - end - - return result - end -end - -# vim: set ts=2 sw=2 et : diff --git a/spec/functions/chop_spec.rb b/spec/functions/chop_spec.rb deleted file mode 100644 index 2cbccd14d..000000000 --- a/spec/functions/chop_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'chop', 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}) } - it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires either an 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('on') } - 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', 'tw', 'three']) } - - it { is_expected.to run.with_params(AlsoString.new('one')).and_return('on') } - 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', 'tw', '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