summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-02-07Merge branch '2.2.x'Ken Barber
* 2.2.x: (#12377) Avoid infinite loop when retrying require json
2012-02-07Merge branch '2.1.x' into 2.2.xKen Barber
* 2.1.x: (#12377) Avoid infinite loop when retrying require json
2012-02-06Merge branch ↵Ken Barber
'ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful' into 2.1.x * ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful: (#12377) Avoid infinite loop when retrying require json
2012-02-06(#12377) Avoid infinite loop when retrying require jsonJeff McCune
Without this patch an infinite loop will be entered if the json and rubygems libraries are not available. This patch fixes the problem by retrying the `require 'json'` only if rubygems was successfully loaded for the first time. Subsequent attempts to load rubygems will cause the LoadError exception from a missing json library to be re-raised. Thanks to Krzysztof Wilczynski for pointing out this issue.
2012-02-03Merge pull request #33 from richardc/masterJeff McCune
Update a documentation comment - facts_dot_d
2012-02-03Update the documentation comment Richard Clamp
This is causing a little confusion, so make the comment match the behaviour.
2012-01-11Merge branch '2.2.x'Jeff McCune
* 2.2.x: Check according to rfc1035 Add additional domain name tests (maint) Memoize scope in domain_name spec
2012-01-11Merge branch 'bug/2.2.x/is_domain_name' into 2.2.xJeff McCune
* bug/2.2.x/is_domain_name: Check according to rfc1035 Add additional domain name tests (maint) Memoize scope in domain_name spec Closes pull request GH-24
2012-01-11Check according to rfc1035Stig Sandbeck Mathisen
Update doc string to match function
2012-01-11Add additional domain name testsJeff McCune
Without this patch some valid domain names are not covered in the spec tests as Stig Sandbeck Mathisen <ssm@debian.org> points out. This patch adds spec tests for the domains "." and "x.com" which are both valid.
2012-01-11(maint) Memoize scope in domain_name specJeff McCune
This is an opportunity improvement since I'm in the code. Get rid of instance variables in the spec test and replace them with a memo let method block.
2012-01-11Merge branch '2.2.x'Jeff McCune
* 2.2.x: (#11901) Fix sort order error in tests for 'keys' and 'values'
2012-01-11Merge branch 'ticket/2.2.x/11901-rspec_sort_order' into 2.2.xJeff McCune
* ticket/2.2.x/11901-rspec_sort_order: (#11901) Fix sort order error in tests for 'keys' and 'values'
2012-01-11(#11901) Fix sort order error in tests for 'keys' and 'values'Jeff McCune
Between Ruby 1.8.7 p352 and p357 the way arrays were returned when using keys and values in Ruby changed, and due to assumption about the ordering our tests are now failing. This patch fixes the issue by using the =~ operator matcher in rspec. This matcher is implemented as RSpec::Matchers::MatchArray and performs multiset equality matching of arrays. Order doesn't matter, but duplicate values do. This patch also switches @scope instance variables to memoized let methods for clarity in the code. Original Author: Ken Barber Reviewed-by: Nick Lewis This commit closes GH-29
2012-01-11Merge branch '2.2.x'Ken Barber
* 2.2.x: (#11873) time function spec failure on Fixnum matcher
2012-01-10Merge pull request #28 from kbarber/ticket/2.2.x/11873-time_spec_failureDaniel Pittman
(#11873) time function spec failure on Fixnum matcher
2012-01-10(#11873) time function spec failure on Fixnum matcherKen Barber
The rspec code for the time function was trying to match the type to be a 'Fixnum'. Ruby will sometimes make this a 'Bignum' depending on its internals and we can't rely on this to be true all the time. This patch just makes sure the type is an integer instead.
2012-01-09Merge pull request #27 from glarizza/feature/master/str2saltedsha512Jeff McCune
New str2saltedsha512 function for OS X Passwords
2012-01-09New str2saltedsha512 function for OS X PasswordsGary Larizza
OS X 10.7 introduced salted-SHA512 password hashes as opposed to the older LANMAN + SHA1 hashes. To assist in generating properly-formatted password hashes, this commit adds the str2saltedsha512() function which accepts a single string argument (the password) and returns a salted-SHA512 password hash which can be fed as the password attribute of a user resource in OS X 10.7. Spec tests are also added to ensure that functionality isn't broken with future commits.
2011-12-30Merge branch '2.2.x'Jeff McCune
* 2.2.x: (#11607) Add Rakefile to enable spec testing
2011-12-30Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: (#11607) Add Rakefile to enable spec testing
2011-12-30Merge pull request #26 from ↵Jeff McCune
jeffmccune/ticket/2.1.x/11607_fix_ci_tests_for_stdlib (#11607) Add Rakefile to enable spec testing
2011-12-30(#11607) Add Rakefile to enable spec testingJeff McCune
Without this patch the 2.1.x branch does not have a Rakefile like the 2.2.x and master branches do. This is a problem for the continuous integration testing since it executes `rake test` against 2.1.x, 2.2.x and master currently. This patch fixes the problem by copying the Rakefile into place enabling the `rake test` task. Reviewed-by: Josh Cooper
2011-12-30Merge branch '2.2.x'Jeff McCune
* 2.2.x: Update CHANGELOG and Modulefile for 2.2.1
2011-12-30Update CHANGELOG and Modulefile for 2.2.1Jeff McCune
2011-12-30Merge branch '2.2.x'Jeff McCune
* 2.2.x: Update Modulefile CHANGELOG for v2.1.2 release
2011-12-30Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: Update Modulefile CHANGELOG for v2.1.2 release Conflicts: CHANGELOG Modulefile
2011-12-30Update Modulefile CHANGELOG for v2.1.2 releaseJeff McCune
2011-12-30Merge branch 'v2.2.x'Jeff McCune
* v2.2.x: (maint) Add semantic versioning info to README
2011-12-30Merge branch 'v2.1.x' into v2.2.xJeff McCune
* v2.1.x: (maint) Add semantic versioning info to README Docs: Clarify the use case for the anchor type Docs: Remove author emails from stdlib functions Docs: Copyedit function doc strings Docs: Correct indentation of markdown code examples Docs: Update documentation of stdlib classes Docs: Update file_line documentation Docs: Improve example in merge function
2011-12-30(maint) Add semantic versioning info to READMEJeff McCune
This patch adds semantic versioning information to the README of this module. This information is missing and unclear without this patch. This should help clarify the support matrix for the Standard Library as it relates to Puppet Enterprise released versions.
2011-12-30Merge branch 'v2.x'Jeff McCune
* v2.x: Docs: Clarify the use case for the anchor type Docs: Remove author emails from stdlib functions Docs: Copyedit function doc strings Docs: Correct indentation of markdown code examples Docs: Update documentation of stdlib classes Docs: Update file_line documentation Docs: Improve example in merge function
2011-11-14Merge pull request #25 from bodepd/feature/master/10802_get_module_pathKen Barber
(#10802) add new function get_module_path
2011-11-14(#10802) add new function get_module_pathDan Bode
This commit adds a new function called get_module_path. get_module_path returns the absolute path of a specified module. The code and functionality is very similar to how templates and files are detected inside of modules. the function has been tested against puppet 2.6.10 and 2.7.x
2011-11-08Add note about semver.org leading v in tags.Jeff McCune
James pointed out this was lacking in my release process document. I've added a note about the leading v in the annotated tag as per http://semver.org/
2011-11-08Merge pull request #22 from jeffmccune/maint/master/update_release_processGarrett Honeycutt
Update the release process instructions.
2011-11-08Update the release process instructions.Jeff McCune
The release process document didn't really mention semver.org or the rubrics we use to pick version numbers at release. This patch adds some hints about picking a version number and looking for API breaking changes to the code.
2011-11-08Merge pull request #21 from puppetlabs/v2.2Garrett Honeycutt
* v2.x:
2011-11-08 * v2.x:James Turnbull
Update CHANGELOG and Modulefile for v2.2.0
2011-10-25Merge pull request #19 from nanliu/ticket/10285Ken Barber
(#10285) Refactor json to use pson instead.
2011-10-25(#10285) Refactor json to use pson instead.Nan Liu
Remove json requirement since puppet already provides pson which is equivalent.
2011-10-10Merge branch 'main/mater/watchr'Jeff McCune
* main/mater/watchr: (Maint) Add watchr autotest script
2011-10-10(Maint) Add watchr autotest scriptJeff McCune
This patch adds a watchr script to autotest the stdlib module. To use: % watchr spec/watchr.rb
2011-10-10Merge pull request #18 from jeffmccune/maint/master/make_tests_run_on_puppet_26Jeff McCune
(Maint) Make rspec tests work with Puppet 2.6.4
2011-10-10(Maint) Make rspec tests work with Puppet 2.6.4Jeff McCune
The behavior without this patch applied is that the rspec tests do not function with Puppet 2.6.4. This patch back-ports some fixes introduced in Puppet 2.7.x to the spec_helper to make the tests work as expected on Puppet 2.6.4. The specific patches back ported from Puppet are: * 2ae88067 (Puppet::Util::ExecutionStub.reset) * cf183534 (Switched spec tests to use a class rather than Array as the log destination.)
2011-10-10Merge branch 'ticket/master/revert_8925'Jeff McCune
* ticket/master/revert_8925: (#10007) Revert "Merge pull request #13 from kbarber/issue/master/8925-user_ssl_certs"
2011-10-10(#10007) Revert "Merge pull request #13 from ↵Jeff McCune
kbarber/issue/master/8925-user_ssl_certs" This reverts commit 14852e0259e1e43371dbcb2675e00c6d6e614f05, reversing changes made to a95dccd464b55945feb8bcf7483f777c25164115. This is to fix the broken build (failing tests) as per #8925 and #10007
2011-10-04Merge pull request #13 from kbarber/issue/master/8925-user_ssl_certsJames Turnbull
(#8925) Added new function called 'get_certificate' for retrieving
2011-10-03Merge branch 'ticket/master/9859_add_root_home_fact_to_stdlib'Jeff McCune
* ticket/master/9859_add_root_home_fact_to_stdlib: (#9859) Add root_home fact and tests
2011-10-03(#9859) Add root_home fact and testsJeff McCune
Without this patch applied, the stdlib module does not provide a root_home fact. This fact is necessary to easily determine the root account home directory on platforms Puppet is supported on. The major variations this fact address are: --- solaris: / linux: /root macosx: /var/root Spec tests using rspec have been provided as well to cover these three general cases. Windows tests are marked as pending.