Commit graph

706 commits

Author SHA1 Message Date
Jeff McCune
1e5618c44f Merge branch '2.x' into 3.x
* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
	CHANGELOG
	Modulefile
2012-11-28 14:39:29 -08:00
Jeff McCune
2b7591896d Update Modulefile, CHANGELOG for 2.6.0 2012-11-28 14:38:27 -08:00
Jeff McCune
bdef98d632 Merge branch '4.x'
* 4.x:
  Add reject() function
2012-11-28 14:29:39 -08:00
Jeff McCune
89fa98579c Merge branch '3.x' into 4.x
* 3.x:
  Add reject() function
2012-11-28 14:29:32 -08:00
Jeff McCune
16fe71867c Merge branch '2.x' into 3.x
* 2.x:
  Add reject() function
2012-11-28 14:29:14 -08:00
Jeff McCune
26819f9688 Merge branch 'duritong-fun/2.x/reject' into 2.x
* duritong-fun/2.x/reject:
  Add reject() function
2012-11-28 14:29:01 -08:00
Peter Meier
a79b2cdf43 Add reject() function
Like the grep function, but we can now reject members of an array
based on a pattern.
2012-11-28 14:28:31 -08:00
Jeff McCune
06bc5da3d6 Merge branch '4.x'
* 4.x:
  Revert "(Maint) Add spec/functions to rake test task"
2012-11-27 17:09:25 -08:00
Jeff McCune
e4aa347324 Merge branch '3.x' into 4.x
* 3.x:
  Revert "(Maint) Add spec/functions to rake test task"
2012-11-27 17:08:20 -08:00
Jeff McCune
be6d456325 Merge branch '2.x' into 3.x
* 2.x:
  Revert "(Maint) Add spec/functions to rake test task"

Conflicts:
	Rakefile
2012-11-27 17:08:12 -08:00
Jeff McCune
59cc85deb5 Revert "(Maint) Add spec/functions to rake test task"
This reverts commit dbe3c8ecf6.

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-27 17:06:29 -08:00
Jeff McCune
4f91efa56e Merge branch '4.x'
* 4.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.
2012-11-27 16:22:26 -08:00
Jeff McCune
2b593625b6 Merge branch '3.x' into 4.x
* 3.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.
2012-11-27 16:22:18 -08:00
Jeff McCune
aa1e743e38 Merge branch '2.x' into 3.x
* 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-27 16:22:11 -08:00
Jeff McCune
965245eb97 Merge branch 'metcalfc/2.x/ensure_packages' into 2.x
* 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 16:19:52 -08:00
Jeff McCune
dbe3c8ecf6 (Maint) Add spec/functions to rake test task
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-27 16:18:07 -08:00
Jeff McCune
616b4521f4 Add example behaviors for ensure_packages() function
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-27 16:16:28 -08:00
Chad Metcalf
8a8c09ed34 Add an ensure_packages function.
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-27 16:16:28 -08:00
Jeff McCune
e590e1b00e Merge branch '4.x'
* 4.x:
  (#17797) min() and max() functions
2012-11-26 16:34:23 -08:00
Jeff McCune
5a1507eebf Merge branch '3.x' into 4.x
* 3.x:
  (#17797) min() and max() functions
2012-11-26 16:34:15 -08:00
Jeff McCune
276abac257 Merge branch '2.x' into 3.x
* 2.x:
  (#17797) min() and max() functions
2012-11-26 16:34:04 -08:00
Jeff McCune
6f76d8dfd1 Merge branch 'fun/2.x/min_max' into 2.x
* fun/2.x/min_max:
  (#17797) min() and max() functions
2012-11-26 16:33:56 -08:00
Erik Dalén
9954133844 (#17797) min() and max() functions
returns the min or max of all arguments given to them
2012-11-26 16:33:44 -08:00
Jeff McCune
06952967bf Merge branch '4.x'
* 4.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path
2012-11-26 11:41:34 -08:00
Jeff McCune
9224e37076 Merge branch '3.x' into 4.x
* 3.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path
2012-11-26 11:41:25 -08:00
Jeff McCune
0648148bfb Merge branch '2.x' into 3.x
* 2.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path
2012-11-26 11:41:01 -08:00
Jeff McCune
b55994b2be Merge branch 'fun/2.x/14670_file_line_autorequire' into 2.x
* fun/2.x/14670_file_line_autorequire:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path
2012-11-26 11:39:26 -08:00
Jeff McCune
d8cde95295 (#14670) Fixup file_line autorequire specs
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 11:37:08 -08:00
Peter Meier
dfcee63afb (#14670) autorequire a file_line resource's path
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-26 10:35:18 -08:00
Jeff McCune
32419e77ed Merge branch '4.x'
* 4.x:
  Add join_keys_to_values function
2012-11-20 16:17:08 -05:00
Jeff McCune
8647691c3a Merge branch '3.x' into 4.x
* 3.x:
  Add join_keys_to_values function
2012-11-20 16:16:59 -05:00
Jeff McCune
ad262b56a4 Merge branch '2.x' into 3.x
* 2.x:
  Add join_keys_to_values function
2012-11-20 16:16:50 -05:00
Jeff McCune
6c104e5e3a Merge branch 'lifton-feature/2.x/join_keys_to_values_function' into 2.x
* lifton-feature/2.x/join_keys_to_values_function:
  Add join_keys_to_values function
2012-11-20 16:16:37 -05:00
Joshua Harlan Lifton
ee0f2b307d Add join_keys_to_values function
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-20 16:16:03 -05:00
Jeff McCune
326a13908b Merge branch 'jfryman-master'
* jfryman-master:
  puppet-lint cleanup
2012-11-19 11:23:50 -05:00
Jeff McCune
f40bb1e288 Merge branch '4.x'
* 4.x:
  Extend delete function for strings and hashes
  Fixed typo
2012-11-19 08:45:48 -05:00
Jeff McCune
eba7d6ac79 Merge branch '3.x' into 4.x
* 3.x:
  Extend delete function for strings and hashes
  Fixed typo
2012-11-19 08:45:39 -05:00
Jeff McCune
824ea6d49f Merge branch '2.x' into 3.x
* 2.x:
  Extend delete function for strings and hashes
  Fixed typo
2012-11-19 08:45:31 -05:00
Jeff McCune
6c36b494a0 Merge branch 'lifton-feature/2.x/extend_delete_function' into 2.x
* lifton-feature/2.x/extend_delete_function:
  Extend delete function for strings and hashes
  Fixed typo
2012-11-19 08:45:18 -05:00
Joshua Harlan Lifton
7322e4dc2f Extend delete function for strings and hashes
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-19 08:44:44 -05:00
Joshua Harlan Lifton
0798059361 Fixed typo 2012-11-19 08:44:44 -05:00
James Fryman
88acc52393 puppet-lint cleanup 2012-11-15 10:38:03 -06:00
Jeff McCune
fda49d4ab3 Merge branch '4.x'
* 4.x:
  Add the pick() function
2012-11-15 08:57:40 -05:00
Jeff McCune
598ef3a62c Merge branch '3.x' into 4.x
* 3.x:
  Add the pick() function
2012-11-15 08:57:28 -05:00
Jeff McCune
5353cd77b7 Merge branch '2.x' into 3.x
* 2.x:
  Add the pick() function
2012-11-15 08:57:21 -05:00
Jeff McCune
43dd606982 Merge branch 'feature/2.x/pick' into 2.x
* feature/2.x/pick:
  Add the pick() function
2012-11-15 08:56:52 -05:00
Gary Larizza
ba6dd13990 Add the pick() function
This function is similar to a coalesce function in SQL in that it will
return
the first value in a list of values that is not undefined or an empty
string
(two things in Puppet that will return a boolean false value).
Typically,
this function is used to check for a value in the Puppet
Dashboard/Enterprise
Console, and failover to a default value like the following:

  $real_jenkins_version = pick($::jenkins_version, '1.449')

The value of $real_jenkins_version will first look for a top-scope
variable
called 'jenkins_version' (note that parameters set in the Puppet
Dashboard/
Enterprise Console are brought into Puppet as top-scope variables), and,
failing that, will use a default value of 1.449.
2012-11-15 08:52:19 -05:00
Jeff McCune
747dcc6fc7 Merge branch '4.x'
* 4.x:
  (#13974) Add predicate functions for interface facts
2012-11-07 14:03:44 -08:00
Jeff McCune
f9616ef72f Merge branch '3.x' into 4.x
* 3.x:
  (#13974) Add predicate functions for interface facts
2012-11-07 14:03:31 -08:00
Jeff McCune
b97e053cad Merge branch '2.x' into 3.x
* 2.x:
  (#13974) Add predicate functions for interface facts
2012-11-07 14:03:22 -08:00