summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-08Merge branch '2.x' into 3.xAdrien Thebo
This ignores the 2.x .travis.yml when merging up since that version is only applicable to the 2.x branch. Conflicts: .travis.yml
2013-04-08Merge branch '2.x-backport_gemfile' into 2.xAdrien Thebo
2013-04-08(maint) Backport Gemfile and .travis.yml to 2.xAdrien Thebo
This is a partial backport and update of 03c5c4a434c2290c021034dbfed82cb0f97e0e87 to add travis-ci support and a Gemfile to 2.x. Right now we're not testing 2.x in travis-ci and we're experiencing spec failures because we have to install rspec-puppet from git. The best resolution for this is to consistently use a Gemfile for running tests. This commit also rewrites the .travis.yml for 2.x to only test 2.x versions against ruby 1.8.7 and Puppet < 3.0 Conflicts: .travis.yml
2013-03-27Merge branch '2.x' into 3.xAdrien Thebo
2013-03-27Merge branch 'pull-136' into 2.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-18Merge branch '2.x' into 3.xAdrien Thebo
2013-03-18Merge branch 'pull-115' into 2.xAdrien Thebo
2013-03-18str2bool should return a boolean if called with a booleanJustin Lambert
2013-03-18Merge branch '2.x' into 3.xAdrien Thebo
2013-03-18Merge branch 'pull-98' into 2.xAdrien Thebo
2013-03-18Fix number of arguments check in flatten()Uwe Stuehler
The function only uses the first argument, so raise an error with too few arguments *and* with too many arguments.
2013-02-25Merge branch 'maint/3.x/ruby_two_travis' into 3.xJeff McCune
* maint/3.x/ruby_two_travis: (maint) Add Ruby 2.0.0 to Travis build matrix
2013-02-25(maint) Add Ruby 2.0.0 to Travis build matrixJeff McCune
Without this patch we're not testing against Ruby 2.0.0 which has recently been released. This is a problem because we'd like a way to be notified if a change set breaks compatibility with future supported versions of Ruby. This patch should not be taken as an indication that we fully support Ruby 2.0, just as an indication that we plan to in the future. This patch also tightens up the specifications of the build matrix. In addition to testing against the specific Puppet dependency versions, we're also testing against the latest 2.7.x release and the latest release.
2013-02-18Merge branch '2.x' into 3.xJeff McCune
* 2.x: changed .count to .size to support legacy ruby
2013-02-18Merge branch 'mhellmic-2.x' into 2.xJeff McCune
* mhellmic-2.x: changed .count to .size to support legacy ruby
2013-02-18changed .count to .size to support legacy rubyMartin Hellmich
2013-01-03Merge branch '3.2.x' into 3.xJeff McCune
* 3.2.x: Add test/validation for is_float if created from an arithmetical operation Add test/validation for is_integer if created from an arithmetical operation Add test/validation for is_numeric if created from an arithmetical operation
2013-01-03Merge branch 'stephenrjohnson-bug/3.x/18157_arithmetical_operations' into 3.2.xJeff McCune
* stephenrjohnson-bug/3.x/18157_arithmetical_operations: Add test/validation for is_float if created from an arithmetical operation Add test/validation for is_integer if created from an arithmetical operation Add test/validation for is_numeric if created from an arithmetical operation
2013-01-03Add test/validation for is_float if created from an arithmetical operationstephen
2013-01-03Add test/validation for is_integer if created from an arithmetical operationstephen
2013-01-03Add test/validation for is_numeric if created from an arithmetical operationstephen
2012-11-28Update Modulefile, CHANGELOG for 3.2.0Jeff McCune
2012-11-28Merge branch '2.x' into 3.xJeff McCune
* 2.x: Update Modulefile, CHANGELOG for 2.6.0 Conflicts: CHANGELOG Modulefile
2012-11-28Update Modulefile, CHANGELOG for 2.6.0Jeff McCune
2012-11-28Merge branch '2.x' into 3.xJeff McCune
* 2.x: Add reject() function
2012-11-28Merge branch 'duritong-fun/2.x/reject' into 2.xJeff McCune
* duritong-fun/2.x/reject: Add reject() function
2012-11-28Add reject() functionPeter Meier
Like the grep function, but we can now reject members of an array based on a pattern.
2012-11-27Merge branch '2.x' into 3.xJeff McCune
* 2.x: Revert "(Maint) Add spec/functions to rake test task" Conflicts: Rakefile
2012-11-27Revert "(Maint) Add spec/functions to rake test task"Jeff McCune
This reverts commit dbe3c8ecf6379963f583ea11e51e403e5ad55002. Because testing these against Puppet 2.6.x is causing failures. These need to be cleaned up, but I want to leave and this was the behavior before I tried to "fix" it.
2012-11-27Merge branch '2.x' into 3.xJeff McCune
* 2.x: (Maint) Add spec/functions to rake test task Add example behaviors for ensure_packages() function Add an ensure_packages function. Conflicts: Rakefile
2012-11-27Merge branch 'metcalfc/2.x/ensure_packages' into 2.xJeff McCune
* metcalfc/2.x/ensure_packages: (Maint) Add spec/functions to rake test task Add example behaviors for ensure_packages() function Add an ensure_packages function.
2012-11-27(Maint) Add spec/functions to rake test taskJeff McCune
Without this patch the `test` rake task does not exercise the rspec-puppet behaviors located in spec/functions/ This is a self-evident problem. This patch fixes the problem by adding spec/functions to the list of directories scanned for spec tests.
2012-11-27Add example behaviors for ensure_packages() functionJeff McCune
Without this patch the ensure_packages() function has no rspec behavior examples. This patch fixes the problem by filling out a spec file with expected behaviors I could think of.
2012-11-27Add an ensure_packages function.Chad Metcalf
Its often the case that modules need to install a handful of packages. In some cases its worth breaking these dependencies out into their own modules (e.g., Java). In others it makes more sense to keep them in the module. This can be problematic when multiple modules depend on common packages (git, python ruby, etc). ensure_resource was a good first step towards solving this problem. ensure_resource does not handle arrays and for 3 or more packages stamping out ensure_resource declarations is tedious. ensure_packages is a convenience function that takes an array of packages and wraps calls to ensure_resource. Currently users cannot specify package versions. But the function could be extended to use a hash if that functionality would be useful.
2012-11-26Merge branch '2.x' into 3.xJeff McCune
* 2.x: (#17797) min() and max() functions
2012-11-26Merge branch 'fun/2.x/min_max' into 2.xJeff McCune
* fun/2.x/min_max: (#17797) min() and max() functions
2012-11-26(#17797) min() and max() functionsErik Dalén
returns the min or max of all arguments given to them
2012-11-26Merge branch '2.x' into 3.xJeff McCune
* 2.x: (#14670) Fixup file_line autorequire specs (#14670) autorequire a file_line resource's path
2012-11-26Merge branch 'fun/2.x/14670_file_line_autorequire' into 2.xJeff McCune
* fun/2.x/14670_file_line_autorequire: (#14670) Fixup file_line autorequire specs (#14670) autorequire a file_line resource's path
2012-11-26(#14670) Fixup file_line autorequire specsJeff McCune
Without this patch applied the file_line autorequire examples are failing. This is a problem because the failures are false positives and should be passing given the implementation. This patch fixes the problem by changing the examples to directly test the existence of the relationship by finding it in the list of autorequire relationships.
2012-11-26(#14670) autorequire a file_line resource's pathPeter Meier
If we manage a file we edit with file_line, it should be autorequired by file_line. Without this patch applied the relationship is not automatically setup and the user is forced to manually manage the relationship.
2012-11-20Merge branch '2.x' into 3.xJeff McCune
* 2.x: Add join_keys_to_values function
2012-11-20Merge branch 'lifton-feature/2.x/join_keys_to_values_function' into 2.xJeff McCune
* lifton-feature/2.x/join_keys_to_values_function: Add join_keys_to_values function
2012-11-20Add join_keys_to_values functionJoshua Harlan Lifton
This commit adds a function that joins each of a hash's keys with that key's corresponding value, separated by a separator string. The arguments are a hash and separator string. The return value is an array of joined key/value pairs.
2012-11-19Merge branch '2.x' into 3.xJeff McCune
* 2.x: Extend delete function for strings and hashes Fixed typo
2012-11-19Merge branch 'lifton-feature/2.x/extend_delete_function' into 2.xJeff McCune
* lifton-feature/2.x/extend_delete_function: Extend delete function for strings and hashes Fixed typo
2012-11-19Extend delete function for strings and hashesJoshua Harlan Lifton
Previous to this commit, the delete function only acted on arrays. This commit adds the same functionality for hashes and strings in the obvious way: delete(h, k) would delete the k key from the h hash and delete(s, sub) would delete all instances of the sub substring from the s string.
2012-11-19Fixed typoJoshua Harlan Lifton
2012-11-15Merge branch '2.x' into 3.xJeff McCune
* 2.x: Add the pick() function