From 9fa2628a844c75b8f554f283dfece01667f20594 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Mon, 17 Sep 2007 15:21:44 -0700 Subject: This is basically another intermediate commit. I feel like I've gone too far down the rabbit hole to turn back now, but the code is clearly getting more centralized around the Configuration class, which is the goal. Things are currently a bit muddy between recursion, dynamic resource generation, transactions, and the configuration, and I don't expect to be able to clear it up much until we rewrite all of the tests for the Transaction class, since that is when we'll actually be setting its behaviour. At this point, Files (which are currently the only resources that generate other resources) are responsible for adding their edges to the relationship graph. This puts them knowing more than I would like about how the relationship graph works, but it'll have to do for now. There are still failing tests, but files seem to work again. Now to go through the rest of the tests and make them work. --- ext/module_puppet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/module_puppet') diff --git a/ext/module_puppet b/ext/module_puppet index cb03b6ef2..194f3fa09 100755 --- a/ext/module_puppet +++ b/ext/module_puppet @@ -191,8 +191,8 @@ if parseonly end begin - client.getconfig - client.apply + config = client.getconfig + config.apply rescue => detail Puppet.err detail exit(1) -- cgit From 3a18348fdbea39f56857b03c8f531bd5a2a8105d Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sat, 22 Sep 2007 17:54:46 -0500 Subject: Renaming the 'Puppet::Util::Config' class to 'Puppet::Util::Settings'. This is to clear up confusion caused by the fact that we now have a 'Configuration' class to model host configurations, or any set of resources as a "configuration". --- ext/module_puppet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/module_puppet') diff --git a/ext/module_puppet b/ext/module_puppet index 194f3fa09..52f65b094 100755 --- a/ext/module_puppet +++ b/ext/module_puppet @@ -61,7 +61,7 @@ options = [ ] # Add all of the config parameters as valid options. -Puppet.config.addargs(options) +Puppet.settings.addargs(options) result = GetoptLong.new(*options) @@ -108,7 +108,7 @@ begin $stderr.puts detail.to_s end else - Puppet.config.handlearg(opt, arg) + Puppet.settings.handlearg(opt, arg) end } rescue GetoptLong::InvalidOption => detail @@ -121,7 +121,7 @@ end # Now parse the config if Puppet[:config] and File.exists? Puppet[:config] - Puppet.config.parse(Puppet[:config]) + Puppet.settings.parse(Puppet[:config]) end client = nil -- cgit