summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-26Merge pull request #73 from branan/use_spechelper_gemChris Price
Update for new gem version of puppetlabs_spec_helper
2012-06-10Merge pull request #75 from ↵Jeff McCune
cprice-puppet/feature/master/regex-support-for-file-line Add support for a 'match' parameter to file_line
2012-06-07Add support for a 'match' parameter to file_lineChris Price
This commit adds a new parameter called "match" to the file_line resource type, and support for this new parameter to the corresponding ruby provider. This parameter is optional; file_line should work just as before if you do not specify this parameter... so this change should be backwards-compatible. If you do specify the parameter, it is treated as a regular expression that should be used when looking through the file for a line. This allows you to do things like find a line that begins with a certain prefix (e.g., "foo=.*"), and *replace* the existing line with the line you specify in your "line" parameter. Without this capability, if you already had a line "foo=bar" in your file and your "line" parameter was set to "foo=baz", you'd end up with *both* lines in the final file. In many cases this is undesirable.
2012-05-31Require the new puppetlabs_spec_helper gem nameBranan Purvine-Riley
2012-05-29Update for new gem version of puppetlabs_spec_helperBranan Purvine-Riley
This updates the Rakefile and spec_helper to use the common versions available in the puppetlabs_spec_helper rubygem branch. This mostly just removes a bunch of duplicated code, but it also gives us more flexibility in how the module is tested in the future.
2012-05-23Merge branch '2.3.x'Jeff McCune
* 2.3.x: Update CHANGELOG, Modulefile for 2.3.3
2012-05-23Update CHANGELOG, Modulefile for 2.3.3Jeff McCune
2012-05-23Merge branch '2.3.x'Jeff McCune
* 2.3.x: fix regression in #11017 properly
2012-05-23Merge pull request #70 from duritong/2.3.xJeff McCune
fix regression in #11017 properly
2012-05-23fix regression in #11017 properlyPeter Meier
We need the defaultvalues for that.
2012-05-11Merge branch '2.3.x'Jeff McCune
* 2.3.x: Fix spec tests using the new spec_helper
2012-05-11Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: Fix spec tests using the new spec_helper
2012-05-11Fix spec tests using the new spec_helperJeff McCune
This patch back ports the file from the master branch. The spec tests fail without this patch applied. This should make it easier to setup Puppet settings using the puppet_spec_helper project.
2012-05-10Merge branch '2.3.x'Jeff McCune
* 2.3.x: Update CHANGELOG for 2.3.2 release Make file_line default to ensure => present Memoize file_line spec instance variables Fix spec tests using the new spec_helper
2012-05-10Update CHANGELOG for 2.3.2 releaseJeff McCune
2012-05-10Merge branch 'fix/2.3.x/file_line_ensure' into 2.3.xJeff McCune
* fix/2.3.x/file_line_ensure: Make file_line default to ensure => present Memoize file_line spec instance variables Fix spec tests using the new spec_helper
2012-05-10Make file_line default to ensure => presentJeff McCune
The examples in the file_line resource documentation state the following resource should work: file_line { 'sudo_rule': path => '/etc/sudoers', line => '%sudo ALL=(ALL) ALL', } Without this patch the example does not work because ensure is not set to present. This patch fixes the problem by setting the default value of ensure to present.
2012-05-10Memoize file_line spec instance variablesJeff McCune
This just changes the instance variables to a memoized let block and gets ride of the before :each block. The patch has no change in behavior.
2012-05-10Fix spec tests using the new spec_helperJeff McCune
This patch back ports the file from the master branch. The spec tests fail without this patch applied. This should make it easier to setup Puppet settings using the puppet_spec_helper project.
2012-04-13Merge branch '2.3.x'Jeff McCune
* 2.3.x: Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x" (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-04-13Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x" (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-04-11Merge pull request #61 from ↵Chris Price
cprice-puppet/ticket/master/13693-use-puppetlabs-spec-helper (#13693) moving logic from local spec_helper to puppetlabs_spec_helper
2012-04-11(#13693) moving logic from local spec_helper to puppetlabs_spec_helperChris Price
This should simplify future compatibility between various versions of stdlib and various versions of puppet core.
2012-04-04Revert "Merge remote-tracking branch ↵Jeff McCune
'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x" This reverts commit 40da421c0480f940638d0db9aabf180500d6ae5c, reversing changes made to 69465b0f3e0c0c5284812bfa76ab8d3c254d10a9.
2012-04-04Merge remote-tracking branch ↵Jeff McCune
'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x * eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests: (#13595) initialize_everything_for_tests couples modules Puppet ver
2012-04-03(#13595) initialize_everything_for_tests couples modules Puppet verEric Shamow
Replace regex used in spec_helper.rb to disallow both Puppet 2.6 and any 2.7 prior to 13.
2012-03-29Merge branch '2.4.x'Jeff McCune
* 2.4.x: (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29Merge branch '2.3.x' into 2.4.xJeff McCune
* 2.3.x: (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try3' into 2.2.xJeff McCune
* ticket/2.2.x/13439_fix_spec_helper_try3: (#13439) Fix MRI 1.9 issue with spec_helper
2012-03-29(#13439) Fix MRI 1.9 issue with spec_helperJeff McCune
When using MRI 1.9.x the stdlib spec helper does not invoke because Puppet.settings.private_methods returns symbols instead of strings. This is a problem because we need to set default configuration settings like Puppet[:vardir] when using the compiler. This patch fixes the issue by simply checking the Puppet version. This seems a better choice than rescuing NoMethodError since the method might be renamed or removed in the future.
2012-03-29Merge branch '2.4.x'Jeff McCune
* 2.4.x: (#13439) Fix test failures with Puppet 2.6.x (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
2012-03-29Merge branch '2.3.x' into 2.4.xJeff McCune
* 2.3.x: (#13439) Fix test failures with Puppet 2.6.x (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13439) Fix test failures with Puppet 2.6.x
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.xJeff McCune
* ticket/2.2.x/13439_fix_spec_helper_try2: (#13439) Fix test failures with Puppet 2.6.x
2012-03-29(#13439) Fix test failures with Puppet 2.6.xJeff McCune
Without this patch the spec_helper sends a message named initialize_everything_for_tests to Puppet.settings. This is a problem because Puppet 2.6.x does not have this method, only Puppet 2.7.x and Puppet master have this method at this time and we're getting false positive test failures. This patch fixes the problem by looking before we leap. We test if the private method exists before calling it. This works with Ruby 1.8.5 and onwards and Puppet 2.6, 2.7 and master. This should fix all of the failures I've caused in Jenkins today.
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper' into 2.2.xJeff McCune
* ticket/2.2.x/13439_fix_spec_helper: (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
2012-03-29(#13439) refactor spec helper for compatibility with both puppet 2.7 andcprice
master
2012-03-29Merge pull request #53 from traylenator/fqdn_rotateJeff McCune
(#13205) Rotate array/string randomley based on fqdn, fqdn_rotate()
2012-03-29Merge branch '2.3.x'Jeff McCune
* 2.3.x: (#13494) Specify the behavior of zero padded strings Update CHANGELOG, Modulefile for 2.1.3
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (#13494) Specify the behavior of zero padded strings Update CHANGELOG, Modulefile for 2.1.3 Conflicts: CHANGELOG Modulefile
2012-03-29Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: Update CHANGELOG, Modulefile for 2.1.3 Conflicts: CHANGELOG Modulefile
2012-03-29Merge branch 'maint/2.2.x/range_spec_tests' into 2.2.xJeff McCune
* maint/2.2.x/range_spec_tests: (#13494) Specify the behavior of zero padded strings
2012-03-29(#13494) Specify the behavior of zero padded stringsJeff McCune
Without this patch the specified behavior of strings that are numeric only and zero padded is unclear and untested in the spec tests. This is a problem because it's not clear that range('00', '10') will actually return [ "0", "1", ..., "10" ] instead of [ "00", "01", ..., "10" ] This patch addresses the issue by providing explicit test coverage. If the string conversion behavior of puppet changes, this test will begin to fail.
2012-03-29Update CHANGELOG, Modulefile for 2.1.3Jeff McCune
2012-03-18(#13205) Rotate array/string randomley based on fqdn, fqdn_rotate()Steve Traylen
2012-03-13Merge branch '2.3.x'Jeff McCune
* 2.3.x: Update CHANGELOG and Modulefile for 2.3.1 (#13091) Fix LoadError exception with puppet apply
2012-03-13Update CHANGELOG and Modulefile for 2.3.1Jeff McCune
2012-03-13Merge pull request #50 from ↵Ken Barber
jeffmccune/ticket/2.3.x/13091_stdlib_throws_a_loaderror_when_running_with_puppet_apply (#13091) Fix LoadError exception with puppet apply
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 15:51:54 +0000