summaryrefslogtreecommitdiff
path: root/lib/puppet/parser
AgeCommit message (Collapse)Author
2013-09-17Merge pull request #182 from lmello/fix_bug_20681_delete_valuesAdrien Thebo
delete_values() fix bug #20681.
2013-09-17Merge pull request #178 from lmello/fix_bug_20681Adrien Thebo
bug # 20681 delete() function should not remove elements from original list
2013-09-17(#20681) fix behaviour of delete_valuesLeonardo Rodrigues de Mello
The issue #20681 describe the error of delete() function removing the elements from the origin array/hash/string. This issue affected other delete functions. Because ruby delete and delete_if functions make destructive changes to the origin array/hash. The delete_undef_values removed elements from the origin hash and this is not the desired behaviour. To solve this, we should dup or clone the hash before using the delete or delete_if ruby functions. This fix the problem and add unit tests, so we could enforce this behaviour and prevent regressions.
2013-09-16bug # 20681 delete() function should not remove elements from original listLeonardo Rodrigues de Mello
The setup: list with 3 elements, delete one: $test_list = [‘a’, ‘b’, ‘c’] $test_deleted = delete($test_list, ‘a’) Print out the elements in ‘test_deleted’: notify { ‘group_output2’: withpath => true, name => “$cfeng::test_deleted”, } Notice: /Stage[main]/Syslog/Notify[group_output2]/message: bc Good! Run-on output shows that ‘a’ was deleted Print out the elements in ‘test_list’: notify { ‘group_output1’: withpath => true, name => “$cfeng::test_list”, } Notice: /Stage[main]/Syslog/Notify[group_output1]/message: bc WHAT!? 'a' was deleted from ‘test_list’ as well! Expected abc as output! This behaviour is confirmed for string, hash and array. This is fixed on this commit, I had added two spec tests to cover that cases. bug #20681 spec test for delete() function. I had forgot in the last commit the spec test for hash in the delete function. bug # 20681 delete() function change aproach. Instead of rejecting elements from the original list, we use collection = arguments[0].dup . then latter we could continue to use delete and gsub! on collection without impact on original argument. this is a better solution than the previous one, and works on ruby 1.8.7, 1.9.3 and 2.0.0. The previous solution does not work on ruby 1.8.7. delete function remove typo whitespace. fix typo whitespaces.
2013-09-16enhanced the error message of pick function.Leonardo Rodrigues de Mello
When pick function fail return a better error message like the other stdlib functions, indicating that the error is on function pick. This would help people that see the error to identity it is related to a incorrect use of stdlib function pick, instead of having to grep all puppet libraries and manifests source for the old message. I had also changed the spec test. pick function change spec as suggested GH-179 Fix the spec test to use expect {}.to instead of lambda {}.should as explained by Adrienthebo. "Using expect { }.to is preferred over lambda { }.should. In addition it's best practice to do a string match against the error message to ensure that we're catching the right error, instead of any error of the right type." Also fixed a typo on the error message, it was missing one space. pick function stylish fix as suggested on GH179
2013-08-13Merge pull request #170 from ptomulik/fix_delete_valuesAdrien Thebo
minor corrections to delete_values()
2013-08-12(maint) Validate input argument in a single locationAdrien Thebo
2013-08-12(maint) reindent case statement to match standard indentationAdrien Thebo
2013-08-12(maint) collapse String/Array validation into shared lambdaAdrien Thebo
2013-08-12(maint) clean up validate_slength argument validationAdrien Thebo
2013-08-12(maint) reword error messages for validate_slengthAdrien Thebo
2013-08-12(maint) Explicitly unpack validate_slength argsAdrien Thebo
2013-08-12(maint) Remove unneeded parens around exceptionsAdrien Thebo
2013-08-08minor corrections to delete_values()Paweł Tomulik
2013-08-08Fix validate_slength, arg.length should be args[0].lengthHubert
During a puppet run an error will be thrown and a puppet run will fail completely (when using validate_slength): undefined local variable or method `arg' for #<Puppet::Parser::Scope:0x7f243c236948>
2013-08-06Merge pull request #167 from mhellmic/minlengthAdrien Thebo
extend the validate_slength function to accept a minimum length
2013-08-06changed the validate_slength function to accept a min lengthMartin Hellmich
An optional third parameter can be given a min length. The function then only passes successfully, if all strings are in the range min_length <= string <= max_length update and fix function and unit tests the check for the minlength has to be written differently because 0 values should be possible. We now check a) if the input is convertible, and throw a ParseError and b) if the input .is_a?(Numeric) and ask for a positive number it's not as clean as for maxlength, but keeps a similar behaviour refined the error checking for the min length try to convert to Integer(args[2]) and fail, if it's not possible changed the tests accordingly to the new parameter checking
2013-08-05added delete_values() and delete_undef_values() functionsPaweł Tomulik
2013-07-22Adjust to use default URI.escape escape listTomas Doran
Conform to RFC per comments on: https://github.com/puppetlabs/puppetlabs-stdlib/pull/164 Conflicts: lib/puppet/parser/functions/uriescape.rb spec/unit/puppet/parser/functions/uriescape_spec.rb
2013-06-27ensure_resource: fix documentation typoChris Boot
2013-06-07Merge pull request #158 from wfarr/validate_ipAdrien Thebo
[#20862] Add functions to validate ipv4 and ipv6 addresses
2013-05-28Merge remote-tracking branch 'pr/56' into pull-56Adrien Thebo
Conflicts: lib/puppet/parser/functions/range.rb spec/unit/puppet/parser/functions/range_spec.rb
2013-05-24Adding base64 functionfiddyspence
Adding base64 function and spec test. Included a bonus fix to validate_slength_spec.rb to put the expectation message in the right place.
2013-05-22Ruby 2.0 introduces IPAddr::InvalidAddressErrorWill Farrington
2013-05-22Add functions to validate ipv4 and ipv6 addressesWill Farrington
2013-05-15Merge pull request #155 from AlexCline/feature/master/array_comparison_functionsHailee Kenney
(#20684) Add array comparison functions, difference, intersection and union
2013-05-15Merge pull request #147 from mhellmic/masterAdrien Thebo
don't fail on undef variable in merge
2013-05-13(#20684) Add array comparison functions, difference, intersection and union.Alex Cline
Included is code, tests and documentation for the difference, intersection and union functions for comparing arrays.
2013-05-08fix in merge.rb: refine the checking if an argument is an empty stringMartin Hellmich
2013-05-06Terser method of string to array conversion courtesy of ethooz.Alex Cline
2013-05-06Changed str-to-array conversion and removed abbreviation.Alex Cline
2013-05-03(#20548) Allow an array of resource titles to be passed into the ↵Alex Cline
ensure_resource function This patch allows an array of resource titles to be passed into the ensure_resource function. Each item in the array will be checked for existence and will be created if it doesn't already exist.
2013-05-02Add a dirname functionRaphaël Pinson
2013-04-29(maint) Fix a small typo in hash() descriptionMark Smith-Guerrero
2013-04-22check if an argument supposed to be merged is empty toMartin Hellmich
pass over undefs without failing
2013-04-10Add a count functionErik Dalén
Similar to the ruby count method on arrays.
2013-04-03Remove resundant codeAmos Shapira
2013-04-03(#19998) fix name of function in a commentAmos Shapira
2013-04-03(#19998) Implement any2arrayAmos Shapira
This change is to implement a new function "any2array", which will take any argument or arguments and create an array which contains it. If the argument is a single array then it will be returned as-is. If the argument is a single hash then it will be converted into an array. Otherwise (if there are more than one argument, or the only argument is not an array or a hash) the function will return an array containing all the arguments.
2013-04-01Cleanup per adrianthebo suggestionsSteve Huff
* use Float() to process string arguments * get rid of doubly nested arrays * removing needless ternary operator * improving error message handling
2013-03-29(19864) num2bool match fixSteve Huff
This is a bit more heavy-handed than I might like, but it does appear to do the right things: * accepts numeric input appropriately, truncating floats * matches string input against a regex, then coerces number-looking strings to int * makes a best effort to coerce anything else to a string, then subjects it to the same treatment * raises an error in the event of incorrect number of arguments or non-number-looking strings I've also included some additional unit tests.
2013-03-29Reworked number-handling logicSteve Huff
No more coercing to String and regex matching. Instead, we now coerce to Integer at the beginning or raise an error if we cannot coerce to Integer. A consequence of this change is that the function will now accept blatantly non-numeric strings as input, and return false. This seems a bit goofy to me, but it's how String#to_i works. If we really don't like this, then I'm open to suggestions.
2013-03-29Enable num2bool to accept numeric inputSteve Huff
Also ignore rspec fixtures directory
2013-03-27Merge branch '4.x'Adrien Thebo
2013-03-27Merge branch '2.x' into 3.xAdrien Thebo
2013-03-27Allow comparisons of Numeric and number as StringErik Dalén
Puppet passes numbers as String to functions, but it makes more sense to compare them as Numeric. But sometimes Puppet passes them as the wrong type, see: https://projects.puppetlabs.com/issues/19812
2013-03-27(maint) better error reporting for prefix and suffixAdrien Thebo
When prefix and suffix did error checking with positional arguments, they would not report the position of the argument that failed to validate. This commit changes the messages to indicate which argument failed.
2013-03-26prefix: fix doc typo Examles -> ExamplesRichard Soderberg
2013-03-26add suffix function to accompany the prefix functionRichard Soderberg
2013-03-19Add floor function implementation and unit testsKristof Willaert