Commit graph

1476 commits

Author SHA1 Message Date
David Schmitt
9224143da2 Merge pull request #618 from ntpttr/fix/master/modules-3568
(MODULES-3568) Move dig to dig44 and deprecate dig
2016-07-13 09:50:30 +01:00
TP Honey
e723c7c292 Merge pull request #619 from DavidS/modulesync
(MAINT) modulesync [067d08a]
2016-07-11 09:23:42 +01:00
Nate Potter
a2f980d44d (MODULES-3568) Move dig to dig44 and deprecate dig
A new version of dig was introduced in Puppet 4.5.0 that
isn't compatible with the stdlib version of dig. To maintain
backwards compatibility and ensure that tests for stdlib aren't
broken, this patch renames dig to dig44 and adds a deprecation
warning to the stdlib dig function.
2016-07-08 08:53:24 -07:00
David Schmitt
be70aeba33 (MODULES-3581) modulesync [067d08a] 2016-07-08 13:43:12 +01:00
Helen
9465eeaea7 Merge pull request #616 from DavidS/modules-3435-fix-stdlib-symlinks
(MODULES-3435) remove symlinks
2016-07-01 12:41:08 +01:00
David Schmitt
daa80f168f (MODULES-3435) Fix gitignore and fixtures directory
This change more accurately reflects what is being ignored and what's
required as fixtures.
2016-07-01 12:03:59 +01:00
David Schmitt
5c51463c1f Fix load_module_metadata and loadjson tests to pass with fully deployed module
When replacing the lib/ and manifests/ symlinks in the fixtures with
a proper top-level symlink, puppet 4 starts loading the metadata.json
before loading functions, which confuses these tests. Added more specific
expectations, and provide data for that call.
2016-07-01 12:03:59 +01:00
TP Honey
6bab96ec26 Merge pull request #615 from DavidS/modules-3543-update-tests-and-function
(MODULES-3543) Fixup defined_with_params to work on all puppet versions
2016-06-30 11:47:00 +01:00
David Schmitt
3f86e3a731 (MODULES-3543) Fixup defined_with_params to work on all puppet versions 2016-06-30 11:10:24 +01:00
TP Honey
70d543e66a Merge pull request #614 from DavidS/MODULES-3543-fix-defined_with_params
(MODULES-3543) Fix define_with_params to handle undef properly
2016-06-30 09:55:49 +01:00
David Schmitt
af875b11ff (MODULES-3543) Fix define_with_params to handle undef properly
As described in PUP-6422,

	ensure_resources('File[/tmp/a]', { owner => undef })

would not actually create the file. This fixes it, and adds tests to prove
it.
2016-06-29 21:33:00 +01:00
Hunter Haugen
50cf8bd5b7 Merge pull request #610 from bmjen/modules-3507
(MODULES-3507) Updates file_line path validation
2016-06-29 07:15:39 -07:00
David Schmitt
7053868eaf Merge pull request #612 from puppetlabs/modulesync
{maint} modulesync 0794b2c
2016-06-29 11:42:35 +01:00
tphoney
d401d7f252 {maint} modulesync 0794b2c 2016-06-29 10:42:31 +01:00
Bryan Jen
7b1250478c (MODULES-3507) Updates file_line path validation 2016-06-28 16:45:56 -07:00
tphoney
098e82e694 {maint} modulesync changes for puppet-lint 2.0.0 2016-06-28 16:36:03 +01:00
JT (Jonny)
b7e1f8974b Merge pull request #605 from jyaworski/delete_optional_param
Add delete_regex
2016-05-16 15:34:25 +01:00
Joseph Yaworski
dd71c02880 Add a delete_regex function
To maintain backwards compatibility, add a delete_regex function instead
of modifying delete itself.
2016-05-13 13:25:35 -04:00
Bryan Jen
ecfdbb2690 Merge pull request #600 from dmitryilyin/master
Add the default value to the "loadyaml" function
2016-05-12 14:14:14 -07:00
Hunter Haugen
7a008a70b6 Merge pull request #606 from stbenjam/MODULES-3354
(MODULES-3354) Use 1.8.7 hash in validate_email_address function
2016-05-11 16:48:12 -07:00
Hunter Haugen
1b00c3bf3d Merge pull request #604 from rjw1/patch-1
Add a missing s in the ensure_packages hash example
2016-05-11 15:55:01 -07:00
Stephen Benjamin
f47df3b4b5 (MODULES-3354) Use 1.8.7 hash in validate_email_address function 2016-05-11 15:52:50 -04:00
bob
8f1efdad22 Add a missing s in the ensure_packages hash example 2016-05-11 10:52:25 +01:00
Bryan Jen
b2165dfc34 Merge pull request #601 from petems/MODULES-1439-any2bool_added
(MODULES-1439) Adds any2bool function
2016-05-05 10:13:10 -07:00
Bryan Jen
f46c9fdbce Merge pull request #592 from jyaworski/fix_delete
Use reject instead of delete_if
2016-05-04 09:13:20 -07:00
Joseph Yaworski
540546b9b4 Use reject instead of delete_if 2016-05-04 11:32:10 -04:00
Bryan Jen
f48747b8af Merge pull request #603 from puppetlabs/4.12.x
Mergeback 4.12.x
2016-05-03 15:09:33 -07:00
Peter Souter
420f76d8dc (MODULES-1439) Adds any2bool function
* Basically a combination of `string2bool` and `num2bool`
2016-05-02 20:04:56 +01:00
Joris
9e1f74f3fc Expose the functions of ruby's built-in Shellwords module (#580)
* Add shell_escape function, shell_join function & shell_split function
2016-04-28 18:44:30 +01:00
Jean B
2a75ed08a1 Merge pull request #602 from hunner/unbreakline
Remove hard linebreaks
2016-04-28 10:38:00 -07:00
Hunter Haugen
db6e2f81b4 Remove hard linebreaks 2016-04-27 15:34:19 -07:00
Dmitry Ilyin
870a272cee Add the default value to the "loadyaml" function
This value will be returned if the is no file
to load or a file could not be parsed.
It's similar to the "parseyaml" function's
default value.

Add the "loadjson" function too
2016-04-26 21:58:29 +03:00
Helen
fc18517905 Merge pull request #599 from hunner/fix_delete
Undo changing delete() to delete regex matches
2016-04-26 16:24:32 +01:00
Hunter Haugen
19752a7ff3 Remove todo for delete() and update spec
This spec should verify that substring matches are not removed in the
future
2016-04-25 14:36:53 -07:00
Hunter Haugen
232de137f1 Revert "Add support for regular expressions to delete"
This reverts commit 0d46515b57.

It introduced backwards-incompatible functionality.
2016-04-25 14:33:43 -07:00
Greg Hardy
24797bb5ad Merge pull request #593 from puppetlabs/update-msync
Update to newest modulesync_configs [9ca280f]
2016-04-19 11:45:08 +01:00
David Schmitt
ee6413b95a Update to newest modulesync_configs [9ca280f] 2016-04-18 20:15:09 +01:00
Helen
27236a73b2 Merge pull request #598 from DavidS/MODULES-3271-legacy-ruby
(MODULES-3271) Ensure that is_email_address works on unsupported rubies
2016-04-18 11:52:26 +01:00
David Schmitt
79c871322f (MODULES-3271) Ensure that is_email_address works on unsupported rubies 2016-04-18 09:46:30 +01:00
Helen
768b6ce9f4 Merge pull request #596 from tphoney/4.12.0_release_prep
4.12.0 release prep
2016-04-15 13:33:49 +01:00
tphoney
cf171a7279 4.12.0 release prep 2016-04-15 13:32:04 +01:00
Helen
d9f65387c9 Merge pull request #595 from tphoney/4.12.0_release
master to 4.12.x
2016-04-15 13:29:23 +01:00
Bryan Jen
085035dcce (FM-5000) Release prep for 4.12.0. 2016-04-15 13:21:44 +01:00
Hunter Haugen
733508677d Merge pull request #591 from jyaworski/delete_regex
Add support for regular expressions to delete
2016-04-12 10:41:48 -07:00
Joseph Yaworski
0d46515b57 Add support for regular expressions to delete 2016-04-12 13:10:39 -04:00
Hunter Haugen
e3a6e2c601 Merge pull request #590 from alext/fix_concat_with_hash
(MODULES-3246) Fix concat with Hash arguments.
2016-04-11 15:02:58 -07:00
TP Honey
60864fd39b Merge pull request #583 from jyaworski/validate_email_address
Add validate_email_address function
2016-04-11 16:04:25 +01:00
Joseph Yaworski
bfe6cf68b3 Add validate_email_address function 2016-04-10 22:28:03 -04:00
Alex Tomlins
44596e73da (MODULES-3246) Fix concat with Hash arguments.
85d5ead Updated the concat function so that it wouldn't modify the
original array. A side-effect of this change is that it now always calls
`Array()` on the second argument. If thit is a Hash, this results in
`to_a` being called on the hash, which converts it to an array or
tuples. This is undesired.

Update the behaviour so that it doesn't (indirectly) call `to_a` on
anything, instead test for the type of the argument, wrapping it in an
array if it's not already an array.
2016-04-08 13:42:13 +01:00
Hunter Haugen
be1ff3f09e Merge pull request #585 from jearls/MODULES-2370-update-validate-to-not-require-line-when-matching-for-absence
[MODULES-2370] file_line.rb: Fix `line` attribute validation
2016-04-07 15:10:07 -07:00