Commit graph

733 commits

Author SHA1 Message Date
Kristof Willaert
05273419e1 Add floor function implementation and unit tests 2013-03-19 10:00:57 +01:00
Adrien Thebo
fc2352f346 Merge branch 'pull-59'
This closes GH-59
2013-03-18 15:46:41 -07:00
Eric Shamow
961dcab15d (#13610) Add is_function_available to stdlib
This function provides a simple wrapper around
Puppet::Parser::Functions.function for access within Puppet manifests.
This will allow users to check whether or not a plugin or functionality
such as hiera is installed on the server.
2013-03-18 15:44:50 -07:00
Adrien Thebo
6dfd7f6b73 Merge branch '4.x' 2013-03-18 15:38:14 -07:00
Adrien Thebo
2c1b2c07c2 Merge branch '3.x' into 4.x 2013-03-18 15:38:07 -07:00
Adrien Thebo
c0a0682706 Merge branch '2.x' into 3.x 2013-03-18 15:37:56 -07:00
Adrien Thebo
4c695ede38 Merge branch 'pull-115' into 2.x 2013-03-18 15:37:46 -07:00
Justin Lambert
5d5a4d466e str2bool should return a boolean if called with a boolean 2013-03-18 15:37:36 -07:00
Uwe Stuehler
5a11279cc5 Fix number of arguments check in flatten()
The function only uses the first argument, so raise an error with
too few arguments *and* with too many arguments.
2013-03-18 15:07:13 -07:00
Adrien Thebo
292490b0ad Merge branch '3.x' into 4.x 2013-03-18 15:06:33 -07:00
Adrien Thebo
c12d3d7d51 Merge branch '2.x' into 3.x 2013-03-18 15:06:07 -07:00
Adrien Thebo
967f9916d1 Merge branch 'pull-98' into 2.x 2013-03-18 15:05:23 -07:00
Uwe Stuehler
e80207bede Fix number of arguments check in flatten()
The function only uses the first argument, so raise an error with
too few arguments *and* with too many arguments.
2013-03-18 15:04:50 -07:00
Jeff McCune
96e19d05f3 Add contributing document
Copied from the same one included in Puppet and Facter.

[ci skip]
2013-03-11 11:06:36 -07:00
Adrien Thebo
d479df612b Merge pull request #132 from raphink/dev/missing_doc
Add missing documentation for validate_augeas and validate_cmd to README.markdown
2013-03-04 15:25:53 -08:00
Raphaël Pinson
a1510a1e71 Add missing documentation for validate_augeas and validate_cmd to README.markdown 2013-03-04 23:37:57 +01:00
Jeff McCune
9a06f11b11 Merge branch '4.x'
* 4.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix

Conflicts:
	.gitignore
	.travis.yml
	Gemfile
2013-02-25 14:19:13 -08:00
Jeff McCune
e0a2dc5b91 Merge branch '3.x' into 4.x
* 3.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix
2013-02-25 14:11:18 -08:00
Jeff McCune
4fdefd0761 Merge branch 'maint/3.x/ruby_two_travis' into 3.x
* maint/3.x/ruby_two_travis:
  (maint) Add Ruby 2.0.0 to Travis build matrix
2013-02-25 14:11:07 -08:00
Jeff McCune
03c5c4a434 (maint) Add Ruby 2.0.0 to Travis build matrix
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-25 14:11:03 -08:00
Jeff McCune
5b81c26d94 Merge branch '4.x'
* 4.x:
  changed .count to .size to support legacy ruby

closes #131
2013-02-18 12:22:33 -08:00
Jeff McCune
1c33e9cd71 Merge branch '3.x' into 4.x
* 3.x:
  changed .count to .size to support legacy ruby
2013-02-18 12:22:18 -08:00
Jeff McCune
d2e0c53243 Merge branch '2.x' into 3.x
* 2.x:
  changed .count to .size to support legacy ruby
2013-02-18 12:22:04 -08:00
Jeff McCune
1e2ee5bd01 Merge branch 'mhellmic-2.x' into 2.x
* mhellmic-2.x:
  changed .count to .size to support legacy ruby
2013-02-18 12:21:49 -08:00
Martin Hellmich
9fa70ae43f changed .count to .size to support legacy ruby 2013-02-18 12:21:34 -08:00
Martin Hellmich
0c622b2e30 changed .count to .size to support legacy ruby 2013-02-18 16:02:15 +01:00
Jeff McCune
a45d4f1307 Revert "Merge pull request #130 from jhoblitt/has_element"
This reverts commit f7a18189ec, reversing
changes made to 36a7b29630.

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-15 11:57:42 -08:00
Jeff McCune
f7a18189ec Merge pull request #130 from jhoblitt/has_element
(#19272) Add has_element() function
2013-02-14 22:16:11 -08:00
Joshua Hoblitt
95cf3fed68 (#19272) Add has_element() function
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-14 12:06:21 -07:00
Adrien Thebo
36a7b29630 Merge branch 'pull-126' 2013-02-12 10:20:22 -08:00
Jeff McCune
15266d9b44 Merge branch 'fatmcgav-feature_19201'
* fatmcgav-feature_19201:
  (#19201) Add concat function to join two arrays

closes #129
2013-02-12 10:01:04 -08:00
fatmcgav
3cef5d9e33 (#19201) Add concat function to join two arrays
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-12 10:00:09 -08:00
Raphaël Pinson
69248dfd8a validate_cmd(): Use Puppet::Util::Execution.execute when available 2013-02-07 08:56:52 +01:00
Raphaël Pinson
683ac8f8aa validate_cmd: Use Puppet::Util.execute 2013-02-06 18:03:11 +01:00
Jeff McCune
8dd82d318a Merge branch 'stephenrjohnson-bug/master/15572_rspec_tests'
* stephenrjohnson-bug/master/15572_rspec_tests:
  ammend .should raise_error to .to raise_error

closes #97
2013-02-06 08:14:08 -08:00
stephen
5f22933e75 ammend .should raise_error to .to raise_error 2013-02-06 08:12:42 -08:00
Jeff McCune
4d24bd33b0 Merge branch 'raphink-validate_augeas'
* 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-23 13:30:56 -08:00
Raphaël Pinson
c5f0309b1d Add an URL to a doc on how to activate augeas in puppet 2013-01-20 13:15:22 +01:00
Raphaël Pinson
35f9a01879 validate_augeas: requires augeas 2013-01-18 22:02:13 +01:00
Raphaël Pinson
d568c4e0f7 validate_augeas: Ensure tmpfile is closed and unlinked 2013-01-18 22:02:13 +01:00
Raphaël Pinson
41bc722139 validate_augeas: Ensure augeas handler gets closed 2013-01-18 22:02:13 +01:00
Raphaël Pinson
3a97c2314c Add validate_augeas function 2013-01-18 22:02:13 +01:00
Raphaël Pinson
bda25ac087 validate_cmd: Make sure tmpfile is always closed and unlinked 2013-01-18 22:01:03 +01:00
Jeff McCune
f6a63eeafa Merge branch 'raphink-validate_cmd'
* raphink-validate_cmd:
  Add validate_cmd function

This merge commit closes #113
2013-01-18 09:06:23 -08:00
Raphaël Pinson
6902cc582e Add validate_cmd function 2013-01-18 09:06:02 -08:00
Jeff McCune
562d325431 Merge branch 'DavidS-master'
Closes: GH-124

* DavidS-master:
  Add geppetto project definition
2013-01-14 21:50:28 -08:00
David Schmitt
b3fc0a350e Add geppetto project definition 2013-01-14 21:48:48 -08:00
Jeff McCune
2559be9258 Merge branch 'fix/master/getparam_failure'
* fix/master/getparam_failure:
  (maint) Fix getparam() spec failure on MRI 1.8
2013-01-14 18:41:55 -08:00
Jeff McCune
2a28ece233 (maint) Fix getparam() spec failure on MRI 1.8
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-14 18:38:27 -08:00
Jeff McCune
9dfc58327b Ignore bundler turds 2013-01-09 18:02:34 -08:00