From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 8 Aug 2011 23:58:14 +0000 (-0700)
Subject: Merge branch 'issue/master/8797_puppetlabs-functions_merge'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=33887f9be50c4fd94bbd08d7c00d9b3d97e29d21;p=puppet-stdlib.git

Merge branch 'issue/master/8797_puppetlabs-functions_merge'

Closes pull request #12

Reviewed-by: Jeff McCune

Verified all spec tests pass using rspec **/*_spec.rb

* issue/master/8797_puppetlabs-functions_merge: (164 commits)
  * Moved kwalify to puppetlabs-kwalify project * Re-arranged tests in line with puppetlabs-stdlib
  Prep for stdlib merge * Renamed load_yaml & load_json to parseyaml & parsejson * Renamed is_valid_* functions and remove the 'valid_'
  Fix some ruby 1.9.2 issues.
  (#3) Provide documentation for remaining functions.
  (#3) Apply missing documentation to more functions.
  Remove rand.
  Some improvements to values_at tests.
  (#1) provide some more detailed tests for a number of functions.
  Removed date stub since this functinality is available in strftime anyway.
  (#2) fix is_string finally so it also makes sure numbers return false.
  (#2) unstub is_valid_domain_name
  Added doc strings for first five functions
  Removed join_with_prefix.
  (#2) unstub is_valid_mac_address.
  Allow sort for strings.
  Count functionality overlaps with size - so removing it.
  Removed crontab functions instead of unstubbing them.
  Removed load_variables. load_yaml is sufficient to solve this problem on its own.
  Remove is_valid_netmask instead of unstubbing. Doesn't seem like a sensible function on its own.
  (#2) unstub is_numeric function.
  ...
---

33887f9be50c4fd94bbd08d7c00d9b3d97e29d21