summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-18Merge branch '2.x' into 3.xAdrien Thebo
2013-03-18Merge branch 'pull-98' into 2.xAdrien Thebo
2013-03-18Fix number of arguments check in flatten()Uwe Stuehler
The function only uses the first argument, so raise an error with too few arguments *and* with too many arguments.
2013-03-11Add contributing documentJeff McCune
Copied from the same one included in Puppet and Facter. [ci skip]
2013-03-04Merge pull request #132 from raphink/dev/missing_docAdrien Thebo
Add missing documentation for validate_augeas and validate_cmd to README.markdown
2013-03-04Add missing documentation for validate_augeas and validate_cmd to ↵Raphaël Pinson
README.markdown
2013-02-25Merge branch '4.x'Jeff McCune
* 4.x: (maint) Add Ruby 2.0.0 to Travis build matrix Conflicts: .gitignore .travis.yml Gemfile
2013-02-25Merge branch '3.x' into 4.xJeff McCune
* 3.x: (maint) Add Ruby 2.0.0 to Travis build matrix
2013-02-25Merge branch 'maint/3.x/ruby_two_travis' into 3.xJeff McCune
* maint/3.x/ruby_two_travis: (maint) Add Ruby 2.0.0 to Travis build matrix
2013-02-25(maint) Add Ruby 2.0.0 to Travis build matrixJeff McCune
Without this patch we're not testing against Ruby 2.0.0 which has recently been released. This is a problem because we'd like a way to be notified if a change set breaks compatibility with future supported versions of Ruby. This patch should not be taken as an indication that we fully support Ruby 2.0, just as an indication that we plan to in the future. This patch also tightens up the specifications of the build matrix. In addition to testing against the specific Puppet dependency versions, we're also testing against the latest 2.7.x release and the latest release.
2013-02-18Merge branch '4.x'Jeff McCune
* 4.x: changed .count to .size to support legacy ruby closes #131
2013-02-18Merge branch '3.x' into 4.xJeff McCune
* 3.x: changed .count to .size to support legacy ruby
2013-02-18Merge branch '2.x' into 3.xJeff McCune
* 2.x: changed .count to .size to support legacy ruby
2013-02-18Merge branch 'mhellmic-2.x' into 2.xJeff McCune
* mhellmic-2.x: changed .count to .size to support legacy ruby
2013-02-18changed .count to .size to support legacy rubyMartin Hellmich
2013-02-18changed .count to .size to support legacy rubyMartin Hellmich
2013-02-15Revert "Merge pull request #130 from jhoblitt/has_element"Jeff McCune
This reverts commit f7a18189ec338b01b0fc89d75def832753af3868, reversing changes made to 36a7b29630a4d4de17af79b5dd4e9491ec20b123. I'm reverting this change because of concerns raised by Peter Meier that it duplicates the "in" operator in the DSL. The "in" operator is new information that I did not posses when I made the decision to merge. Because of this new information I'm un-merging and continuing the discussion in the comments of https://projects.puppetlabs.com/issues/19272 Reference: GH-130
2013-02-14Merge pull request #130 from jhoblitt/has_elementJeff McCune
(#19272) Add has_element() function
2013-02-14(#19272) Add has_element() functionJoshua Hoblitt
It is exceptionally difficult to determine if an array contains an element matching a specific value without an iteration or loop construct. This function is the Puppet equivalent of Array.includes?(foo) in Ruby. The implementation is a verbatim copy of has_key() with the minor modifications needed to support arrays instead of hashes.
2013-02-12Merge branch 'pull-126'Adrien Thebo
2013-02-12Merge branch 'fatmcgav-feature_19201'Jeff McCune
* fatmcgav-feature_19201: (#19201) Add concat function to join two arrays closes #129
2013-02-12(#19201) Add concat function to join two arraysfatmcgav
Without this patch applied there is no easy way to append one array to another. This is a problem because it is often desirable to join two arrays without flattening the contents into a single, one dimensional array. This patch addresses the problem by adding a `concat()` function which takes two arguments. The arguments will be concatenated together and a new array returned to the caller. Reviewed-by: Jeff McCune <jeff@puppetlabs.com>
2013-02-07validate_cmd(): Use Puppet::Util::Execution.execute when availableRaphaël Pinson
2013-02-06validate_cmd: Use Puppet::Util.executeRaphaël Pinson
2013-02-06Merge branch 'stephenrjohnson-bug/master/15572_rspec_tests'Jeff McCune
* stephenrjohnson-bug/master/15572_rspec_tests: ammend .should raise_error to .to raise_error closes #97
2013-02-06ammend .should raise_error to .to raise_errorstephen
2013-01-23Merge branch 'raphink-validate_augeas'Jeff McCune
* raphink-validate_augeas: Add an URL to a doc on how to activate augeas in puppet validate_augeas: requires augeas validate_augeas: Ensure tmpfile is closed and unlinked validate_augeas: Ensure augeas handler gets closed Add validate_augeas function closes 114
2013-01-20Add an URL to a doc on how to activate augeas in puppetRaphaël Pinson
2013-01-18validate_augeas: requires augeasRaphaël Pinson
2013-01-18validate_augeas: Ensure tmpfile is closed and unlinkedRaphaël Pinson
2013-01-18validate_augeas: Ensure augeas handler gets closedRaphaël Pinson
2013-01-18Add validate_augeas functionRaphaël Pinson
2013-01-18validate_cmd: Make sure tmpfile is always closed and unlinkedRaphaël Pinson
2013-01-18Merge branch 'raphink-validate_cmd'Jeff McCune
* raphink-validate_cmd: Add validate_cmd function This merge commit closes #113
2013-01-18Add validate_cmd functionRaphaël Pinson
2013-01-14Merge branch 'DavidS-master'Jeff McCune
Closes: GH-124 * DavidS-master: Add geppetto project definition
2013-01-14Add geppetto project definitionDavid Schmitt
2013-01-14Merge branch 'fix/master/getparam_failure'Jeff McCune
* fix/master/getparam_failure: (maint) Fix getparam() spec failure on MRI 1.8
2013-01-14(maint) Fix getparam() spec failure on MRI 1.8Jeff McCune
Without this patch applied we're getting the following spec failure, but only in the MRI 1.8 matrix cells. Failures: 1) getparam when compared against a resource with params Failure/Error: should run.with_params('User[dan]', '').and_return('') ArgumentError: interning empty string # ./vendor/ruby/1.8/gems/puppet-3.0.2/lib/puppet/parser/resource.rb:42:in `intern' # ./vendor/ruby/1.8/gems/puppet-3.0.2/lib/puppet/parser/resource.rb:42:in `[]' # ./lib/puppet/parser/functions/getparam.rb:29:in `real_function_getparam' # ./vendor/ruby/1.8/gems/puppet-3.0.2/lib/puppet/parser/functions.rb:63:in `send' # ./vendor/ruby/1.8/gems/puppet-3.0.2/lib/puppet/parser/functions.rb:63:in `function_getparam' # ./vendor/ruby/1.8/gems/rspec-puppet-0.1.5/lib/rspec-puppet/matchers/run.rb:8:in `call' # ./vendor/ruby/1.8/gems/rspec-puppet-0.1.5/lib/rspec-puppet/matchers/run.rb:8 # ./vendor/ruby/1.8/gems/rspec-puppet-0.1.5/lib/rspec-puppet/matchers/run.rb:24:in `call' # ./vendor/ruby/1.8/gems/rspec-puppet-0.1.5/lib/rspec-puppet/matchers/run.rb:24 # ./vendor/ruby/1.8/gems/rspec-expectations-2.11.3/lib/rspec/matchers/extensions/instance_eval_with_args.rb:11:in `instance_exec' # ./vendor/ruby/1.8/gems/rspec-expectations-2.11.3/lib/rspec/matchers/extensions/instance_eval_with_args.rb:11:in `instance_eval_with_args' # ./vendor/ruby/1.8/gems/rspec-expectations-2.11.3/lib/rspec/matchers/matcher.rb:60:in `matches?' # ./vendor/ruby/1.8/gems/rspec-expectations-2.11.3/lib/rspec/expectations/handler.rb:9:in `handle_matcher' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/subject.rb:64:in `should' # ./spec/functions/getparam_spec.rb:29 # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example.rb:113:in `instance_eval' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example.rb:113:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example.rb:253:in `with_around_each_hooks' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example.rb:110:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:378:in `run_examples' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:374:in `map' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:374:in `run_examples' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:360:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:361:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:361:in `map' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/example_group.rb:361:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/command_line.rb:28:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/command_line.rb:28:in `map' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/command_line.rb:28:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/reporter.rb:34:in `report' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/command_line.rb:25:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/runner.rb:69:in `run' # ./vendor/ruby/1.8/gems/rspec-core-2.11.1/lib/rspec/core/runner.rb:8:in `autorun' # ./vendor/ruby/1.8/bin/rspec:23 This patch addresses the problem by explicitly returning an empty string if the string itself is empty. This avoids trying to convert an empty string to a symbol which is the root cause of the problem.
2013-01-09Ignore bundler turdsJeff McCune
2013-01-09Merge branch 'offlinehacker-feature/master/getparam_function'Jeff McCune
* offlinehacker-feature/master/getparam_function: Add getparam function to get defined resource parameters
2013-01-09Add getparam function to get defined resource parametersJaka Hudoklin
As far as i know there's no other puppet-dsl-like way to get parameter of defined resource, so that's why i implemented getparam function, which takes resource reference and parameter name and returns parameter value. Here's another example why this function is really useful: define config($path, $config_param1, $config_param2) { } define example_resource($config) { $path = getparam($config, "path") notice("Path is $path") } define example_resource2($example_resource, $config = getparam($example_resource, "config")) { $config_param1 = getparam($config, "config_param1") notice("Config parameter is $config_param1") } define example_resource3($example_resource, $config = getparam($example_resource, "config")) { $config_param2 = getparam($config, "config_param2") notice("Config parameter is $config_param2") } class test_getparam { config { "config_instance": path => "/some/config/path", config_param1 => "someconfigtext1", config_param2 => "someconfigtext2", } example_resource { "example_resource_instance": config => Config["config_instance"] } example_resource2 { "example_resource_instance": example_resource => Example_resource["example_resource_instance"] } example_resource3 { "example_resource_instance": example_resource => Example_resource2["example_resource_instance"] } } class { "test_getparam": }
2013-01-09Merge pull request #123 from jeffmccune/feature/master/travis_webhookJeff McCune
Tell Travis CI to notify the PDC WebHook
2013-01-07(maint) Update puppet version in Travis configurationJeff McCune
Without this patch we'll test against all Puppet 3.0 versions, but not 4. This is a problem because the travis configuration should be relatively future proof to minimize surprises. This patch addresses the problem by using >= instead of ~> in the dependency specification. The patch also combines two different notification sections into a single entry.
2013-01-07Tell Travis CI to notify the PDC WebHookJeff McCune
Without this patch the so-called "puppet development community" hook service isn't being notified when Travis CI accepts jobs. This is a problem because we want the ability for Travis Bot to comment on pull requests as a result of CI build results. For example, if the build fails, then Gepetto Bot could make some helpful suggestions on how to re-run the build by amending a commit and force-pushing the branch. This patch uses the notifications section of the travis.yml configuration file, as documented at: http://about.travis-ci.org/docs/user/notifications/#Webhook-notification
2013-01-07Merge pull request #122 from jeffmccune/fix/master/travisJeff McCune
Fix typo in travis configuration
2013-01-05Fix typo in travis configurationJeff McCune
The exclude keyword was accidentally specified twice.
2013-01-05Merge pull request #121 from jeffmccune/fix/master/travisJeff McCune
Future proof travis build matrix
2013-01-05Future proof travis build matrixJeff McCune
Without this patch we're not building against ruby head. This is a problem because we need to know if standard lib works with the latest version of MRI. This patch builds against ruby head but also allows the build to pass if there are failures with ruby-head.
2013-01-05Merge branch 'feature/master/travis_ci'Jeff McCune
* feature/master/travis_ci: (maint) Add Travis CI Support