summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Maint: Add ellipsis to generated short_descriptions.nfagerlund2011-05-261-1/+1
| | | | | | | | | | | | | | Auto-generated short descriptions cut off at five lines with no indication that they are truncated. This commit adds ellipsis in brackets to indicate incompleteness.
* | (#6962) Add "arguments" method to help APInfagerlund2011-05-261-0/+2
|/ | | | | | | | | | Since some actions take arguments and some do not, action synopses were incomplete and ambiguous. This commit adds a method for explicitly declaring what argument(s) an action takes, and places the arguments at the appropriate spot in the action's synopsis. By convention, individual arguments should be wrapped in angle brackets.
* Merge branch 'ticket/2.7rc/7681' into 2.7rcNick Lewis2011-05-263-6/+47
|\
| * (#7681) Add an acceptance test for resource refs with array variablesNick Lewis2011-05-261-0/+27
| | | | | | | | | | Paired-with: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Dominic Maraglia <dominic@puppetlabs.com>
| * (#7681) Allow array variables as resource referencesNick Lewis2011-05-262-6/+20
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit df088c9ba16dce50c17a79920c1ac186db67b9e9 introduced a regression where $files = ["/tmp/one", "/tmp/two"] file { "/tmp/one": content => "one", } file { "/tmp/two": content => "two", } file { "/tmp/three": content => "three", require => File[$files], } no longer worked. File[$files] was concatenating the elements of $files to create a single title, instead of expanding to multiple File dependencies. Since resource reference titles are implicitly wrapped in an array, if one of the elements of that array is a variable containing an array, the list of titles is a nested array. Prior to the change causing the regression, we would flatten arrays when evaluating them, under certain circumstances. We no longer ever flatten AST arrays when evaluating them, so anywhere that we really do need a flattened array, we have to manually flatten it. ResourceReference expects its list of titles to be a single, flat list of titles, so we have to make it so. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
* (#7507) Add exclude filter for ruby 1.9 spec failuresJosh Cooper2011-05-201-2/+2
| | | | | | | Exclude spec test for multiple writer processes as this fails intermittently on ruby 1.9. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
* Merge branch 'ticket/2.7.x/maint-stub_trap' into 2.7.xMatt Robinson2011-05-194-8/+2
|\ | | | | | | | | * ticket/2.7.x/maint-stub_trap: maint: move trap call to Signal so we can stub it for specs
| * maint: move trap call to Signal so we can stub it for specsMatt Robinson2011-05-194-8/+2
|/ | | | | | | | | | Also removed some monkey patching on Signal that would have theoretically done this without having to explicitly call trap on Signal in order to stub it, but it's not working. This allows us to ctrl+c (send SIGINT) in the middle of a spec run. Paired-with: Josh Cooper <josh@puppetlabs.com>
* Updated CHANGELOG for 2.7.0rc3Michael Stahnke2011-05-181-0/+20
|
* Merge branch 'tickets/2.7.x/7259' into 2.7.xPieter van de Bruggen2011-05-182-3/+12
|\
| * (#7259) Remove ActiveRecord requirement from indirector face specJacob Helwig2011-05-181-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "should be able to return a list of terminuses for a given indirection" was calling Puppet::Indirector::Face.terminus_classes, which is just a thin wrapper around Puppet::Indirector::Terminus.terminus_classes, which would attempt to load all Terminus classes. This would cause problems if not all of the prerequisites for all of the Terminus classes were installed (For example: ActiveRecord). Now we only test that the thin wrapper appropriately munges the output from Puppet::Indirector::Terminus.terminus_classes, since the method being wrapped should have its own tests for the behavior that was being tested originally. Paired-with: Nick Lewis <nick@puppetlabs.com>
| * (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-181-1/+1
|/ | | | | | | | | | | | When configuring the Indirector routes, we should only try loading the Terminus classes that are referenced by the configuration. Previously, we were loading all Terminus classes, which would cause errors if we didn't have all of the prerequisites for all of them, even if the ones with missing prerequisites weren't being used by the configuration. Paired-with: Nick Lewis <nick@puppetlabs.com>
* Adding a sleep state post starting masterDominic Maraglia2011-05-171-0/+3
| | | | | | | Occasional spurious errors seen when running this test -- curl reports an SSL protocol error; I suspect this is actually a timing issue related to starting up the master and not being ready to to accecpt connections.
* Merge branch 'tickets/2.7.x/7507' into 2.7.xPieter van de Bruggen2011-05-172-2/+2
|\
| * (#7507) Add more filters for Ruby 1.9 spec failuresPieter van de Bruggen2011-05-172-2/+2
|/ | | Paired-With: Matt Robinson
* Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.xMatt Robinson2011-05-1763-189/+188
|\ | | | | | | | | | | * ticket/2.7.x/7507-filter_19_failures: (#7507) Add ability to filter Ruby 1.9 spec failures (#7507) Fix when_invoked action specs in Ruby 1.9
| * (#7507) Add ability to filter Ruby 1.9 spec failuresMatt Robinson2011-05-1759-102/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By running: rspec spec --tag ~@fails_on_ruby_1.9.2 We can now just run the specs that pass under Ruby 1.9. Obviously in the long term we want to have all the specs passing, but until then we need notification when we regress. From now on new code will be required to pass under Ruby 1.9, and Jenkins will give us email notification if it doesn't or if we break something that was already working. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
| * (#7507) Fix when_invoked action specs in Ruby 1.9Matt Robinson2011-05-174-87/+86
| | | | | | | | | | | | | | | | Ruby 1.9 is strict about argument arity for methods that are metaprogrammatically defined. A ton of specs that were setting up when_invoked didn't pass options even though they should have been. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* | Merge branch 'ticket/2.7.x/7297' into 2.7.xNick Lewis2011-05-161-1/+1
|\ \
| * | (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9Nick Lewis2011-05-161-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | This method was relying on the implicit join in Ruby 1.8's Array#to_s, eg. [1,2,3].to_s => "123". The behavior in Ruby 1.9 is more akin to Array#inspect, eg. [1,2,3].to_s => "[1, 2, 3]". Since the array we were building was lines to be printed, the latter behavior is incorrect. So we just join into a single string, which prints consistently in all versions of Ruby. Paired-With: Josh Cooper Original patch by Aria Stewart <aredridel@nbtsc.org>
* | Merge branch 'ticket/2.7.x/7298' into 2.7.xNick Lewis2011-05-161-0/+1
|\ \ | |/ |/|
| * (#7298) require 'English' to provide $CHILD_STATUS in Ruby 1.9Nick Lewis2011-05-161-0/+1
|/ | | | | | | | | This had been coming from 'cgi', but in Ruby 1.9, cgi no longer requires English. Since we use $CHILD_STATUS when execing, we need to have it available, so require it manually. This also provides the other named special globals, should we choose to use them. Paired-With: Josh Cooper
* Merge branch 'ticket/2.7.x/7291-ruby19-fixes' into 2.7.xMatt Robinson2011-05-169-11/+11
|\ | | | | | | | | | | | | | | * ticket/2.7.x/7291-ruby19-fixes: (#7291) Fix issues with instance_methods in Ruby 1.9 (#7291) Fixed ascii problem with Ruby 1.9.2 (#7291) Fix Ruby 1.9 face failures (#7291) The 'script' version of actions needs options argument
| * (#7291) Fix issues with instance_methods in Ruby 1.9Matt Robinson2011-05-165-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance_methods in Ruby 1.8.7 returns an array of strings, but returns an array of symbols in 1.9.2. This manifested itself when running the tests because in 1.9.2 we were trying to call sub on a sybmol. The original proposed solution was to monkey patch symbols to have a sub method, but this didn't deal with the real issue of need to check whether a method was defined, and actually made it worse. Turns out that checking for the presence of a method in an array that may contain symbols and may contain strings is better done by just calling method_defined? instead. This patch addresses all the places ack turned up the code doing this include? check instead of directly calling method_defined?. Thanks to Alex Sharp ajsharp@gmail.com for pointing out the Ruby 1.9 problems and working toward a solution. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * (#7291) Fixed ascii problem with Ruby 1.9.2Matt Robinson2011-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As with the previous commit, there was a problem loading a face because Ruby 1.9.2 doesn't like using non-standard ascii characters without declaring the encoding at the top of the file. SyntaxError Exception: /Users/matthewrobinson/work/puppet/lib/puppet/face/resource.rb:10: invalid multibyte char (US-ASCII) Rather than declare the encoding to allow the French word, I've translated it (after having to look it up myself). Reviewed-by: Pieter van de Bruggen <pieter@puppetlabs.com>
| * (#7291) Fix Ruby 1.9 face failuresMatt Robinson2011-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The certificate face wasn't being loaded, but it wasn't clear from the test failure why: lib/puppet/interface.rb:61:in `[]': Could not find Puppet Face :certificate (Puppet::Error) The problem is that when the certificate face is required you get: SyntaxError Exception: /Users/matthewrobinson/work/puppet/lib/puppet/face/certificate.rb:11: invalid multibyte char (US-ASCII) However this error is caught and logged, but then ignored. This behavior was a decision in #7314 and is currently under review. A space character in the description was ASCII 160 instead of the typical ASCII 32 Reviewed-by: Pieter van de Bruggen <pieter@puppetlabs.com>
| * (#7291) The 'script' version of actions needs options argumentMatt Robinson2011-05-162-2/+2
|/ | | | | | | | | | Ruby 1.9 is stricter about arity for for arguments passed as a block. A test case just hadn't been updated to take this into account for Face scripts (a simpler form of action), which isn't surprising since script isn't used anywhere in the code, which makes it a prime candidate for removal as far as I'm concerned, but apparently Luke wants it in there. Reviewed-by: Pieter van de Bruggen <pieter@puppetlabs.com>
* Merge branch 'ticket/2.7.x/7469-rake-failures' into 2.7.xMax Martin2011-05-121-0/+2
|\ | | | | | | | | * ticket/2.7.x/7469-rake-failures: (#7469) Add license to test face so tests pass
| * (#7469) Add license to test face so tests passMax Martin2011-05-121-0/+2
|/ | | | | | | | | | The TestIndirection test face defined in indirection_base_spec did not have copyright or license information defined; this was causing order-dependent test failures when unit tests were run before other specs (as in rake spec). This commit adds license and copyright info to the test face to prevent these failures. Paired-with: Daniel Pittman <daniel@puppetlabs.com>
* Merge branch 'ticket/2.7.x/7264-metaparameter_reference' into 2.7.xnfagerlund2011-05-121-40/+44
|\
| * (#7264) Docs: Clarify that subscribe/notify imply require/beforenfagerlund2011-05-121-40/+44
|/ | | | | | | | This is a doc string only commit. The metaparameter reference was not clear about subscribe and notify being supersets of require and before, respectively. This commit also cleans up some unrelated quoting, arrow-alignment, and language flow issues.
* Merge branch 'tickets/2.7.x/7299' into 2.7.xMax Martin2011-05-103-1/+12
|\ | | | | | | | | | | * tickets/2.7.x/7299: Prevent spec failure caused by network device mock leak Fix #7299 - do not require net/ssh for running rake spec
| * Prevent spec failure caused by network device mock leakBrice Figureau2011-05-072-0/+9
| | | | | | | | | | | | | | We were leaking some mocks in the network device singleton from tests to tests. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * Fix #7299 - do not require net/ssh for running rake specBrice Figureau2011-05-071-1/+3
| | | | | | | | | | | | | | This is a different fix than the one proposed by Stefan Schulte, based on Luke comments. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | Merge branch 'ticket/2.7.x/7468-stub_xmlrpc_internet_call' into 2.7.xMatt Robinson2011-05-101-20/+24
|\ \ | |/ |/| | | | | * ticket/2.7.x/7468-stub_xmlrpc_internet_call: (#7468) Stub spec that tries to connect to pypi.python.org
| * (#7468) Stub spec that tries to connect to pypi.python.orgMatt Robinson2011-05-101-20/+24
|/ | | | | | | I noticed a test failure when I ran the specs without an internet connection. Specs should never need an internet connection to pass. Reviewed-by: Max Martin <max@puppetlabs.com>
* Updated CHANGELOG for 2.7.0rc2Daniel Pittman2011-05-061-0/+163
|
* Merge branch 'bug/2.7.x/7353-kill-for-humans-format-entirely' into 2.7.xDaniel Pittman2011-05-055-60/+18
|\
| * (#7353) Remove :for_humans format entirely.Daniel Pittman2011-05-055-60/+18
|/ | | | | | | Since we never shipped this in a real release, we don't need to maintain compatibility. So, remove it entirely from the codebase. Reviewed-By: Max Martin <max@puppetlabs.com>
* Merge remote-tracking branch 'nfagerlund/ticket/2.7.x/6962' into 2.7.xDaniel Pittman2011-05-0520-37/+438
|\
| * (Maint) Adjust documentation whitespacenfagerlund2011-05-0418-223/+225
| | | | | | | | | | The patch from issue #7221 permits indented heredocs. This patch takes advantage of that to make the doc strings less messy.
| * (#7303) Remove reference to not-yet-extant man actionnfagerlund2011-05-041-1/+0
| | | | | | | | We haven't implemented the `man` action yet, so let's not mention it until we have.
| * (#6962) Add self-documentation data to puppet facesnfagerlund2011-05-0418-27/+389
| | | | | | | | | | | | This patch adds documentation strings to most of the faces, actions, and options introduced in 2.7.0. There are a small number of TK notes remaining, and longer strings have not been indented to take advantage of the patch from issue #7221.
| * Maint: adjust faces.rb's help to match that of other applicationsnfagerlund2011-05-041-6/+44
| | | | | | | | | | | | Faces isn't a face, interestingly, so it doesn't get a summary line in the puppet help. This will output the appropriately-formatted manpage text using the normal mechanism.
* | Adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| |
* | add clean-up step to test for ticket_5477 to prevent site.pp from leaking to ↵Dominic Maraglia2011-05-041-0/+3
| | | | | | | | other tests
* | fixed test for ticket_7117Dominic Maraglia2011-05-041-0/+11
| | | | | | | | Need to restart puppet master to detect changes made to auth.conf
* | Merge branch 'tickets/2.7.x/7179' into 2.7.xPieter van de Bruggen2011-05-043-12/+7
|\ \ | |/ |/|
| * (#7179) Modify default ACL for /node/<name>.Pieter van de Bruggen2011-05-043-12/+7
| | | | | | | | | | | | | | By default, it is useful to permit an individual node to query information about itself, and there is no good reason to reject this by default. Paired-With: Nick Lewis
* | Merge branch 'tickets/2.7.x/7304' into 2.7.xNigel Kersten2011-05-041-6/+1
|\ \