diff options
author | Luke Kanies <luke@puppetlabs.com> | 2011-06-08 07:03:54 -0700 |
---|---|---|
committer | Luke Kanies <luke@puppetlabs.com> | 2011-07-15 11:51:49 -0700 |
commit | 0d2e0672eb516a1b1f2ced6b8c74bd2064dd205e (patch) | |
tree | 28d38def94814fcce50b4d82984265dcca7e0545 /lib/puppet/parser/compiler.rb | |
parent | 4ad404ee7e7244d94ff4d87effc1a041d65b3f73 (diff) | |
download | puppet-0d2e0672eb516a1b1f2ced6b8c74bd2064dd205e.tar.gz puppet-0d2e0672eb516a1b1f2ced6b8c74bd2064dd205e.tar.xz puppet-0d2e0672eb516a1b1f2ced6b8c74bd2064dd205e.zip |
Adding []/[]= support to Scope
The interface to scope is much clearer this way anyway,
but this is needed to integrate Puppet with Hiera[1].
It just provides hash-like behavior to Scope, which Hiera
and others can now easily rely on.
I also went through all of the code that used Scope#lookupvar
and Scope#setvar and changed it if possible, and at the same
time cleaned up a lot of tests that were unnecessarily stubbing
(and thus making it difficult to tell if I had actually broken
anything).
1 - https://github.com/ripienaar/hiera
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Reviewed-by: Nick Lewis <nick@puppetlabs.com>
Diffstat (limited to 'lib/puppet/parser/compiler.rb')
-rw-r--r-- | lib/puppet/parser/compiler.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb index c1daade4c..f43a31285 100644 --- a/lib/puppet/parser/compiler.rb +++ b/lib/puppet/parser/compiler.rb @@ -450,7 +450,7 @@ class Puppet::Parser::Compiler # Set the node's parameters into the top-scope as variables. def set_node_parameters node.parameters.each do |param, value| - @topscope.setvar(param, value) + @topscope[param] = value end # These might be nil. @@ -473,7 +473,7 @@ class Puppet::Parser::Compiler Puppet.settings.each do |name, setting| next if name.to_s == "name" - scope.setvar name.to_s, environment[name] + scope[name.to_s] = environment[name] end end |