Commit graph

589 commits

Author SHA1 Message Date
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
stephen
b86f5dc129 Add test/validation for is_integer if created from an arithmetical operation 2013-01-03 13:37:55 -08:00
stephen
190b9438c5 Add test/validation for is_numeric if created from an arithmetical operation 2013-01-03 13:37:55 -08:00
Jeff McCune
2df66c0411 Merge branch 'maint/master/update_readme'
* maint/master/update_readme:
  Clarify that stdlib 3 supports Puppet 3
2012-12-04 15:09:35 -08:00
Jeff McCune
3a6085fa80 Clarify that stdlib 3 supports Puppet 3
Minor clarification to the compatibility section of the README.
2012-12-04 15:07:53 -08:00
Jeff McCune
5e3606fcfa Merge branch 'dalen-style_fixes'
* dalen-style_fixes:
  maint: style guideline fixes
2012-11-30 08:19:34 -08:00
Erik Dalén
7742e5f447 maint: style guideline fixes 2012-11-30 11:02:02 +01:00
Jeff McCune
2dac135608 Merge branch '4.x'
* 4.x:
  Update Modulefile, CHANGELOG for 3.2.0
2012-11-28 14:45:26 -08:00
Jeff McCune
97cb759533 Merge branch '3.x' into 4.x
* 3.x:
  Update Modulefile, CHANGELOG for 3.2.0
2012-11-28 14:45:03 -08:00
Jeff McCune
e1f2a93288 Update Modulefile, CHANGELOG for 3.2.0 2012-11-28 14:44:27 -08:00
Jeff McCune
f960a0891e Merge branch '4.x'
* 4.x:
  Update Modulefile, CHANGELOG for 2.6.0
2012-11-28 14:39:39 -08:00
Jeff McCune
2abf64a306 Merge branch '3.x' into 4.x
* 3.x:
  Update Modulefile, CHANGELOG for 2.6.0
2012-11-28 14:39:34 -08:00
Jeff McCune
1e5618c44f Merge branch '2.x' into 3.x
* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
	CHANGELOG
	Modulefile
2012-11-28 14:39:29 -08:00
Jeff McCune
2b7591896d Update Modulefile, CHANGELOG for 2.6.0 2012-11-28 14:38:27 -08:00
Jeff McCune
bdef98d632 Merge branch '4.x'
* 4.x:
  Add reject() function
2012-11-28 14:29:39 -08:00
Jeff McCune
89fa98579c Merge branch '3.x' into 4.x
* 3.x:
  Add reject() function
2012-11-28 14:29:32 -08:00
Jeff McCune
16fe71867c Merge branch '2.x' into 3.x
* 2.x:
  Add reject() function
2012-11-28 14:29:14 -08:00
Jeff McCune
26819f9688 Merge branch 'duritong-fun/2.x/reject' into 2.x
* duritong-fun/2.x/reject:
  Add reject() function
2012-11-28 14:29:01 -08:00
Peter Meier
a79b2cdf43 Add reject() function
Like the grep function, but we can now reject members of an array
based on a pattern.
2012-11-28 14:28:31 -08:00
Jeff McCune
06bc5da3d6 Merge branch '4.x'
* 4.x:
  Revert "(Maint) Add spec/functions to rake test task"
2012-11-27 17:09:25 -08:00
Jeff McCune
e4aa347324 Merge branch '3.x' into 4.x
* 3.x:
  Revert "(Maint) Add spec/functions to rake test task"
2012-11-27 17:08:20 -08:00
Jeff McCune
be6d456325 Merge branch '2.x' into 3.x
* 2.x:
  Revert "(Maint) Add spec/functions to rake test task"

Conflicts:
	Rakefile
2012-11-27 17:08:12 -08:00
Jeff McCune
59cc85deb5 Revert "(Maint) Add spec/functions to rake test task"
This reverts commit dbe3c8ecf6.

Because testing these against Puppet 2.6.x is causing failures.  These
need to be cleaned up, but I want to leave and this was the behavior
before I tried to "fix" it.
2012-11-27 17:06:29 -08:00
Jeff McCune
4f91efa56e Merge branch '4.x'
* 4.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.
2012-11-27 16:22:26 -08:00
Jeff McCune
2b593625b6 Merge branch '3.x' into 4.x
* 3.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.
2012-11-27 16:22:18 -08:00
Jeff McCune
aa1e743e38 Merge branch '2.x' into 3.x
* 2.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.

Conflicts:
	Rakefile
2012-11-27 16:22:11 -08:00
Jeff McCune
965245eb97 Merge branch 'metcalfc/2.x/ensure_packages' into 2.x
* metcalfc/2.x/ensure_packages:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.
2012-11-27 16:19:52 -08:00
Jeff McCune
dbe3c8ecf6 (Maint) Add spec/functions to rake test task
Without this patch the `test` rake task does not exercise the
rspec-puppet behaviors located in spec/functions/  This is a
self-evident problem.

This patch fixes the problem by adding spec/functions to the list of
directories scanned for spec tests.
2012-11-27 16:18:07 -08:00