From 8838543d918fae2d325fe5eca2997d9d15abe31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Tue, 25 Apr 2023 12:50:46 -1000 Subject: [PATCH] Remove deprecated capitalize functions From Puppet 6.0.0, this function has been replaced with a built-in [`capitalize`](https://puppet.com/docs/puppet/latest/function.html#capitalize) function. --- lib/puppet/parser/functions/capitalize.rb | 40 ----------------------- spec/functions/capitalize_spec.rb | 17 ---------- 2 files changed, 57 deletions(-) delete mode 100644 lib/puppet/parser/functions/capitalize.rb delete mode 100644 spec/functions/capitalize_spec.rb diff --git a/lib/puppet/parser/functions/capitalize.rb b/lib/puppet/parser/functions/capitalize.rb deleted file mode 100644 index fef44937b..000000000 --- a/lib/puppet/parser/functions/capitalize.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -# -# capitalize.rb -# Please note: This function is an implementation of a Ruby class and as such may not be entirely UTF8 compatible. To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085. -# -module Puppet::Parser::Functions - newfunction(:capitalize, type: :rvalue, doc: <<-DOC - @summary - **Deprecated** Capitalizes the first letter of a string or array of strings. - - Requires either a single string or an array as an input. - - > *Note:* - **Deprecated** from Puppet 6.0.0, yhis function has been replaced with a - built-in [`capitalize`](https://puppet.com/docs/puppet/latest/function.html#capitalize) - 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, "capitalize(): 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, 'capitalize(): 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.capitalize : i } - else - value.capitalize - end - - return result - end -end diff --git a/spec/functions/capitalize_spec.rb b/spec/functions/capitalize_spec.rb deleted file mode 100644 index f67c8beff..000000000 --- a/spec/functions/capitalize_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'capitalize', 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) } - it { is_expected.to run.with_params(100).and_raise_error(Puppet::ParseError) } - it { is_expected.to run.with_params('one').and_return('One') } - it { is_expected.to run.with_params('one two').and_return('One two') } - it { is_expected.to run.with_params('ONE TWO').and_return('One two') } - - it { is_expected.to run.with_params(AlsoString.new('one')).and_return('One') } - it { is_expected.to run.with_params([]).and_return([]) } - it { is_expected.to run.with_params(['one', 'two']).and_return(['One', 'Two']) } - it { is_expected.to run.with_params(['one', 1, 'two']).and_return(['One', 1, 'Two']) } -end