summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-29Merge branch 'fix/master/add_recursive_merge'Josh Partlow
* fix/master/add_recursive_merge: (#20200) Add a recursive merge function. Closes GH-189 This patch changes the original pull request to draw in the overlay function as a Proc and make use of Hash.merge {} for resolving key conflicts.
2013-10-29(#20200) Add a recursive merge function.Justin Burnham
Issue #20200 notes that the merge function does not support nested hashes. To prevent unintended side effects with changing merge, add a deep_merge function instead.
2013-10-29Merge branch 'fix-pick-error-typo'Josh Cooper
* fix-pick-error-typo: (Main) fix typo in pick error message Closes GH-197
2013-10-29(Main) fix typo in pick error messageMatthew Haughton
Update pick error message "at least one non empty value"
2013-10-29Merge remote-tracking branch 'tchaudhri/tchaudhri_join_func_doc_typo'Josh Cooper
* tchaudhri/tchaudhri_join_func_doc_typo: Fixed 'separator' typos Closes GH-196
2013-10-25Fixed 'separator' typosTehmasp Chaudhri
2013-09-18Merge branch 'pull-180'Adrien Thebo
This closes GH-180
2013-09-18(maint) Simplify validate_cmd specsAdrien Thebo
2013-09-18(#22214): close content file before executing checkscriptsgzijl
Right now validation seems to be done against zero byte generated temp files. We need to close the file before executing validation against it.
2013-09-18Merge pull request #184 from lmello/fix_bug_20681_delete_undef_valuesAdrien Thebo
delete_undef_values function fix bug #20681
2013-09-18(#20681) fix behaviour of delete_undef_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 array/hash and this is not the desired behaviour. To solve this, we should dup or clone the array/hash before using the delete or delete_if ruby functions. We should also check if args[0] is not nil before using dup, since dup on nil raises exception. This fix the problem and add unit tests, so we could enforce this behaviour and prevent regressions.
2013-09-17Merge pull request #183 from lmello/fix_bug_20681_delete_atAdrien Thebo
delete_at added spec to check against bug #20681
2013-09-17Merge pull request #182 from lmello/fix_bug_20681_delete_valuesAdrien Thebo
delete_values() fix bug #20681.
2013-09-17Merge pull request #185 from lmello/refactor_16498Adrien Thebo
(#16498) Added unit test for loadyaml function.
2013-09-17(#16498) Added unit test for loadyaml function.Leonardo Rodrigues de Mello
As stated on the issue #16498, it would be great to have unit tests for all the functions. Function loadyaml was missing a unit test. This commit added the unit test to loadyaml function.
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) delete_at function unit test against issueLeonardo Rodrigues de Mello
The issue #20681 describe the error of delete() function removing the elements from the origin array/hash/string. This issue affected the other delete functions. The delete_at function is not afected by this bug, but it did not had the unit test to check against it. I had added the unit test so we could prevent regressions on the future and also have better test coverage.
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-16Merge pull request #179 from lmello/function_pick_error_msgAdrien Thebo
enhanced the error message of pick function.
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-09-12Merge pull request #181 from nibalizer/grammarAdrien Thebo
Minor grammar fix
2013-09-11Minor grammar fixSpencer Krum
2013-09-11Merge pull request #175 from floatingatoll/patch-1Adrien Thebo
(maint) fix RST formatting of has_interface_with code examples
2013-09-09Merge pull request #174 from dprince/file_line_afterAdrien Thebo
Update file_line resource to support 'after'.
2013-09-04(maint) fix RST formatting of has_interface_with code examplesfloatingatoll
2013-08-29(maint) Improve the tests and readability of file_lineJeff McCune
Without this patch the implementation of the file_line provider is a bit convoluted with respect to the newly introduced "after" parameter. This patch addresses the problem by separating out the concerns of each case into their own methods of handling the behavior with the match parameter, handling the behavior with the after parameter, or simply appending the line.
2013-08-29Update file_line resource to support 'after'.Dan Prince
When adding new lines to a file the 'after' option can be useful when you need to insert file lines into the middle of a file. This is particularly helpful when using file_line with sectioned config files. NOTE: the after option only works when adding new lines. If you are updating an existing (matched) line it will simply modify it in place. This assumes it was in the right place to begin with.
2013-08-29(maint) Fix failing spec test with Puppet 3.3.0-rc2Jeff McCune
Without this patch the stdlib spec tests are failing against recent versions of Puppet. The root cause of this problem is a change in the behavior of create_resources in Puppet 6baa57b. The change in behavior caused the :name key to be omitted from the hash returned by Puppet::Parser::Resource#to_hash which in turn is causing the test failure. This patch addresses the problem by updating the test to match the description of the example. Only the attribute :ensure is checked instead of the full hash itself.
2013-08-29(maint) Fix location_for helper methodJeff McCune
Without this patch the location_for helper method in the Gemfile incorrectly assumes the mdata variable has a value. This patch addresses the problem by explicitly binding the regular expression match results to the mdata variable to ensure it has a value when accessed by index.
2013-08-28Merge pull request #172 from ptomulik/fix/delete_xxx_specAdrien Thebo
small fix to delete_values_spec.rb and README.markdown
2013-08-14small fix to delete_values_spec.rb and README.markdownPaweł Tomulik
2013-08-13Merge pull request #170 from ptomulik/fix_delete_valuesAdrien Thebo
minor corrections to delete_values()
2013-08-12Merge branch 'maint-refactor_validate_slength'Adrien Thebo
2013-08-12(maint) Validate input argument in a single locationAdrien Thebo
2013-08-12(maint) refactor validate_slength testsAdrien 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-12Merge pull request #169 from hdeheer/patch-1Adrien Thebo
Fix validate_slength, arg.length should be args[0].length
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-05Merge pull request #166 from ptomulik/delete_undef_valuesAdrien Thebo
Add delete_values() and delete_undef_values() functions
2013-08-05added delete_values() and delete_undef_values() functionsPaweł Tomulik
2013-07-22Merge branch 'uriescape-use_default_escape_list'Adrien Thebo
This closes GH-164