summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-25Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""Jeff McCune
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e. Why? Because this change set should actually be in master and our merge-up process reverted the change set in master when I reverted from 2.4.x. This patch reverts the revert, restoring the original change set.
2012-10-25Merge branch '2.4.x'Jeff McCune
* 2.4.x: Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
2012-10-25Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"Jeff McCune
This reverts commit 74e6411157b8df1af9a24c17971e3236f3096529, reversing changes made to 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd. Here's why: Actually... I just screwed this up. I merged this new fact into 2.4.x but it's not fixing any bug. It's adding a new fact, so this should go into master and we should release 2.5 since this is new, backwards-compatible functionality.
2012-10-25Merge branch '2.4.x'Jeff McCune
* 2.4.x: Prevent undefined method `split' for nil:NilClass with pe_foo_version facts (maint) Clear all facts before each example Add spec tests for pe_version facts Add PE facts to stdlib Conflicts: spec/spec_helper.rb
2012-10-25Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.xJeff McCune
* haus-add_pe_facts_to_stdlib: Prevent undefined method `split' for nil:NilClass with pe_foo_version facts (maint) Clear all facts before each example Add spec tests for pe_version facts Add PE facts to stdlib
2012-10-25Prevent undefined method `split' for nil:NilClass with pe_foo_version factsJeff McCune
Without this patch the pe_major_version, pe_minor_version, and pe_patch_version facts directly depend on the pe_version fact in a manner that calls split directly on the return value. This is a problem because Fact values are not always guaranteed to return strings, or objects that respond to split. This patch is a defensive measure to ensure we're always calling the split method on a string object. If the Fact returns nil, this will be converted to an empty string responding to split.
2012-10-24(maint) Clear all facts before each exampleJeff McCune
Without this patch example groups must explicitly call `Facter.clear` to clear any cached values between examples. This is a problem because this behavior is not the concern of the example groups, the behavior is the concern of the spec_helper or whatever facility we have in place to initialize the system for testing. This patch fixes the problem by duplicating the logic in the Facter spec_helper to ensure facts are cleared out before each example. This patch requires the example groups to explicitly load the facts they require if the fact name does not match the filename.
2012-10-24Add spec tests for pe_version factsMatthaus Owens
This commit adds some basic spec tests for the pe_version facts. There are basic postitive and negative cases.
2012-10-24Add PE facts to stdlibMatthaus Owens
As many PE modules have PE specific functionality, but are deployed to all nodes, including FOSS nodes, it is valuable to be able to selectively enable those PE specific functions. These facts allow modules to use the is_pe fact to determine whether the module should be used or not. The facts include is_pe, pe_version, pe_major_version, pe_minor_version, and pe_patch_version. For PE 2.6.0 those facts would have values true, 2.6.0, 2, 6, and 0, respectively.
2012-08-30Merge branch '3.x'Jeff McCune
* 3.x: (Maint) Remove core function documentation from README Conflicts: README.markdown
2012-08-30Merge branch '3.0.x' into 3.xJeff McCune
* 3.0.x: (Maint) Remove core function documentation from README
2012-08-30Merge branch 'bug/3.0.x/remove_core_function_docs' into 3.0.xJeff McCune
* bug/3.0.x/remove_core_function_docs: (Maint) Remove core function documentation from README
2012-08-30(Maint) Remove core function documentation from READMEJeff McCune
Without this patch the README contains the documentation for core functions shipped in Puppet in addition to the functions shipped in stdlib. This is a problem because it's confusing for end users trying to get started with puppet. This patch makes it so only the stdlib functions are included.
2012-08-30Merge pull request #93 from ptman/patch-1Jeff McCune
Fix some logical inconsistencies in README
2012-08-30Fix some logical inconsistencies in READMEPaul Tötterman
2012-08-20Merge branch '3.x'Jeff McCune
* 3.x: Disable tests that fail on 2.6.x due to #15912
2012-08-20Merge branch '3.0.x' into 3.xJeff McCune
* 3.0.x: Disable tests that fail on 2.6.x due to #15912
2012-08-20Merge branch '2.4.x' into 3.0.xJeff McCune
* 2.4.x: Disable tests that fail on 2.6.x due to #15912
2012-08-20Merge branch '2.3.x' into 2.4.xJeff McCune
* 2.3.x: Disable tests that fail on 2.6.x due to #15912
2012-08-20Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: Disable tests that fail on 2.6.x due to #15912
2012-08-20Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: Disable tests that fail on 2.6.x due to #15912 Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb
2012-08-20Merge branch 'fix/2.1.x/disable_puppet26_failing_tests' into 2.1.xJeff McCune
* fix/2.1.x/disable_puppet26_failing_tests: Disable tests that fail on 2.6.x due to #15912
2012-08-20Disable tests that fail on 2.6.x due to #15912Jeff McCune
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. Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb This patch was constructed by cherry-picking e27eccb and resolving the merge conflicts to only include the `pending` statements. This resolves the problem by disabling these tests in Puppet 2.6.
2012-08-20Merge branch '3.x'Jeff McCune
* 3.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
2012-08-20Merge branch '3.0.x' into 3.xJeff McCune
* 3.0.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
2012-08-20Merge branch '2.4.x' into 3.0.xJeff McCune
* 2.4.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
2012-08-20Merge branch '2.3.x' into 2.4.xJeff McCune
* 2.3.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
2012-08-20Merge branch '2.2.x' into 2.3.xJeff McCune
* 2.2.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
2012-08-20Merge branch '2.1.x' into 2.2.xJeff McCune
* 2.1.x: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb
2012-08-20Merge branch 'fix/2.1.x/spec_failures' into 2.1.xJeff McCune
* fix/2.1.x/spec_failures: (Maint) Fix mis-use of rvalue functions as statements Add .rspec file to repo root
2012-08-20(Maint) Fix mis-use of rvalue functions as statementsJeff McCune
Without this patch applied the spec tests are invalid because they call rvalue functions as if they were statements. This is a problem because Puppet 2.7.x currently throws an exception if a rvalue function is invoked as if it were a statement function. This exception from Puppet is causing tests to fail. This patch fixes the problem by changing the tests to assign the return value of the functions to a variable. This fixes the problem by invoking the functions properly. Paired-with: Andrew Parker <andy@puppetlabs.com>
2012-08-20Add .rspec file to repo rootJeff McCune
Without this patch we don't get an opinionated rspec behavior. This patch makes the behavior of `rake test` and `rspec spec/` opinionated by including some default options.
2012-08-19Merge branch '3.x'Jeff McCune
* 3.x: (#14422) Update README to include the bug tracker URL.
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-19Merge pull request #90 from ahpook/14422_update_readmeJeff McCune
(#14422) Update README to include the bug tracker URL.
2012-08-17(#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-16Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'""Jeff McCune
This reverts commit d3e30bcdc64964bba82e05e5409c38faa7f2b700.
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 19:37:01 +0000