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 <pie...@puppetlabs.com>
Signed-off-by: Matt Robinson <m...@puppetlabs.com>
---
Local-branch: ticket/2.7.x/7291-ruby19-fixes
spec/lib/puppet/face/huzzah.rb | 2 +-
spec/lib/puppet/face/version_matching.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/spec/lib/puppet/face/huzzah.rb b/spec/lib/puppet/face/huzzah.rb
index 6593d35..ab465d9 100755
--- a/spec/lib/puppet/face/huzzah.rb
+++ b/spec/lib/puppet/face/huzzah.rb
@@ -3,5 +3,5 @@ Puppet::Face.define(:huzzah, '2.0.1') do
copyright "Puppet Labs", 2011
license "Apache 2 license; see COPYING"
summary "life is a thing for celebration"
- script :bar do "is where beer comes from" end
+ script :bar do |options| "is where beer comes from" end
end
diff --git a/spec/lib/puppet/face/version_matching.rb
b/spec/lib/puppet/face/version_matching.rb
index 52bc71d..bfdf5e3 100644
--- a/spec/lib/puppet/face/version_matching.rb
+++ b/spec/lib/puppet/face/version_matching.rb
@@ -7,6 +7,6 @@ require 'puppet/face'
copyright "Puppet Labs", 2011
license "Apache 2 license; see COPYING"
summary "version matching face #{version}"
- script :version do version end
+ script :version do |options| version end
end
end
--
1.7.3.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
