Commit graph

809 commits

Author SHA1 Message Date
Justin Burnham
c12e9afc97 PUP-1724 Don't modify the paramaters to deep_merge
Instead of modifying the first paramater of deep_merge due to the
use of the merge! function, instead use merge to return a copy of
the merged object. This allows one to continue to use the original
first parameter after the call to deep_merge.
2014-02-17 12:19:40 -08:00
Ashley Penney
ab981422a6 Merge pull request #217 from teancom/fix/master/file_line
(DOCUMENT-21) add docs for file_line to README.markdown
2014-02-11 12:51:37 -05:00
Ashley Penney
2435741ca7 Merge pull request #219 from petems/patch-1
Fix strftime documentation in README
2014-02-11 12:51:22 -05:00
Peter Souter
d4722d7af5 Fix strftime documentation in README
Markdown was barfing due to typo
2014-02-11 15:57:22 +00:00
Hunter Haugen
dacdfaac7f Merge pull request #218 from mediatemple/remove_trailing_whitespace
Remove trailing whitespace
2014-02-05 15:06:09 -08:00
Sharif Nassar
a972e0645b Remove trailing whitespace 2014-02-05 15:01:45 -08:00
Andrew Parker
5b85e7c39f Merge branch 'DavidS-broaden-pick-arguments2'
* DavidS-broaden-pick-arguments2:
  (PUP-638) Add a pick_default() function that always returns a value.
  (PUP-636) Ignore generated file
2014-01-29 09:28:48 -08:00
David Schmitt
52fcef573f (PUP-638) Add a pick_default() function that always returns a value.
This version of pick() does not error out, instead always returning at least
the last argument, even if that too has no "real" value.
2014-01-29 09:26:35 -08:00
David Schmitt
9346b108ce (PUP-636) Ignore generated file 2014-01-29 09:25:59 -08:00
Andrew Parker
a2e9d005c7 Merge pull request #215 from blkperl/add_root_home_to_mavericks
(PUP-1459) Add support for root_home on OS X 10.9
2014-01-28 10:52:58 -08:00
David Bishop
dbba655c10 (DOCUMENT-21) add docs for file_line to README.markdown
Without this, you have to look at the source file
(lib/puppet/type/file_line.rb) to know what it does. This adds that
documentation.
2014-01-25 13:30:50 -05:00
Henrik Lindberg
2c8450d830 (PUP-1195) Rephrase documentation for is_integer and is_numeric
The documentation contained references to future decisions about
functionality. 
Text rephrased for clarity.
2014-01-24 00:22:09 +01:00
Simon Effenberg
264dc9bbde (PUP-1195) Fix is_numeric/is_integer when checking non-string parameters
I expect a function called "is_numeric" or "is_integer" to check if a
variable is an integer or a number even if the variable passed by isn't
a string nor a number at all. Otherwise we should call them
is_string_a_number and is_string_an_integer and we have then to remove
the check for .is_a?(Number) and .is_a?(FixNum)

now checking also if it is a hex or octal number

improved/corrected checking for integer

* checking against Integer instead of Fixnum so that
  also Bignum is matching
* now .is_a? Integer is done first so this is quiet fast

Now many types of numerics are recognized.

1. Float/Integer values (signed or unsigned, with exponent or without)
2. octal and hex check
3. except hex numbers and the "0." in a float lower than 1 can be prefixed
   with a '0'.

whitespaces shouldn't be allowed as prefix/suffix

string representation of numbers should not contain any type of
whitespace.. the user is responsible to clean a string before checking
it..

fix documentation and added more checks

tried to be 99.9% backward compatible

* for now the decission is post poned if hex and octal numbers
  should be allowed or not (is_numeric)
* native Bignum is now also a valid integer class

fix problem with old 1.8 ruby and Hash.to_s/Array.to_s

In ruby < 1.9 array and hashes would be recognized as numeric
if they have a special format:

1.8:

  [1,2,3,4].to_s = "1234"
  {1=>2}.to_s    = "12"

1.9:

  [1,2,3,4].to_s = "[1, 2, 3, 4]"
  {1=>2}.to_s    = "{1=>2}"
2014-01-23 23:59:28 +01:00
Hunter Haugen
2cf6e3c0f3 Merge pull request #216 from ghoneycutt/enable_travis_fast_finish
Enable fast finish in Travis
2014-01-23 14:49:56 -08:00
Garrett Honeycutt
8f192a5a82 Enable fast finish in Travis
http://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
2014-01-23 14:18:50 -05:00
William Van Hevelingen
fe676f0ac4 (PUP-1459) Add support for root_home on OS X 10.9
getent does not exist on 10.9 so this commit uses
dscacheutil to query the homedir for the root user.
2014-01-22 22:54:34 -08:00
Adrien Thebo
e49d356fbf Merge branch 'pull-201'
This closes GH-201.
2014-01-15 11:17:48 -08:00
Adrien Thebo
75341f01d9 (maint) Update ensure_package specs to confirm expected behavior
The previous behavior of the tests checked the behavior of the
underlying functions library when called with no arguments; this commit
updates the tests to conform to the functions API and test what happens
when a function is called with no args.
2014-01-15 11:04:03 -08:00
Adrien Thebo
686a05aea2 (maint) refactor ensure_packages for clarity 2014-01-15 11:03:49 -08:00
Tomas Doran
735db82bef Allow a single argument, rather than an array 2014-01-15 11:03:33 -08:00
Andrew Parker
01c9c3c979 Merge pull request #214 from zaphod42/maint/master/update-references-for-jira
(doc) Update to point to Jira
2013-12-26 09:36:44 -08:00
Andrew Parker
bce5b76f66 (doc) Update to point to Jira
Since we've moved from Redmine to Jira the links need to be updated so
that people know where to look for issues.

At the moment stdlib is being tracked with puppet in the PUP project.
This doesn't seem like a good, long term solution, but it is where we
are right now.
2013-12-23 15:35:08 -08:00
Adrien Thebo
b50385b623 Merge branch 'pull-209'
This closes GH-209
2013-12-20 15:04:18 -08:00
Adrien Thebo
7085472e69 (maint) Improve test coverage for prefix and suffix 2013-12-20 15:03:40 -08:00
Franco Catena
7991dd2073 Fix prefix exception message (Closes #23364) 2013-12-20 14:50:57 -08:00
Andrew Parker
799e968f5c (Maint) Update stubbing to work with facter 1.7.4
Facter 1.7.4 changed how it decides on what directory to look in for
facts.d based on the user it is running as. This stubs out that bit of
code to make it think it is running as root.
2013-12-18 14:46:54 -08:00
Andrew Parker
1cf4b04b33 Merge pull request #211 from jhoblitt/function_is_bool
(#23381) add is_bool() function
2013-12-18 10:49:39 -08:00
Andrew Parker
7dc0fb68e2 Merge pull request #208 from ghoneycutt/add_validation
Add rake tasks to validate and lint files and check with Travis
2013-12-18 10:45:10 -08:00
Josh Cooper
ef2cfd7982 Merge pull request #207 from ghoneycutt/remove_unintentional_link
Remove unintentional link from README
2013-12-18 10:38:40 -08:00
Andrew Parker
210e3b7f6c Merge pull request #203 from dreamlibrarian/fix/is_function_available-ruby_c
calling rspec directly makes is_function_available.rb not pass ruby -c
2013-12-18 10:31:39 -08:00
Jeff McCune
5d4c95ec50 (maint) Update README stating stdlib 4.x supports Puppet 2.7.x
Without this patch there is a disconnect between the documentation in
the README and our decision to not merge pull requests into the 4.x
series that break compatibility with Puppet 2.7.x

For example:

    @jeffmccune I think the real issue here is that "policy" is out of sync with
    the documentation. The README claims that 4.x does not support puppet 2.7.x,
    yet the "policy" is not to merge patches that break 2.7.x. Due to that I'm sure
    there are a lot of 2.7.x installations out there that have a 4.x version of
    stdlib installed. That's going to cause a rather rude surprise if some future
    version of 4.x stops working where a prior minor release was functioning.

    I'd like to suggest that the documentation be changed to reflect 4.x supporting
    2.7.x and that a new major version bump is made when 2.7.x support can in fact
    be dropped. An alternative solution would be update the README with a note to
    developers about the kinda/sorta/maybe/fishy/quasi support of 2.7.x.

Please also see this discussion:
https://github.com/puppetlabs/puppetlabs-stdlib/pull/176#issuecomment-30251414
2013-12-12 11:15:13 -05:00
Adrien Thebo
224b8f9a19 Merge pull request #200 from bobtfish/fix_tests_on_osx
Fix the tests on osx
2013-12-09 14:18:17 -08:00
Joshua Hoblitt
1077881873 (#23381) add is_bool() function 2013-12-09 11:50:03 -07:00
Kylo Ginsberg
76514d4759 Merge pull request #210 from apenney/temp-fix
Pin rspec-puppet to 0.1.6 for now as the change to 1.0.0 has broken
2013-12-07 08:48:24 -08:00
Ashley Penney
7d78b3867a Pin rspec-puppet to 0.1.6 for now as the change to 1.0.0 has broken
things involving Mocha badly.
2013-12-06 18:50:09 -05:00
Garrett Honeycutt
9226037e4e Add rake tasks to validate and lint files and check with Travis
This patch adds the ability to validate syntax of manifests, templates,
and ruby files in lib/ via `rake validate` and the linting of manifests
with puppet-lint via `rake lint`. These two commands are chained with
running the spec tests in Travis to ensure there are no syntax or style
issues.
2013-11-30 11:18:43 -05:00
Garrett Honeycutt
ec8aaeecfa Remove unintentional link from README
Markdown interprets [] folowed by () as a link, which was a 404 and not
the intention of the original author. This patch ensures that the
document reads as intended, without the link.
2013-11-30 10:40:27 -05:00
Tristan Smith
4241eb4806 calling rspec directly makes this not pass ruby -c. adjusting to be in line with the rest. 2013-11-20 18:30:46 -08:00
Tomas Doran
a1978698ef Fix the tests on osx 2013-11-19 18:42:19 +00:00
Josh Partlow
44c181ec0e Merge branch 'fix/master/add_recursive_merge'
* 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 12:22:49 -07:00
Justin Burnham
199ca9c78b (#20200) Add a recursive merge function.
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-29 12:22:49 -07:00
Josh Cooper
ae4f52e9e5 Merge branch 'fix-pick-error-typo'
* fix-pick-error-typo:
  (Main) fix typo in pick error message

Closes GH-197
2013-10-29 12:01:39 -07:00
Matthew Haughton
57a5c0b3e3 (Main) fix typo in pick error message
Update pick error message "at least one non empty value"
2013-10-29 12:01:25 -07:00
Josh Cooper
d809a9ef41 Merge remote-tracking branch 'tchaudhri/tchaudhri_join_func_doc_typo'
* tchaudhri/tchaudhri_join_func_doc_typo:
  Fixed 'separator' typos

Closes GH-196
2013-10-29 11:10:12 -07:00
Tehmasp Chaudhri
753801537f Fixed 'separator' typos 2013-10-25 15:26:21 -06:00
Adrien Thebo
d60d872c1a Merge branch 'pull-180'
This closes GH-180
2013-09-18 21:56:16 -07:00
Adrien Thebo
63811b9d59 (maint) Simplify validate_cmd specs 2013-09-18 21:48:45 -07:00
sgzijl
9e0d8a8e0a (#22214): close content file before executing checkscript
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-18 21:32:07 -07:00
Adrien Thebo
7ccf8cf09b Merge pull request #184 from lmello/fix_bug_20681_delete_undef_values
delete_undef_values function fix bug #20681
2013-09-18 10:08:49 -07:00
Leonardo Rodrigues de Mello
80a8b7bd1f (#20681) fix behaviour of delete_undef_values
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-18 11:19:52 -03:00