summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-19Merge branch '3.0.x' into 3.xJeff McCune
* 3.0.x: (#14422) Update README to include the bug tracker URL.
2012-08-19Merge branch 'fix/3.0.x/14422_readme' into 3.0.xJeff McCune
* fix/3.0.x/14422_readme: (#14422) Update README to include the bug tracker URL.
2012-08-19(#14422) Update README to include the bug tracker URL.Eric Sorenson
As reported, it is indeed difficult to navigate directly to the correct part of Redmine for a particular sub-project. This commit puts the issue tracker URL front and center.
2012-08-16Update CHANGELOG, Modulefile for 3.0.1Jeff McCune
2012-08-16Merge branch 'fix/master/where_did_facts_dot_d_go'Jeff McCune
* fix/master/where_did_facts_dot_d_go: Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"
2012-08-16Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"Jeff McCune
This reverts commit cc414a422de0d773a1012ca57f41f15b4d6caf06, reversing changes made to 29f8f89c19b2189aa78ab430e94671669cb4716c. Conflicts: README.markdown Without this patch, there is no facts_dot_d functionality and we don't have it implemented in Facter 2.0. This is a problem because Puppet Enterprise and many users rely on facts.d support. We're also backwards compatible with Facter 1.6 in stdlib 3.0 so this is a bug fix.
2012-08-16Merge branch 'release/master/three_dot_oh_dot_oh'Jeff McCune
* release/master/three_dot_oh_dot_oh: Update CHANGELOG, Modulefile for 3.0.0 (Maint) Update README for 3.0.0
2012-08-16Update CHANGELOG, Modulefile for 3.0.0Jeff McCune
2012-08-16(Maint) Update README for 3.0.0Jeff McCune
This commit updates the README for 3.0.0 by taking a function list produced with `puppet doc -r function` _without_ stdlib in the `$LOAD_PATH` and then filtering out the native functions by executing `puppet doc -r function` _with_ stdlib/lib in the `$LOAD_PATH` and then running `comm -13 core_functions.txt all_functions.txt`
2012-08-16Merge branch 'bodepd-ensure_resource_attempt_2'Jeff McCune
* bodepd-ensure_resource_attempt_2: Explicitly load functions used by ensure_resource Revert "Revert "Merge pull request #86 from bodepd/ensure_resource""
2012-08-15Explicitly load functions used by ensure_resourceDan Bode
The ensure_resource function actually calls two other functions, create_resources and defined_with_param. When calling Puppet functions from Ruby, you sometimes have to load the functions manually if they have not been called before. This commit explicitly loads the functions that ensure_resource depends on from within the function.
2012-08-15Revert "Revert "Merge pull request #86 from bodepd/ensure_resource""Dan Bode
This reverts commit 1e0983362464e8f2832239b09cdbc9175a51e6ec.
2012-08-14Revert "Merge pull request #86 from bodepd/ensure_resource"Jeff McCune
This reverts commit 42ddd7fe54f37b84e34b4a005de2249e53f07469, reversing changes made to 53243605b28fc31618d079155c86b37b4e88a6ca.
2012-08-14Merge pull request #86 from bodepd/ensure_resourceJeff McCune
Add function ensure_resource and defined_with_params
2012-08-14Merge branch '2.4.x'Jeff McCune
* 2.4.x: Update Modulefile, CHANGELOG for 2.4.0
2012-08-14Update Modulefile, CHANGELOG for 2.4.0Jeff McCune
2012-08-14Merge branch '2.4.x'Jeff McCune
* 2.4.x: Add support for a 'match' parameter to file_line
2012-08-14Merge branch 'feature/2.4.x/backport_file_line_match_pr75' into 2.4.xJeff McCune
* feature/2.4.x/backport_file_line_match_pr75: Add support for a 'match' parameter to file_line
2012-08-14Add 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-08-14Merge branch '2.4.x'Jeff McCune
* 2.4.x: (#15872) Add to_bytes function
2012-08-14Merge branch 'feature/2.4.x/to_bytes_function' into 2.4.xJeff McCune
* feature/2.4.x/to_bytes_function: (#15872) Add to_bytes function
2012-08-14(#15872) Add to_bytes functionErik Dalén
Converts a string like "2 MB" to the value in bytes. Useful for comparisons on facts that return a human readable number instead of machine readable.
2012-08-13re-formattingDan Bode
This commit refactors to ensure 80 character lines.
2012-08-13Add better docs about duplicate resource failuresDan Bode
This commit adds better inline documentation explaining how replicate resource definitions can occur if the resource exists and does not have matching parameters.
2012-08-13Handle undef for parameter argumentDan Bode
This commit adds better handling of the case where undef is passed as the parameter value. This works by converting '' into []
2012-08-13Add function ensure_resource and defined_with_paramsDan Bode
This commit adds 2 new functions with unit tests. defined_with_params works similarily to puppet's defined function, except it allows you to also specify a hash of params. defined_with_params will return true if a resource also exists that matches the specified type/title (just like with defined) as well as all of the specified params. ensure_resource is a function that basically combines defined_with_params with create_resources to conditionally create resources only if the specified resource (title, type, params) does not already exist. These functions are created to serve as an alternative to using defined as follows: if ! defined(Package['some_package']) { package { 'some_package': ensure => present, } The issue with this usage is that there is no guarentee about what parameters were set in the previous definition of the package that made its way into the catalog. ensure_resource could be used instead, as: ensure_resource('package', 'some_package', { 'ensure' => 'present' }) This will creat the package resources only if another resource does not exist with the specified parameters.
2012-08-10Merge branch '2.4.x'Patrick Carlisle
* 2.4.x: (Maint) use PuppetlabsSpec::PuppetInternals.scope (master) Disable tests that fail on 2.6.x due to #15912
2012-08-10(Maint) use PuppetlabsSpec::PuppetInternals.scope (master)Jeff McCune
This patch is the same approach as the one that want into 2.3.x. It covers the functions in master that do not exist in 2.3.x. Without this patch all of the spec tests for parser functions in stdlib would instantiate their own scope instances. This is a problem because the standard library is tightly coupled with the internal behavior of Puppet. Tight coupling like this creates failures when we change the internal behavior of Puppet. This is exactly what happened recently when we changed the method signature for the initializer of Puppet::Parser::Scope instances. This patch fixes the problem by creating scope instances using the puppet labs spec helper. The specific method that provides scope instances in Puppet-version-independent way is something like this: let(:scope) { PuppetlabsSpec::PuppetInternals.scope } This patch simply implements this across the board. Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-08-10Merge branch '2.3.x' into 2.4.xPatrick Carlisle
* 2.3.x: Disable tests that fail on 2.6.x due to #15912
2012-08-10Merge branch '2.2.x' into 2.3.xPatrick Carlisle
* 2.2.x: Disable tests that fail on 2.6.x due to #15912
2012-08-10Disable tests that fail on 2.6.x due to #15912Patrick Carlisle
In Puppet 2.6.x there is a bug where a function may be incorrectly detected as an rvalue when it is not, or not detected when it is. This means that in tests the correct syntax for calling a function will be rejected. This disables those tests on 2.6.x, as there is no straightforward way to write them to be compatible with both 2.6.x and newer versions of Puppet.
2012-08-09Merge branch '2.4.x'Patrick Carlisle
* 2.4.x: Make sure functions are loaded for each test Use rvalue functions correctly (#2157) Make facts_dot_d compatible with external facts Conflicts: lib/facter/facter_dot_d.rb
2012-08-09Merge branch '2.3.x' into 2.4.xPatrick Carlisle
* 2.3.x: Make sure functions are loaded for each test Use rvalue functions correctly (Maint) Don't mock with mocha (Maint) Fix up the get_module_path parser function (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x) (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals} (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines Update CHANGELOG, Modulefile for 2.3.3 fix regression in #11017 properly Fix spec tests using the new spec_helper 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 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-08-09Make sure functions are loaded for each testPatrick Carlisle
The test_helper code in Puppet now resets function state between each test. This patch fixes two spec files where the function was not actually loaded in the tests, causing them to fail.
2012-08-09Merge branch '2.2.x' into 2.3.xPatrick Carlisle
* 2.2.x: Use rvalue functions correctly
2012-08-09Use rvalue functions correctlyPatrick Carlisle
A bug fix in Puppet exposed that several tests were using rvalue functions incorrectly (this was not properly checked by puppet before). This fixes those tests.
2012-07-23Merge branch 'fix/master/fix_scope_dependency'Jeff McCune
* fix/master/fix_scope_dependency: (Maint) use PuppetlabsSpec::PuppetInternals.scope (master)
2012-07-23(Maint) use PuppetlabsSpec::PuppetInternals.scope (master)Jeff McCune
This patch is the same approach as the one that want into 2.3.x. It covers the functions in master that do not exist in 2.3.x. Without this patch all of the spec tests for parser functions in stdlib would instantiate their own scope instances. This is a problem because the standard library is tightly coupled with the internal behavior of Puppet. Tight coupling like this creates failures when we change the internal behavior of Puppet. This is exactly what happened recently when we changed the method signature for the initializer of Puppet::Parser::Scope instances. This patch fixes the problem by creating scope instances using the puppet labs spec helper. The specific method that provides scope instances in Puppet-version-independent way is something like this: let(:scope) { PuppetlabsSpec::PuppetInternals.scope } This patch simply implements this across the board. Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-07-23Merge branch '2.3.x'Jeff McCune
* 2.3.x: (Maint) Don't mock with mocha (Maint) Fix up the get_module_path parser function (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x) (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals} (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines Conflicts: spec/spec_helper.rb spec/unit/puppet/parser/functions/get_module_path_spec.rb
2012-07-23Merge branch 'maint/2.3.x/fix_rspec_puppet_load_order_issue' into 2.3.xJeff McCune
* maint/2.3.x/fix_rspec_puppet_load_order_issue: (Maint) Don't mock with mocha
2012-07-23(Maint) Don't mock with mochaJeff McCune
Without this patch applied the stdlib module has load-order issues with mocha and rspec-puppet. The root cause has yet to be determined, but we've narrowed it down to this description: "If any rspec-puppet example groups run before parser function example groups and the parser function example groups use mock() then you'll get this error:" You can exercise this explicitly with: rspec -fd spec/unit/puppet/{provider,type,parser} This will ensure rspec runs all of the provider and type spec tests, which are rspec-puppet ones, before the parser function specs are run. I should also note we empted out the test in the file_line provider to be nothing except an empty describe block and this was still sufficient to trigger the load order error described here. Failures: 1) function_get_module_path when locating a module should be able to find module paths from the modulepath setting Failure/Error: mod = mock("Puppet::Module") NoMethodError: undefined method `mock' for #<RSpec::Core::ExampleGroup::Nested_14::Nested_1:0x107b946c0> # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:21 # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:29 2) function_get_module_path when locating a module should be able to find module paths when the modulepath is a list Failure/Error: mod = mock("Puppet::Module") NoMethodError: undefined method `mock' for #<RSpec::Core::ExampleGroup::Nested_14::Nested_1:0x107b81ea8> # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:21 # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:34 3) function_get_module_path when locating a module should respect the environment Failure/Error: mod = mock("Puppet::Module") NoMethodError: undefined method `mock' for #<RSpec::Core::ExampleGroup::Nested_14::Nested_1:0x107b6e808> # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:21 # ./spec/unit/puppet/parser/functions/get_module_path_spec.rb:40 Finished in 1.53 seconds 326 examples, 3 failures, 1 pending Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-07-23Merge pull request #80 from jeffmccune/fix/2.3.x/go_greenJeff McCune
Fix up 2.3.x for new scope
2012-07-23(Maint) Fix up the get_module_path parser functionJeff McCune
This patch switches the spec tests for the get_module_path function to use mock objects. The underlying Puppet::Module.find method has reasonable test coverage inside of Puppet core so we might as well break the tight dependency while we're fixing up the specs to use the new parser scope. The behavior of the parser function itself should still have complete coverage even though the tests have switched to mock the implementation inside of Puppet.
2012-07-23(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)Jeff McCune
This patch is the same approach as the one that want into 2.2.x. It covers the functions in 2.3.x that do not exist in 2.2.x. Without this patch all of the spec tests for parser functions in stdlib would instantiate their own scope instances. This is a problem because the standard library is tightly coupled with the internal behavior of Puppet. Tight coupling like this creates failures when we change the internal behavior of Puppet. This is exactly what happened recently when we changed the method signature for the initializer of Puppet::Parser::Scope instances. This patch fixes the problem by creating scope instances using the puppet labs spec helper. The specific method that provides scope instances in Puppet-version-independent way is something like this: let(:scope) { PuppetlabsSpec::PuppetInternals.scope } This patch simply implements this across the board.
2012-07-23Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.xJeff McCune
* 2.2.x: (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals} (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines
2012-07-23Merge pull request #81 from jeffmccune/maint/2.2.x/rename_seams_to_internalsJeff McCune
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
2012-07-23(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}Jeff McCune
The module PuppetlabsSpec::PuppetSeams has been renamed in the puppetlabs_spec_helper gem to PuppetlabsSpec::PuppetInternals. The method to obtain a scope object has also changed slightly. Without this patch the spec tests will fail because the stdlib module is not aligned with the spec helper gem. This patch fixes the problem by matching up messages with their receivers in the spec helper library. Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-07-19Merge branch 'fix/2.2.x/make_it_green' into 2.2.xJeff McCune
* fix/2.2.x/make_it_green: (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines
2012-07-19(Maint) use PuppetlabsSpec::PuppetSeams.parser_scopeJeff McCune
Without this patch all of the spec tests for parser functions in stdlib would instantiate their own scope instances. This is a problem because the standard library is tightly coupled with the internal behavior of Puppet. Tight coupling like this creates failures when we change the internal behavior of Puppet. This is exactly what happened recently when we changed the method signature for the initializer of Puppet::Parser::Scope instances. This patch fixes the problem by creating scope instances using the puppet labs spec helper. The specific method that provides scope instances in Puppet-version-independent way is something like this: let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope } This patch simply implements this across the board.
2012-07-19(Maint) Fix interpreter linesJeff McCune
This time around I actually know why I'm doing this thanks to the reminder from Nick Lewis. Ruby will replace itself in memory with the executable listed in the interpreter line if the string "ruby" is not in there. Since /usr/bin/env rspec doesn't contain the substring "ruby", you can't actually run ruby -W1 or whatever on the file. This patch fixes the problem by making sure "ruby" is present, preventing ruby from replacing itself in memory.