Commit graph

616 commits

Author SHA1 Message Date
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
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
Jeff McCune
3118e642dc Merge branch 'offlinehacker-feature/master/getparam_function'
* offlinehacker-feature/master/getparam_function:
  Add getparam function to get defined resource parameters
2013-01-09 17:52:41 -08:00
Jaka Hudoklin
20e0e07090 Add getparam function to get defined resource parameters
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-09 17:51:12 -08:00
Jeff McCune
d674190d8e Merge pull request #123 from jeffmccune/feature/master/travis_webhook
Tell Travis CI to notify the PDC WebHook
2013-01-09 16:12:47 -08:00
Jeff McCune
dc04917a8e (maint) Update puppet version in Travis configuration
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-07 15:16:20 -08:00
Jeff McCune
43a8cf5f90 Tell Travis CI to notify the PDC WebHook
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-07 15:16:15 -08:00
Jeff McCune
2da85fa3a5 Merge pull request #122 from jeffmccune/fix/master/travis
Fix typo in travis configuration
2013-01-07 10:19:21 -08:00
Jeff McCune
6d4ff999c0 Fix typo in travis configuration
The exclude keyword was accidentally specified twice.
2013-01-05 22:05:05 -08:00
Jeff McCune
84f9ca22dc Merge pull request #121 from jeffmccune/fix/master/travis
Future proof travis build matrix
2013-01-05 21:31:53 -08:00
Jeff McCune
cf261e26d5 Future proof travis build matrix
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-05 21:25:04 -08:00
Jeff McCune
9c97ab896e Merge branch 'feature/master/travis_ci'
* feature/master/travis_ci:
  (maint) Add Travis CI Support
2013-01-05 15:37:15 -08:00
Jeff McCune
d0820469b4 (maint) Add Travis CI Support
Without this patch stdlib has Travis CI configuration files, but they
don't seem to completely specify the dependency versions and the build
matrix.  This patch addresses the problem by putting the dependency
information in the conventional Gemfile location.

This patch should coincide with enabling Travis CI support for pull
requests.  A build status image is also included in the project README.
2013-01-05 15:32:43 -08:00
Jeff McCune
388cfa547d Merge branch '4.x'
* 4.x:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation
2013-01-03 13:39:42 -08:00
Jeff McCune
fb7ae21743 Merge branch '3.x' into 4.x
* 3.x:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation
2013-01-03 13:39:05 -08:00
Jeff McCune
d7aea0f0be Merge branch '3.2.x' into 3.x
* 3.2.x:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation
2013-01-03 13:38:36 -08:00
Jeff McCune
bc4abce86b Merge branch 'stephenrjohnson-bug/3.x/18157_arithmetical_operations' into 3.2.x
* stephenrjohnson-bug/3.x/18157_arithmetical_operations:
  Add test/validation for is_float if created from an arithmetical operation
  Add test/validation for is_integer if created from an arithmetical operation
  Add test/validation for is_numeric if created from an arithmetical operation
2013-01-03 13:38:16 -08:00
stephen
a773281760 Add test/validation for is_float if created from an arithmetical operation 2013-01-03 13:37:55 -08:00