puppet 2.7.26 → 3.0.0.rc4

data/spec/unit/run_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/agent'
 require 'puppet/run'
@@ -116,35 +116,19 @@ describe Puppet::Run do
   end
 
   describe ".from_pson" do
-    it "should read from a hash that represents the 'options' to initialize" do
+    it "should accept a hash of options, and pass them with symbolified keys to new" do
       options = {
         "tags" => "whatever",
         "background" => true,
-        "ignoreschedules" => false,
       }
-      run = Puppet::Run.from_pson(options)
 
-      run.options.should == {
+      Puppet::Run.expects(:new).with({
         :tags => "whatever",
-        :ignoreschedules => false,
-      }
-      run.background.should be_true
-    end
+        :background => true,
+        :pluginsync => Puppet[:pluginsync]
+      })
 
-    it "should read from a hash that follows the actual object structure" do
-      hash = {"background" => true,
-              "options" => {
-                "tags" => [],
-                "ignoreschedules" => false},
-              "status" => "success"}
-      run = Puppet::Run.from_pson(hash)
-
-      run.options.should == {
-        :tags => [],
-        :ignoreschedules => false
-      }
-      run.background.should be_true
-      run.status.should == 'success'
+      Puppet::Run.from_pson(options)
     end
   end
 end

data/spec/unit/settings/directory_setting_spec.rb

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+require 'puppet/settings'
+require 'puppet/settings/directory_setting'
+
+describe Puppet::Settings::DirectorySetting do
+  DirectorySetting = Puppet::Settings::DirectorySetting
+
+  include PuppetSpec::Files
+
+  before do
+    @basepath = make_absolute("/somepath")
+  end
+
+  describe "when being converted to a resource" do
+    before do
+      @settings = mock 'settings'
+      @dir = Puppet::Settings::DirectorySetting.new(
+          :settings => @settings, :desc => "eh", :name => :mydir, :section => "mysect")
+      @settings.stubs(:value).with(:mydir).returns @basepath
+    end
+
+    it "should return :directory as its type" do
+      @dir.type.should == :directory
+    end
+
+
+
+  end
+end
+

data/spec/unit/{util/settings → settings}/file_setting_spec.rb

@@ -1,11 +1,11 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-require 'puppet/util/settings'
-require 'puppet/util/settings/file_setting'
+require 'puppet/settings'
+require 'puppet/settings/file_setting'
 
-describe Puppet::Util::Settings::FileSetting do
-  FileSetting = Puppet::Util::Settings::FileSetting
+describe Puppet::Settings::FileSetting do
+  FileSetting = Puppet::Settings::FileSetting
 
   include PuppetSpec::Files
 
@@ -124,13 +124,13 @@ describe Puppet::Util::Settings::FileSetting do
   describe "when being converted to a resource" do
     before do
       @settings = mock 'settings'
-      @file = Puppet::Util::Settings::FileSetting.new(:settings => @settings, :desc => "eh", :name => :mydir, :section => "mysect")
-      @settings.stubs(:value).with(:mydir).returns @basepath
+      @file = Puppet::Settings::FileSetting.new(:settings => @settings, :desc => "eh", :name => :myfile, :section => "mysect")
+      @file.stubs(:create_files?).returns true
+      @settings.stubs(:value).with(:myfile).returns @basepath
     end
 
-    it "should skip files that cannot determine their types" do
-      @file.expects(:type).returns nil
-      @file.to_resource.should be_nil
+    it "should return :file as its type" do
+      @file.type.should == :file
     end
 
     it "should skip non-existent files if 'create_files' is not enabled" do
@@ -149,13 +149,13 @@ describe Puppet::Util::Settings::FileSetting do
 
     describe "on POSIX systems", :if => Puppet.features.posix? do
       it "should skip files in /dev" do
-        @settings.stubs(:value).with(:mydir).returns "/dev/file"
+        @settings.stubs(:value).with(:myfile).returns "/dev/file"
         @file.to_resource.should be_nil
       end
     end
 
     it "should skip files whose paths are not strings" do
-      @settings.stubs(:value).with(:mydir).returns :foo
+      @settings.stubs(:value).with(:myfile).returns :foo
       @file.to_resource.should be_nil
     end
 
@@ -166,7 +166,7 @@ describe Puppet::Util::Settings::FileSetting do
     end
 
     it "should fully qualified returned files if necessary (#795)" do
-      @settings.stubs(:value).with(:mydir).returns "myfile"
+      @settings.stubs(:value).with(:myfile).returns "myfile"
       path = File.join(Dir.getwd, "myfile")
       # Dir.getwd can return windows paths with backslashes, so we normalize them using expand_path
       path = File.expand_path(path) if Puppet.features.microsoft_windows?
@@ -275,7 +275,7 @@ describe Puppet::Util::Settings::FileSetting do
     end
 
     it "should tag the resource with the setting name" do
-      @file.to_resource.should be_tagged("mydir")
+      @file.to_resource.should be_tagged("myfile")
     end
 
     it "should tag the resource with 'settings'" do
@@ -286,14 +286,5 @@ describe Puppet::Util::Settings::FileSetting do
       @file.to_resource[:links].should == :follow
     end
   end
-
-  describe "when munging a filename" do
-    it "should preserve trailing slashes" do
-      settings = mock 'settings'
-      file = Puppet::Util::Settings::FileSetting.new(:settings => settings, :desc => "eh", :name => :mydir, :section => "mysect")
-      path = @basepath + '/'
-      file.munge(path).should == path
-    end
-  end
 end
 

data/spec/unit/settings/path_setting_spec.rb

@@ -0,0 +1,30 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+describe Puppet::Settings::PathSetting do
+  subject { described_class.new(:settings => mock('settings'), :desc => "test") }
+
+  context "#munge" do
+    it "should expand all path elements" do
+      munged = subject.munge("hello#{File::PATH_SEPARATOR}good/morning#{File::PATH_SEPARATOR}goodbye")
+      munged.split(File::PATH_SEPARATOR).each do |p|
+        Puppet::Util.should be_absolute_path(p)
+      end
+    end
+
+    it "should leave nil as nil" do
+      subject.munge(nil).should be_nil
+    end
+
+    context "on Windows", :if => Puppet.features.microsoft_windows? do
+      it "should convert \\ to /" do
+        subject.munge('C:\test\directory').should == 'C:/test/directory'
+      end
+
+      it "should work with UNC paths" do
+        subject.munge('//server/some/path').should == '//server/some/path'
+        subject.munge('\\\\server\some\path').should == '//server/some/path'
+      end
+    end
+  end
+end

data/spec/unit/settings/string_setting_spec.rb

@@ -0,0 +1,75 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+
+require 'puppet/settings'
+require 'puppet/settings/string_setting'
+
+describe Puppet::Settings::StringSetting do
+  StringSetting = Puppet::Settings::StringSetting
+
+  before(:each) do
+    @test_setting_name = :test_setting 
+    @test_setting_default = "my_crazy_default/$var"
+    @application_setting = "application/$var"
+    @application_defaults = { } 
+    Puppet::Settings::REQUIRED_APP_SETTINGS.each do |key|
+      @application_defaults[key] = "foo"
+    end
+    @application_defaults[:run_mode] = :user
+    @settings = Puppet::Settings.new
+    @application_defaults.each { |k,v| @settings.define_settings :main, k => {:default=>"", :desc => "blah"} }
+    @settings.define_settings :main, :var               => {  :default => "interpolate!", 
+                                                              :type => :string, 
+                                                              :desc => "my var desc" },
+                                     @test_setting_name => {  :default => @test_setting_default, 
+                                                              :type => :string, 
+                                                              :desc => "my test desc" }
+    @test_setting = @settings.setting(@test_setting_name)
+  end
+
+  describe "#default" do
+    describe "with no arguments" do
+      it "should return the setting default" do
+        @test_setting.default.should == @test_setting_default
+      end
+      
+      it "should be uninterpolated" do
+        @test_setting.default.should_not =~ /interpolate/
+      end
+    end
+    
+    describe "checking application defaults first" do
+      describe "if application defaults set" do
+        before(:each) do
+          @settings.initialize_app_defaults @application_defaults.merge @test_setting_name => @application_setting
+        end
+        
+        it "should return the application-set default" do
+          @test_setting.default(true).should == @application_setting
+        end
+        
+        it "should be uninterpolated" do
+          @test_setting.default(true).should_not =~ /interpolate/
+        end
+        
+      end
+      
+      describe "if application defaults not set" do
+        it "should return the regular default" do
+          @test_setting.default(true).should == @test_setting_default
+        end
+        
+        it "should be uninterpolated" do
+          @test_setting.default(true).should_not =~ /interpolate/
+        end
+      end
+    end
+  end
+  
+  describe "#value" do
+    it "should be interpolated" do
+      @test_setting.value.should =~ /interpolate/
+    end
+  end
+end
+

data/spec/unit/settings_spec.rb

@@ -0,0 +1,1583 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper'
+require 'ostruct'
+require 'puppet/settings/errors'
+
+describe Puppet::Settings do
+  include PuppetSpec::Files
+
+  MAIN_CONFIG_FILE_DEFAULT_LOCATION = File.join(Puppet::Settings.default_global_config_dir, "puppet.conf")
+  USER_CONFIG_FILE_DEFAULT_LOCATION = File.join(Puppet::Settings.default_user_config_dir, "puppet.conf")
+
+  describe "when dealing with user default directories" do
+    context "user config dir" do
+      it "should expand the value to an absolute path" do
+        Pathname.new(Puppet::Settings.default_user_config_dir).absolute?.should be_true
+      end
+    end
+    context "user var dir" do
+      it "should expand the value to an absolute path" do
+        Pathname.new(Puppet::Settings.default_user_var_dir).absolute?.should be_true
+      end
+    end
+  end
+
+  describe "when specifying defaults" do
+    before do
+      @settings = Puppet::Settings.new
+    end
+
+    it "should start with no defined parameters" do
+      @settings.params.length.should == 0
+    end
+
+    it "should not allow specification of default values associated with a section as an array" do
+      expect {
+        @settings.define_settings(:section, :myvalue => ["defaultval", "my description"])
+      }.to raise_error
+    end
+
+    it "should not allow duplicate parameter specifications" do
+      @settings.define_settings(:section, :myvalue => { :default => "a", :desc => "b" })
+      lambda { @settings.define_settings(:section, :myvalue => { :default => "c", :desc => "d" }) }.should raise_error(ArgumentError)
+    end
+
+    it "should allow specification of default values associated with a section as a hash" do
+      @settings.define_settings(:section, :myvalue => {:default => "defaultval", :desc => "my description"})
+    end
+
+    it "should consider defined parameters to be valid" do
+      @settings.define_settings(:section, :myvalue => { :default => "defaultval", :desc => "my description" })
+      @settings.valid?(:myvalue).should be_true
+    end
+
+    it "should require a description when defaults are specified with a hash" do
+      lambda { @settings.define_settings(:section, :myvalue => {:default => "a value"}) }.should raise_error(ArgumentError)
+    end
+
+    it "should support specifying owner, group, and mode when specifying files" do
+      @settings.define_settings(:section, :myvalue => {:type => :file, :default => "/some/file", :owner => "service", :mode => "boo", :group => "service", :desc => "whatever"})
+    end
+
+    it "should support specifying a short name" do
+      @settings.define_settings(:section, :myvalue => {:default => "w", :desc => "b", :short => "m"})
+    end
+
+    it "should support specifying the setting type" do
+      @settings.define_settings(:section, :myvalue => {:default => "/w", :desc => "b", :type => :string})
+      @settings.setting(:myvalue).should be_instance_of(Puppet::Settings::StringSetting)
+    end
+
+    it "should fail if an invalid setting type is specified" do
+      lambda { @settings.define_settings(:section, :myvalue => {:default => "w", :desc => "b", :type => :foo}) }.should raise_error(ArgumentError)
+    end
+
+    it "should fail when short names conflict" do
+      @settings.define_settings(:section, :myvalue => {:default => "w", :desc => "b", :short => "m"})
+      lambda { @settings.define_settings(:section, :myvalue => {:default => "w", :desc => "b", :short => "m"}) }.should raise_error(ArgumentError)
+    end
+  end
+
+
+  describe "when initializing application defaults do" do
+    before do
+      @settings = Puppet::Settings.new
+    end
+
+    it "should fail if someone attempts to initialize app defaults more than once" do
+      @settings.expects(:app_defaults_initialized?).returns(true)
+      expect {
+        @settings.initialize_app_defaults({})
+      }.to raise_error(Puppet::DevError)
+    end
+
+    it "should fail if the app defaults hash is missing any required values" do
+      expect {
+        @settings.initialize_app_defaults({})
+      }.to raise_error(Puppet::Settings::SettingsError)
+    end
+
+    # ultimately I'd like to stop treating "run_mode" as a normal setting, because it has so many special
+    #  case behaviors / uses.  However, until that time... we need to make sure that our private run_mode=
+    #  setter method gets properly called during app initialization.
+    it "should call the hacky run mode setter method until we do a better job of separating run_mode" do
+      app_defaults = {}
+      Puppet::Settings::REQUIRED_APP_SETTINGS.each do |key|
+        app_defaults[key] = "foo"
+      end
+
+      @settings.define_settings(:main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS)
+      @settings.expects(:run_mode=).with("foo")
+      @settings.initialize_app_defaults(app_defaults)
+    end
+  end
+
+  describe "#call_hooks_deferred_to_application_initialization" do
+    let (:good_default) { "yay" }
+    let (:bad_default) { "$doesntexist" }
+    before(:each) do
+      @settings = Puppet::Settings.new
+    end
+
+    describe "when ignoring dependency interpolation errors" do
+      let(:options) { {:ignore_interpolation_dependency_errors => true} }
+
+      describe "if interpolation error" do
+        it "should not raise an error" do
+          hook_values = []
+          @settings.define_settings(:section, :badhook => {:default => bad_default, :desc => "boo", :call_hook => :on_initialize_and_write, :hook => lambda { |v| hook_values << v  }})
+          expect do
+            @settings.send(:call_hooks_deferred_to_application_initialization, options)
+          end.to_not raise_error
+        end
+      end
+      describe "if no interpolation error" do
+        it "should not raise an error" do
+          hook_values = []
+          @settings.define_settings(:section, :goodhook => {:default => good_default, :desc => "boo", :call_hook => :on_initialize_and_write, :hook => lambda { |v| hook_values << v  }})
+          expect do
+            @settings.send(:call_hooks_deferred_to_application_initialization, options)
+          end.to_not raise_error
+        end
+      end
+    end
+
+    describe "when not ignoring dependency interpolation errors" do
+      [ {}, {:ignore_interpolation_dependency_errors => false}].each do |options|
+        describe "if interpolation error" do
+          it "should raise an error" do
+            hook_values = []
+            @settings.define_settings(
+              :section,
+              :badhook => {
+                :default => bad_default,
+                :desc => "boo",
+                :call_hook => :on_initialize_and_write,
+                :hook => lambda { |v| hook_values << v }
+              }
+            )
+            expect do
+              @settings.send(:call_hooks_deferred_to_application_initialization, options)
+            end.to raise_error Puppet::Settings::InterpolationError
+          end
+          it "should contain the setting name in error message" do
+            hook_values = []
+            @settings.define_settings(
+              :section,
+              :badhook => {
+                :default => bad_default,
+                :desc => "boo",
+                :call_hook => :on_initialize_and_write,
+                :hook => lambda { |v| hook_values << v }
+              }
+            )
+            expect do
+              @settings.send(:call_hooks_deferred_to_application_initialization, options)
+            end.to raise_error Puppet::Settings::InterpolationError, /badhook/
+          end
+        end
+        describe "if no interpolation error" do
+          it "should not raise an error" do
+            hook_values = []
+            @settings.define_settings(
+              :section,
+              :goodhook => {
+                :default => good_default,
+                :desc => "boo",
+                :call_hook => :on_initialize_and_write,
+                :hook => lambda { |v| hook_values << v }
+              }
+            )
+            expect do
+              @settings.send(:call_hooks_deferred_to_application_initialization, options)
+            end.to_not raise_error
+          end
+        end
+      end
+    end
+  end
+
+  describe "when setting values" do
+    before do
+      @settings = Puppet::Settings.new
+      @settings.define_settings :main, :myval => { :default => "val", :desc => "desc" }
+      @settings.define_settings :main, :bool => { :type => :boolean, :default => true, :desc => "desc" }
+    end
+
+    it "should provide a method for setting values from other objects" do
+      @settings[:myval] = "something else"
+      @settings[:myval].should == "something else"
+    end
+
+    it "should support a getopt-specific mechanism for setting values" do
+      @settings.handlearg("--myval", "newval")
+      @settings[:myval].should == "newval"
+    end
+
+    it "should support a getopt-specific mechanism for turning booleans off" do
+      @settings[:bool] = true
+      @settings.handlearg("--no-bool", "")
+      @settings[:bool].should == false
+    end
+
+    it "should support a getopt-specific mechanism for turning booleans on" do
+      # Turn it off first
+      @settings[:bool] = false
+      @settings.handlearg("--bool", "")
+      @settings[:bool].should == true
+    end
+
+    it "should consider a cli setting with no argument to be a boolean" do
+      # Turn it off first
+      @settings[:bool] = false
+      @settings.handlearg("--bool")
+      @settings[:bool].should == true
+    end
+
+    it "should consider a cli setting with an empty string as an argument to be a boolean, if the setting itself is a boolean" do
+      # Turn it off first
+      @settings[:bool] = false
+      @settings.handlearg("--bool", "")
+      @settings[:bool].should == true
+    end
+
+    it "should consider a cli setting with an empty string as an argument to be an empty argument, if the setting itself is not a boolean" do
+      @settings[:myval] = "bob"
+      @settings.handlearg("--myval", "")
+      @settings[:myval].should == ""
+    end
+
+    it "should consider a cli setting with a boolean as an argument to be a boolean" do
+      # Turn it off first
+      @settings[:bool] = false
+      @settings.handlearg("--bool", "true")
+      @settings[:bool].should == true
+    end
+
+    it "should not consider a cli setting of a non boolean with a boolean as an argument to be a boolean" do
+      # Turn it off first
+      @settings[:myval] = "bob"
+      @settings.handlearg("--no-myval", "")
+      @settings[:myval].should == ""
+    end
+
+    it "should flag string settings from the CLI" do
+      @settings.handlearg("--myval", "12")
+      @settings.set_by_cli?(:myval).should be_true
+    end
+
+    it "should flag bool settings from the CLI" do
+      @settings[:bool] = false
+      @settings.handlearg("--bool")
+      @settings.set_by_cli?(:bool).should be_true
+    end
+
+    it "should not flag settings memory as from CLI" do
+      @settings[:myval] = "12"
+      @settings.set_by_cli?(:myval).should be_false
+    end
+    
+    describe "setbycli" do
+      it "should generate a deprecation warning" do
+        Puppet.expects(:deprecation_warning)
+        @settings.setting(:myval).setbycli = true
+      end
+      it "should set the value" do
+        @settings[:myval] = "blah"
+        @settings.setting(:myval).setbycli = true
+        @settings.set_by_cli?(:myval).should be_true
+      end
+      it "should raise error if trying to unset value" do
+        @settings.handlearg("--myval", "blah")
+        expect do
+          @settings.setting(:myval).setbycli = nil
+        end.to raise_error ArgumentError, /unset/
+      end
+    end
+
+    it "should clear the cache when setting getopt-specific values" do
+      @settings.define_settings :mysection,
+          :one => { :default => "whah", :desc => "yay" },
+          :two => { :default => "$one yay", :desc => "bah" }
+      @settings[:two].should == "whah yay"
+      @settings.handlearg("--one", "else")
+      @settings[:two].should == "else yay"
+    end
+
+    it "should not clear other values when setting getopt-specific values" do
+      @settings[:myval] = "yay"
+      @settings.handlearg("--no-bool", "")
+      @settings[:myval].should == "yay"
+    end
+
+    it "should clear the list of used sections" do
+      @settings.expects(:clearused)
+      @settings[:myval] = "yay"
+    end
+
+    describe "call_hook" do
+      Puppet::Settings::StringSetting.available_call_hook_values.each do |val|
+        describe "when :#{val}" do
+          describe "and definition invalid" do
+            it "should raise error if no hook defined" do
+              expect do
+                @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => val})
+              end.to raise_error ArgumentError, /no :hook/
+            end
+            it "should include the setting name in the error message" do
+              expect do
+                @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => val})
+              end.to raise_error ArgumentError, /for :hooker/
+            end
+          end
+          describe "and definition valid" do
+            before(:each) do
+              hook_values = []
+              @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => val, :hook => lambda { |v| hook_values << v  }})
+            end
+
+            it "should call the hook when value written" do
+              @settings.setting(:hooker).expects(:handle).with("something").once
+              @settings[:hooker] = "something"
+            end
+          end
+        end
+      end
+
+      it "should have a default value of :on_write_only" do
+        @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :hook => lambda { |v| hook_values << v  }})
+        @settings.setting(:hooker).call_hook.should == :on_write_only
+      end
+
+      describe "when nil" do
+        it "should generate a warning" do
+          Puppet.expects(:warning)
+          @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => nil, :hook => lambda { |v| hook_values << v  }})
+        end
+        it "should use default" do
+          @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => nil, :hook => lambda { |v| hook_values << v  }})
+          @settings.setting(:hooker).call_hook.should == :on_write_only
+        end
+      end
+
+      describe "when invalid" do
+        it "should raise an error" do
+          expect do
+            @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => :foo, :hook => lambda { |v| hook_values << v  }})
+          end.to raise_error ArgumentError, /invalid.*call_hook/i
+        end
+      end
+
+      describe "when :on_define_and_write" do
+        it "should call the hook at definition" do
+          hook_values = []
+          @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => :on_define_and_write, :hook => lambda { |v| hook_values << v  }})
+          @settings.setting(:hooker).call_hook.should == :on_define_and_write
+          hook_values.should == %w{yay}
+        end
+      end
+
+      describe "when :on_initialize_and_write" do
+        before(:each) do
+          @hook_values = []
+          @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => :on_initialize_and_write, :hook => lambda { |v| @hook_values << v  }})
+        end
+
+        it "should not call the hook at definition" do
+          @hook_values.should == []
+          @hook_values.should_not == %w{yay}
+        end
+
+        it "should call the hook at initialization" do
+          app_defaults = {}
+          Puppet::Settings::REQUIRED_APP_SETTINGS.each do |key|
+            app_defaults[key] = "foo"
+          end
+          app_defaults[:run_mode] = :user
+          @settings.define_settings(:main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS)
+
+          @settings.setting(:hooker).expects(:handle).with("yay").once
+
+          @settings.initialize_app_defaults app_defaults
+        end
+      end
+    end
+
+    describe "call_on_define" do
+      [true, false].each do |val|
+        describe "to #{val}" do
+          it "should generate a deprecation warning" do
+            Puppet.expects(:deprecation_warning)
+            values = []
+            @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_on_define => val, :hook => lambda { |v| values << v }})
+          end
+
+          it "should should set call_hook" do
+            values = []
+            name = "hooker_#{val}".to_sym
+            @settings.define_settings(:section, name => {:default => "yay", :desc => "boo", :call_on_define => val, :hook => lambda { |v| values << v }})
+
+            @settings.setting(name).call_hook.should == :on_define_and_write if val
+            @settings.setting(name).call_hook.should == :on_write_only unless val
+          end
+        end
+      end
+    end
+
+    it "should call passed blocks when values are set" do
+      values = []
+      @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :hook => lambda { |v| values << v }})
+      values.should == []
+
+      @settings[:hooker] = "something"
+      values.should == %w{something}
+    end
+
+    it "should call passed blocks when values are set via the command line" do
+      values = []
+      @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :hook => lambda { |v| values << v }})
+      values.should == []
+
+      @settings.handlearg("--hooker", "yay")
+
+      values.should == %w{yay}
+    end
+
+    it "should provide an option to call passed blocks during definition" do
+      values = []
+      @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => :on_define_and_write, :hook => lambda { |v| values << v }})
+      values.should == %w{yay}
+    end
+
+    it "should pass the fully interpolated value to the hook when called on definition" do
+      values = []
+      @settings.define_settings(:section, :one => { :default => "test", :desc => "a" })
+      @settings.define_settings(:section, :hooker => {:default => "$one/yay", :desc => "boo", :call_hook => :on_define_and_write, :hook => lambda { |v| values << v }})
+      values.should == %w{test/yay}
+    end
+
+    it "should munge values using the setting-specific methods" do
+      @settings[:bool] = "false"
+      @settings[:bool].should == false
+    end
+
+    it "should prefer cli values to values set in Ruby code" do
+      @settings.handlearg("--myval", "cliarg")
+      @settings[:myval] = "memarg"
+      @settings[:myval].should == "cliarg"
+    end
+
+    it "should clear the list of environments" do
+      Puppet::Node::Environment.expects(:clear).at_least(1)
+      @settings[:myval] = "memarg"
+    end
+
+    it "should raise an error if we try to set a setting that hasn't been defined'" do
+      lambda{
+        @settings[:why_so_serious] = "foo"
+      }.should raise_error(ArgumentError, /unknown configuration parameter/)
+    end
+
+    it "should raise an error if we try to set a setting that is read-only (which, really, all of our settings probably should be)" do
+      @settings.define_settings(:section, :one => { :default => "test", :desc => "a" })
+      @settings.expects(:read_only_settings).returns([:one])
+
+      lambda{
+        @settings[:one] = "foo"
+      }.should raise_error(ArgumentError, /read-only/)
+    end
+  end
+
+  describe "when returning values" do
+    before do
+      @settings = Puppet::Settings.new
+      @settings.define_settings :section,
+          :config => { :type => :file, :default => "/my/file", :desc => "eh" },
+          :one    => { :default => "ONE", :desc => "a" },
+          :two    => { :default => "$one TWO", :desc => "b"},
+          :three  => { :default => "$one $two THREE", :desc => "c"},
+          :four   => { :default => "$two $three FOUR", :desc => "d"}
+      FileTest.stubs(:exist?).returns true
+    end
+
+    describe "call_on_define" do
+      it "should generate a deprecation warning" do
+        Puppet.expects(:deprecation_warning)
+        @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :hook => lambda { |v| hook_values << v  }})
+        @settings.setting(:hooker).call_on_define
+      end
+
+      Puppet::Settings::StringSetting.available_call_hook_values.each do |val|
+        it "should match value for call_hook => :#{val}" do
+          hook_values = []
+          @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => val, :hook => lambda { |v| hook_values << v  }})
+          @settings.setting(:hooker).call_on_define.should == @settings.setting(:hooker).call_hook_on_define?
+        end
+      end
+    end
+
+    it "should provide a mechanism for returning set values" do
+      @settings[:one] = "other"
+      @settings[:one].should == "other"
+    end
+
+    it "should interpolate default values for other parameters into returned parameter values" do
+      @settings[:one].should == "ONE"
+      @settings[:two].should == "ONE TWO"
+      @settings[:three].should == "ONE ONE TWO THREE"
+    end
+
+    it "should interpolate default values that themselves need to be interpolated" do
+      @settings[:four].should == "ONE TWO ONE ONE TWO THREE FOUR"
+    end
+
+    it "should provide a method for returning uninterpolated values" do
+      @settings[:two] = "$one tw0"
+      @settings.uninterpolated_value(:two).should  == "$one tw0"
+      @settings.uninterpolated_value(:four).should == "$two $three FOUR"
+    end
+
+    it "should interpolate set values for other parameters into returned parameter values" do
+      @settings[:one] = "on3"
+      @settings[:two] = "$one tw0"
+      @settings[:three] = "$one $two thr33"
+      @settings[:four] = "$one $two $three f0ur"
+      @settings[:one].should == "on3"
+      @settings[:two].should == "on3 tw0"
+      @settings[:three].should == "on3 on3 tw0 thr33"
+      @settings[:four].should == "on3 on3 tw0 on3 on3 tw0 thr33 f0ur"
+    end
+
+    it "should not cache interpolated values such that stale information is returned" do
+      @settings[:two].should == "ONE TWO"
+      @settings[:one] = "one"
+      @settings[:two].should == "one TWO"
+    end
+
+    it "should not cache values such that information from one environment is returned for another environment" do
+      text = "[env1]\none = oneval\n[env2]\none = twoval\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+
+      @settings.value(:one, "env1").should == "oneval"
+      @settings.value(:one, "env2").should == "twoval"
+    end
+
+    it "should have a run_mode that defaults to user" do
+      @settings.run_mode.should == :user
+    end
+    describe "setbycli" do
+      it "should generate a deprecation warning" do
+        @settings.handlearg("--one", "blah")
+        Puppet.expects(:deprecation_warning)
+        @settings.setting(:one).setbycli
+      end
+      it "should be true" do
+        @settings.handlearg("--one", "blah")
+        @settings.setting(:one).setbycli.should be_true
+      end
+    end
+  end
+
+  describe "when choosing which value to return" do
+    before do
+      @settings = Puppet::Settings.new
+      @settings.define_settings :section,
+        :config => { :type => :file, :default => "/my/file", :desc => "a" },
+        :one => { :default => "ONE", :desc => "a" },
+        :two => { :default => "TWO", :desc => "b" }
+      FileTest.stubs(:exist?).returns true
+      @settings.stubs(:run_mode).returns :mymode
+    end
+
+    it "should return default values if no values have been set" do
+      @settings[:one].should == "ONE"
+    end
+
+    it "should return values set on the cli before values set in the configuration file" do
+      text = "[main]\none = fileval\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.handlearg("--one", "clival")
+      @settings.send(:parse_config_files)
+
+      @settings[:one].should == "clival"
+    end
+
+    it "should return values set on the cli before values set in Ruby" do
+      @settings[:one] = "rubyval"
+      @settings.handlearg("--one", "clival")
+      @settings[:one].should == "clival"
+    end
+
+    it "should return values set in the mode-specific section before values set in the main section" do
+      text = "[main]\none = mainval\n[mymode]\none = modeval\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+
+      @settings[:one].should == "modeval"
+    end
+
+    it "should not return values outside of its search path" do
+      text = "[other]\none = oval\n"
+      file = "/some/file"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:one].should == "ONE"
+    end
+
+    it "should return values in a specified environment" do
+      text = "[env]\none = envval\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings.value(:one, "env").should == "envval"
+    end
+
+    it 'should use the current environment for $environment' do
+      @settings.define_settings :main, :myval => { :default => "$environment/foo", :desc => "mydocs" }
+
+      @settings.value(:myval, "myenv").should == "myenv/foo"
+    end
+
+    it "should interpolate found values using the current environment" do
+      text = "[main]\none = mainval\n[myname]\none = nameval\ntwo = $one/two\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+
+      @settings.value(:two, "myname").should == "nameval/two"
+    end
+
+    it "should return values in a specified environment before values in the main or name sections" do
+      text = "[env]\none = envval\n[main]\none = mainval\n[myname]\none = nameval\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings.value(:one, "env").should == "envval"
+    end
+  end
+
+
+  describe "when locating config files" do
+    before do
+      @settings = Puppet::Settings.new
+    end
+
+    describe "when root" do
+      it "should look for #{MAIN_CONFIG_FILE_DEFAULT_LOCATION} if config settings haven't been overridden'" do
+        Puppet.features.stubs(:root?).returns(true)
+        FileTest.expects(:exist?).with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).returns(false)
+        FileTest.expects(:exist?).with(USER_CONFIG_FILE_DEFAULT_LOCATION).never
+
+        @settings.send(:parse_config_files)
+      end
+    end
+
+    describe "when not root" do
+      it "should look for #{USER_CONFIG_FILE_DEFAULT_LOCATION} if config settings haven't been overridden'" do
+        Puppet.features.stubs(:root?).returns(false)
+
+        seq = sequence "load config files"
+        FileTest.expects(:exist?).with(USER_CONFIG_FILE_DEFAULT_LOCATION).returns(false).in_sequence(seq)
+
+        @settings.send(:parse_config_files)
+      end
+    end
+  end
+
+  describe "when parsing its configuration" do
+    before do
+      @settings = Puppet::Settings.new
+      @settings.stubs(:service_user_available?).returns true
+      @file = make_absolute("/some/file")
+      @userconfig = make_absolute("/test/userconfigfile")
+      @settings.define_settings :section, :user => { :default => "suser", :desc => "doc" }, :group => { :default => "sgroup", :desc => "doc" }
+      @settings.define_settings :section,
+          :config => { :type => :file, :default => @file, :desc => "eh" },
+          :one => { :default => "ONE", :desc => "a" },
+          :two => { :default => "$one TWO", :desc => "b" },
+          :three => { :default => "$one $two THREE", :desc => "c" }
+      @settings.stubs(:user_config_file).returns(@userconfig)
+      FileTest.stubs(:exist?).with(@file).returns true
+      FileTest.stubs(:exist?).with(@userconfig).returns false
+    end
+
+    it "should not ignore the report setting" do
+      @settings.define_settings :section, :report => { :default => "false", :desc => "a" }
+      # This is needed in order to make sure we pass on windows
+      myfile = File.expand_path(@file)
+      @settings[:config] = myfile
+      text = <<-CONF
+        [puppetd]
+          report=true
+      CONF
+      FileTest.expects(:exist?).with(myfile).returns(true)
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:report].should be_true
+    end
+
+    it "should use its current ':config' value for the file to parse" do
+      myfile = make_absolute("/my/file") # do not stub expand_path here, as this leads to a stack overflow, when mocha tries to use it
+      @settings[:config] = myfile
+
+      FileTest.expects(:exist?).with(myfile).returns(true)
+
+      File.expects(:read).with(myfile).returns "[main]"
+
+      @settings.send(:parse_config_files)
+    end
+
+    it "should not try to parse non-existent files" do
+      FileTest.expects(:exist?).with(@file).returns false
+
+      File.expects(:read).with(@file).never
+
+      @settings.send(:parse_config_files)
+    end
+
+    it "should return values set in the configuration file" do
+      text = "[main]
+      one = fileval
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:one].should == "fileval"
+    end
+
+    #484 - this should probably be in the regression area
+    it "should not throw an exception on unknown parameters" do
+      text = "[main]\nnosuchparam = mval\n"
+      @settings.expects(:read_file).returns(text)
+      lambda { @settings.send(:parse_config_files) }.should_not raise_error
+    end
+
+    it "should convert booleans in the configuration file into Ruby booleans" do
+      text = "[main]
+      one = true
+      two = false
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:one].should == true
+      @settings[:two].should == false
+    end
+
+    it "should convert integers in the configuration file into Ruby Integers" do
+      text = "[main]
+      one = 65
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:one].should == 65
+    end
+
+    it "should support specifying all metadata (owner, group, mode) in the configuration file" do
+      @settings.define_settings :section, :myfile => { :type => :file, :default => make_absolute("/myfile"), :desc => "a" }
+
+      otherfile = make_absolute("/other/file")
+      text = "[main]
+      myfile = #{otherfile} {owner = service, group = service, mode = 644}
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:myfile].should == otherfile
+      @settings.metadata(:myfile).should == {:owner => "suser", :group => "sgroup", :mode => "644"}
+    end
+
+    it "should support specifying a single piece of metadata (owner, group, or mode) in the configuration file" do
+      @settings.define_settings :section, :myfile => { :type => :file, :default => make_absolute("/myfile"), :desc => "a" }
+
+      otherfile = make_absolute("/other/file")
+      text = "[main]
+      myfile = #{otherfile} {owner = service}
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:myfile].should == otherfile
+      @settings.metadata(:myfile).should == {:owner => "suser"}
+    end
+
+    it "should call hooks associated with values set in the configuration file" do
+      values = []
+      @settings.define_settings :section, :mysetting => {:default => "defval", :desc => "a", :hook => proc { |v| values << v }}
+
+      text = "[main]
+      mysetting = setval
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      values.should == ["setval"]
+    end
+
+    it "should not call the same hook for values set multiple times in the configuration file" do
+      values = []
+      @settings.define_settings :section, :mysetting => {:default => "defval", :desc => "a", :hook => proc { |v| values << v }}
+
+      text = "[user]
+      mysetting = setval
+      [main]
+      mysetting = other
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      values.should == ["setval"]
+    end
+
+    it "should pass the environment-specific value to the hook when one is available" do
+      values = []
+      @settings.define_settings :section, :mysetting => {:default => "defval", :desc => "a", :hook => proc { |v| values << v }}
+      @settings.define_settings :section, :environment => { :default => "yay", :desc => "a" }
+      @settings.define_settings :section, :environments => { :default => "yay,foo", :desc => "a" }
+
+      text = "[main]
+      mysetting = setval
+      [yay]
+      mysetting = other
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      values.should == ["other"]
+    end
+
+    it "should pass the interpolated value to the hook when one is available" do
+      values = []
+      @settings.define_settings :section, :base => {:default => "yay", :desc => "a", :hook => proc { |v| values << v }}
+      @settings.define_settings :section, :mysetting => {:default => "defval", :desc => "a", :hook => proc { |v| values << v }}
+
+      text = "[main]
+      mysetting = $base/setval
+      "
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      values.should == ["yay/setval"]
+    end
+
+    it "should allow empty values" do
+      @settings.define_settings :section, :myarg => { :default => "myfile", :desc => "a" }
+
+      text = "[main]
+      myarg =
+      "
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:myarg].should == ""
+    end
+
+    describe "and when reading a non-positive filetimeout value from the config file" do
+      before do
+        @settings.define_settings :foo, :filetimeout => { :default => 5, :desc => "eh" }
+
+        somefile = "/some/file"
+        text = "[main]
+        filetimeout = -1
+        "
+        File.expects(:read).with(somefile).returns(text)
+        File.expects(:expand_path).with(somefile).returns somefile
+        @settings[:config] = somefile
+      end
+    end
+  end
+
+
+  describe "when there are multiple config files" do
+    let(:main_config_text) { "[main]\none = main\ntwo = main2" }
+    let(:user_config_text) { "[main]\none = user\n" }
+    let(:seq) { sequence "config_file_sequence" }
+
+    before :each do
+      @settings = Puppet::Settings.new
+      @settings.define_settings(:section,
+          { :confdir => { :default => nil,                    :desc => "Conf dir" },
+            :config  => { :default => "$confdir/puppet.conf", :desc => "Config" },
+            :one     => { :default => "ONE",                  :desc => "a" },
+            :two     => { :default => "TWO",                  :desc => "b" }, })
+    end
+
+    context "running non-root without explicit config file" do
+      before :each do
+        Puppet.features.stubs(:root?).returns(false)
+        FileTest.expects(:exist?).
+          with(USER_CONFIG_FILE_DEFAULT_LOCATION).
+          returns(true).in_sequence(seq)
+        @settings.expects(:read_file).
+          with(USER_CONFIG_FILE_DEFAULT_LOCATION).
+          returns(user_config_text).in_sequence(seq)
+      end
+
+      it "should return values from the user config file" do
+        @settings.send(:parse_config_files)
+        @settings[:one].should == "user"
+      end
+
+      it "should not return values from the main config file" do
+        @settings.send(:parse_config_files)
+        @settings[:two].should == "TWO"
+      end
+    end
+
+    context "running as root without explicit config file" do
+      before :each do
+        Puppet.features.stubs(:root?).returns(true)
+        FileTest.expects(:exist?).
+          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          returns(true).in_sequence(seq)
+        @settings.expects(:read_file).
+          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          returns(main_config_text).in_sequence(seq)
+      end
+
+      it "should return values from the main config file" do
+        @settings.send(:parse_config_files)
+        @settings[:one].should == "main"
+      end
+
+      it "should not return values from the user config file" do
+        @settings.send(:parse_config_files)
+        @settings[:two].should == "main2"
+      end
+    end
+
+    context "running with an explicit config file as a user (e.g. Apache + Passenger)" do
+      before :each do
+        Puppet.features.stubs(:root?).returns(false)
+        @settings[:confdir] = File.dirname(MAIN_CONFIG_FILE_DEFAULT_LOCATION)
+        FileTest.expects(:exist?).
+          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          returns(true).in_sequence(seq)
+        @settings.expects(:read_file).
+          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          returns(main_config_text).in_sequence(seq)
+      end
+
+      it "should return values from the main config file" do
+        @settings.send(:parse_config_files)
+        @settings[:one].should == "main"
+      end
+
+      it "should not return values from the user config file" do
+        @settings.send(:parse_config_files)
+        @settings[:two].should == "main2"
+      end
+    end
+  end
+
+  describe "when reparsing its configuration" do
+    before do
+      @file = make_absolute("/test/file")
+      @userconfig = make_absolute("/test/userconfigfile")
+      @settings = Puppet::Settings.new
+      @settings.define_settings :section,
+          :config => { :type => :file, :default => @file, :desc => "a" },
+          :one => { :default => "ONE", :desc => "a" },
+          :two => { :default => "$one TWO", :desc => "b" },
+          :three => { :default => "$one $two THREE", :desc => "c" }
+      FileTest.stubs(:exist?).with(@file).returns true
+      FileTest.stubs(:exist?).with(@userconfig).returns false
+      @settings.stubs(:user_config_file).returns(@userconfig)
+    end
+
+    it "should use a LoadedFile instance to determine if the file has changed" do
+      file = mock 'file'
+      Puppet::Util::LoadedFile.expects(:new).with(@file).returns file
+
+      file.expects(:changed?)
+
+      @settings.stubs(:parse)
+      @settings.reparse_config_files
+    end
+
+    it "should not create the LoadedFile instance and should not parse if the file does not exist" do
+      FileTest.expects(:exist?).with(@file).returns false
+      Puppet::Util::LoadedFile.expects(:new).never
+
+      @settings.expects(:parse_config_files).never
+
+      @settings.reparse_config_files
+    end
+
+    it "should not reparse if the file has not changed" do
+      file = mock 'file'
+      Puppet::Util::LoadedFile.expects(:new).with(@file).returns file
+
+      file.expects(:changed?).returns false
+
+      @settings.expects(:parse_config_files).never
+
+      @settings.reparse_config_files
+    end
+
+    it "should reparse if the file has changed" do
+      file = stub 'file', :file => @file
+      Puppet::Util::LoadedFile.expects(:new).with(@file).returns file
+
+      file.expects(:changed?).returns true
+
+      @settings.expects(:parse_config_files)
+
+      @settings.reparse_config_files
+    end
+
+    it "should replace in-memory values with on-file values" do
+      # Init the value
+      text = "[main]\none = disk-init\n"
+      file = mock 'file'
+      file.stubs(:changed?).returns(true)
+      file.stubs(:file).returns(@file)
+      @settings[:one] = "init"
+      @settings.files = [file]
+
+      # Now replace the value
+      text = "[main]\none = disk-replace\n"
+
+      # This is kinda ridiculous - the reason it parses twice is that
+      # it goes to parse again when we ask for the value, because the
+      # mock always says it should get reparsed.
+      @settings.stubs(:read_file).returns(text)
+      @settings.reparse_config_files
+      @settings[:one].should == "disk-replace"
+    end
+
+    it "should retain parameters set by cli when configuration files are reparsed" do
+      @settings.handlearg("--one", "clival")
+
+      text = "[main]\none = on-disk\n"
+      @settings.stubs(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+
+      @settings[:one].should == "clival"
+    end
+
+    it "should remove in-memory values that are no longer set in the file" do
+      # Init the value
+      text = "[main]\none = disk-init\n"
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:one].should == "disk-init"
+
+      # Now replace the value
+      text = "[main]\ntwo = disk-replace\n"
+      @settings.expects(:read_file).returns(text)
+      @settings.send(:parse_config_files)
+
+      # The originally-overridden value should be replaced with the default
+      @settings[:one].should == "ONE"
+
+      # and we should now have the new value in memory
+      @settings[:two].should == "disk-replace"
+    end
+
+    it "should retain in-memory values if the file has a syntax error" do
+      # Init the value
+      text = "[main]\none = initial-value\n"
+      @settings.expects(:read_file).with(@file).returns(text)
+      @settings.send(:parse_config_files)
+      @settings[:one].should == "initial-value"
+
+      # Now replace the value with something bogus
+      text = "[main]\nkenny = killed-by-what-follows\n1 is 2, blah blah florp\n"
+      @settings.expects(:read_file).with(@file).returns(text)
+      @settings.send(:parse_config_files)
+
+      # The originally-overridden value should not be replaced with the default
+      @settings[:one].should == "initial-value"
+
+      # and we should not have the new value in memory
+      @settings[:kenny].should be_nil
+    end
+  end
+
+  it "should provide a method for creating a catalog of resources from its configuration" do
+    Puppet::Settings.new.should respond_to(:to_catalog)
+  end
+
+  describe "when creating a catalog" do
+    before do
+      @settings = Puppet::Settings.new
+      @settings.stubs(:service_user_available?).returns true
+      @prefix = Puppet.features.posix? ? "" : "C:"
+    end
+
+    it "should add all file resources to the catalog if no sections have been specified" do
+      @settings.define_settings :main,
+          :maindir => { :type => :directory, :default => @prefix+"/maindir", :desc => "a"},
+          :seconddir => { :type => :directory, :default => @prefix+"/seconddir", :desc => "a"}
+      @settings.define_settings :other,
+          :otherdir => { :type => :directory, :default => @prefix+"/otherdir", :desc => "a" }
+
+      catalog = @settings.to_catalog
+
+      [@prefix+"/maindir", @prefix+"/seconddir", @prefix+"/otherdir"].each do |path|
+        catalog.resource(:file, path).should be_instance_of(Puppet::Resource)
+      end
+    end
+
+    it "should add only files in the specified sections if section names are provided" do
+      @settings.define_settings :main, :maindir => { :type => :directory, :default => @prefix+"/maindir", :desc => "a" }
+      @settings.define_settings :other, :otherdir => { :type => :directory, :default => @prefix+"/otherdir", :desc => "a" }
+      catalog = @settings.to_catalog(:main)
+      catalog.resource(:file, @prefix+"/otherdir").should be_nil
+      catalog.resource(:file, @prefix+"/maindir").should be_instance_of(Puppet::Resource)
+    end
+
+    it "should not try to add the same file twice" do
+      @settings.define_settings :main, :maindir => { :type => :directory, :default => @prefix+"/maindir", :desc => "a" }
+      @settings.define_settings :other, :otherdir => { :type => :directory, :default => @prefix+"/maindir", :desc => "a" }
+      lambda { @settings.to_catalog }.should_not raise_error
+    end
+
+    it "should ignore files whose :to_resource method returns nil" do
+      @settings.define_settings :main, :maindir => { :type => :directory, :default => @prefix+"/maindir", :desc => "a" }
+      @settings.setting(:maindir).expects(:to_resource).returns nil
+
+      Puppet::Resource::Catalog.any_instance.expects(:add_resource).never
+      @settings.to_catalog
+    end
+
+    describe "on Microsoft Windows" do
+      before :each do
+        Puppet.features.stubs(:root?).returns true
+        Puppet.features.stubs(:microsoft_windows?).returns true
+
+        @settings.define_settings :foo,
+            :mkusers => { :type => :boolean, :default => true, :desc => "e" },
+            :user => { :default => "suser", :desc => "doc" },
+            :group => { :default => "sgroup", :desc => "doc" }
+        @settings.define_settings :other,
+            :otherdir => { :type => :directory, :default => "/otherdir", :desc => "a", :owner => "service", :group => "service"}
+
+        @catalog = @settings.to_catalog
+      end
+
+      it "it should not add users and groups to the catalog" do
+        @catalog.resource(:user, "suser").should be_nil
+        @catalog.resource(:group, "sgroup").should be_nil
+      end
+    end
+
+    describe "when adding users and groups to the catalog" do
+      before do
+        Puppet.features.stubs(:root?).returns true
+        Puppet.features.stubs(:microsoft_windows?).returns false
+
+        @settings.define_settings :foo,
+            :mkusers => { :type => :boolean, :default => true, :desc => "e" },
+            :user => { :default => "suser", :desc => "doc" },
+            :group => { :default => "sgroup", :desc => "doc" }
+        @settings.define_settings :other, :otherdir => {:type => :directory, :default => "/otherdir", :desc => "a", :owner => "service", :group => "service"}
+
+        @catalog = @settings.to_catalog
+      end
+
+      it "should add each specified user and group to the catalog if :mkusers is a valid setting, is enabled, and we're running as root" do
+        @catalog.resource(:user, "suser").should be_instance_of(Puppet::Resource)
+        @catalog.resource(:group, "sgroup").should be_instance_of(Puppet::Resource)
+      end
+
+      it "should only add users and groups to the catalog from specified sections" do
+        @settings.define_settings :yay, :yaydir => { :type => :directory, :default => "/yaydir", :desc => "a", :owner => "service", :group => "service"}
+        catalog = @settings.to_catalog(:other)
+        catalog.resource(:user, "jane").should be_nil
+        catalog.resource(:group, "billy").should be_nil
+      end
+
+      it "should not add users or groups to the catalog if :mkusers not running as root" do
+        Puppet.features.stubs(:root?).returns false
+
+        catalog = @settings.to_catalog
+        catalog.resource(:user, "suser").should be_nil
+        catalog.resource(:group, "sgroup").should be_nil
+      end
+
+      it "should not add users or groups to the catalog if :mkusers is not a valid setting" do
+        Puppet.features.stubs(:root?).returns true
+        settings = Puppet::Settings.new
+        settings.define_settings :other, :otherdir => {:type => :directory, :default => "/otherdir", :desc => "a", :owner => "service", :group => "service"}
+
+        catalog = settings.to_catalog
+        catalog.resource(:user, "suser").should be_nil
+        catalog.resource(:group, "sgroup").should be_nil
+      end
+
+      it "should not add users or groups to the catalog if :mkusers is a valid setting but is disabled" do
+        @settings[:mkusers] = false
+
+        catalog = @settings.to_catalog
+        catalog.resource(:user, "suser").should be_nil
+        catalog.resource(:group, "sgroup").should be_nil
+      end
+
+      it "should not try to add users or groups to the catalog twice" do
+        @settings.define_settings :yay, :yaydir => {:type => :directory, :default => "/yaydir", :desc => "a", :owner => "service", :group => "service"}
+
+        # This would fail if users/groups were added twice
+        lambda { @settings.to_catalog }.should_not raise_error
+      end
+
+      it "should set :ensure to :present on each created user and group" do
+        @catalog.resource(:user, "suser")[:ensure].should == :present
+        @catalog.resource(:group, "sgroup")[:ensure].should == :present
+      end
+
+      it "should set each created user's :gid to the service group" do
+        @settings.to_catalog.resource(:user, "suser")[:gid].should == "sgroup"
+      end
+
+      it "should not attempt to manage the root user" do
+        Puppet.features.stubs(:root?).returns true
+        @settings.define_settings :foo, :foodir => {:type => :directory, :default => "/foodir", :desc => "a", :owner => "root", :group => "service"}
+
+        @settings.to_catalog.resource(:user, "root").should be_nil
+      end
+    end
+  end
+
+  it "should be able to be converted to a manifest" do
+    Puppet::Settings.new.should respond_to(:to_manifest)
+  end
+
+  describe "when being converted to a manifest" do
+    it "should produce a string with the code for each resource joined by two carriage returns" do
+      @settings = Puppet::Settings.new
+      @settings.define_settings :main,
+          :maindir => { :type => :directory, :default => "/maindir", :desc => "a"},
+          :seconddir => { :type => :directory, :default => "/seconddir", :desc => "a"}
+
+      main = stub 'main_resource', :ref => "File[/maindir]"
+      main.expects(:to_manifest).returns "maindir"
+      second = stub 'second_resource', :ref => "File[/seconddir]"
+      second.expects(:to_manifest).returns "seconddir"
+      @settings.setting(:maindir).expects(:to_resource).returns main
+      @settings.setting(:seconddir).expects(:to_resource).returns second
+
+      @settings.to_manifest.split("\n\n").sort.should == %w{maindir seconddir}
+    end
+  end
+
+  describe "when using sections of the configuration to manage the local host" do
+    before do
+      @settings = Puppet::Settings.new
+      @settings.stubs(:service_user_available?).returns true
+      @settings.define_settings :main, :noop => { :default => false, :desc => "", :type => :boolean }
+      @settings.define_settings :main,
+          :maindir => { :type => :directory, :default => make_absolute("/maindir"), :desc => "a" },
+          :seconddir => { :type => :directory, :default => make_absolute("/seconddir"), :desc => "a"}
+      @settings.define_settings :main, :user => { :default => "suser", :desc => "doc" }, :group => { :default => "sgroup", :desc => "doc" }
+      @settings.define_settings :other, :otherdir => {:type => :directory, :default => make_absolute("/otherdir"), :desc => "a", :owner => "service", :group => "service", :mode => 0755}
+      @settings.define_settings :third, :thirddir => { :type => :directory, :default => make_absolute("/thirddir"), :desc => "b"}
+      @settings.define_settings :files, :myfile => {:type => :file, :default => make_absolute("/myfile"), :desc => "a", :mode => 0755}
+    end
+
+    it "should provide a method that writes files with the correct modes" do
+      @settings.should respond_to(:write)
+    end
+
+    it "should provide a method that creates directories with the correct modes" do
+      Puppet::Util::SUIDManager.expects(:asuser).with("suser", "sgroup").yields
+      Dir.expects(:mkdir).with(make_absolute("/otherdir"), 0755)
+      @settings.mkdir(:otherdir)
+    end
+
+    it "should create a catalog with the specified sections" do
+      @settings.expects(:to_catalog).with(:main, :other).returns Puppet::Resource::Catalog.new("foo")
+      @settings.use(:main, :other)
+    end
+
+    it "should canonicalize the sections" do
+      @settings.expects(:to_catalog).with(:main, :other).returns Puppet::Resource::Catalog.new("foo")
+      @settings.use("main", "other")
+    end
+
+    it "should ignore sections that have already been used" do
+      @settings.expects(:to_catalog).with(:main).returns Puppet::Resource::Catalog.new("foo")
+      @settings.use(:main)
+      @settings.expects(:to_catalog).with(:other).returns Puppet::Resource::Catalog.new("foo")
+      @settings.use(:main, :other)
+    end
+
+    it "should ignore tags and schedules when creating files and directories"
+
+    it "should be able to provide all of its parameters in a format compatible with GetOpt::Long" do
+      pending "Not converted from test/unit yet"
+    end
+
+    it "should convert the created catalog to a RAL catalog" do
+      @catalog = Puppet::Resource::Catalog.new("foo")
+      @settings.expects(:to_catalog).with(:main).returns @catalog
+
+      @catalog.expects(:to_ral).returns @catalog
+      @settings.use(:main)
+    end
+
+    it "should specify that it is not managing a host catalog" do
+      catalog = Puppet::Resource::Catalog.new("foo")
+      catalog.expects(:apply)
+      @settings.expects(:to_catalog).returns catalog
+
+      catalog.stubs(:to_ral).returns catalog
+
+      catalog.expects(:host_config=).with false
+
+      @settings.use(:main)
+    end
+
+    it "should support a method for re-using all currently used sections" do
+      @settings.expects(:to_catalog).with(:main, :third).times(2).returns Puppet::Resource::Catalog.new("foo")
+
+      @settings.use(:main, :third)
+      @settings.reuse
+    end
+
+    it "should fail with an appropriate message if any resources fail" do
+      @catalog = Puppet::Resource::Catalog.new("foo")
+      @catalog.stubs(:to_ral).returns @catalog
+      @settings.expects(:to_catalog).returns @catalog
+
+      @trans = mock("transaction")
+      @catalog.expects(:apply).yields(@trans)
+
+      @trans.expects(:any_failed?).returns(true)
+
+      report = mock 'report'
+      @trans.expects(:report).returns report
+
+      log = mock 'log', :to_s => "My failure", :level => :err
+      report.expects(:logs).returns [log]
+
+      @settings.expects(:raise).with { |msg| msg.include?("My failure") }
+      @settings.use(:whatever)
+    end
+  end
+
+  describe "when dealing with printing configs" do
+    before do
+      @settings = Puppet::Settings.new
+      #these are the magic default values
+      @settings.stubs(:value).with(:configprint).returns("")
+      @settings.stubs(:value).with(:genconfig).returns(false)
+      @settings.stubs(:value).with(:genmanifest).returns(false)
+      @settings.stubs(:value).with(:environment).returns(nil)
+    end
+
+    describe "when checking print_config?" do
+      it "should return false when the :configprint, :genconfig and :genmanifest are not set" do
+        @settings.print_configs?.should be_false
+      end
+
+      it "should return true when :configprint has a value" do
+        @settings.stubs(:value).with(:configprint).returns("something")
+        @settings.print_configs?.should be_true
+      end
+
+      it "should return true when :genconfig has a value" do
+        @settings.stubs(:value).with(:genconfig).returns(true)
+        @settings.print_configs?.should be_true
+      end
+
+      it "should return true when :genmanifest has a value" do
+        @settings.stubs(:value).with(:genmanifest).returns(true)
+        @settings.print_configs?.should be_true
+      end
+    end
+
+    describe "when printing configs" do
+      describe "when :configprint has a value" do
+        it "should call print_config_options" do
+          @settings.stubs(:value).with(:configprint).returns("something")
+          @settings.expects(:print_config_options)
+          @settings.print_configs
+        end
+
+        it "should get the value of the option using the environment" do
+          @settings.stubs(:value).with(:configprint).returns("something")
+          @settings.stubs(:include?).with("something").returns(true)
+          @settings.expects(:value).with(:environment).returns("env")
+          @settings.expects(:value).with("something", "env").returns("foo")
+          @settings.stubs(:puts).with("foo")
+          @settings.print_configs
+        end
+
+        it "should print the value of the option" do
+          @settings.stubs(:value).with(:configprint).returns("something")
+          @settings.stubs(:include?).with("something").returns(true)
+          @settings.stubs(:value).with("something", nil).returns("foo")
+          @settings.expects(:puts).with("foo")
+          @settings.print_configs
+        end
+
+        it "should print the value pairs if there are multiple options" do
+          @settings.stubs(:value).with(:configprint).returns("bar,baz")
+          @settings.stubs(:include?).with("bar").returns(true)
+          @settings.stubs(:include?).with("baz").returns(true)
+          @settings.stubs(:value).with("bar", nil).returns("foo")
+          @settings.stubs(:value).with("baz", nil).returns("fud")
+          @settings.expects(:puts).with("bar = foo")
+          @settings.expects(:puts).with("baz = fud")
+          @settings.print_configs
+        end
+
+        it "should print a whole bunch of stuff if :configprint = all"
+
+        it "should return true after printing" do
+          @settings.stubs(:value).with(:configprint).returns("something")
+          @settings.stubs(:include?).with("something").returns(true)
+          @settings.stubs(:value).with("something", nil).returns("foo")
+          @settings.stubs(:puts).with("foo")
+          @settings.print_configs.should be_true
+        end
+
+        it "should return false if a config param is not found" do
+          @settings.stubs :puts
+          @settings.stubs(:value).with(:configprint).returns("something")
+          @settings.stubs(:include?).with("something").returns(false)
+          @settings.print_configs.should be_false
+        end
+      end
+
+      describe "when genconfig is true" do
+        before do
+          @settings.stubs :puts
+        end
+
+        it "should call to_config" do
+          @settings.stubs(:value).with(:genconfig).returns(true)
+          @settings.expects(:to_config)
+          @settings.print_configs
+        end
+
+        it "should return true from print_configs" do
+          @settings.stubs(:value).with(:genconfig).returns(true)
+          @settings.stubs(:to_config)
+          @settings.print_configs.should be_true
+        end
+      end
+
+      describe "when genmanifest is true" do
+        before do
+          @settings.stubs :puts
+        end
+
+        it "should call to_config" do
+          @settings.stubs(:value).with(:genmanifest).returns(true)
+          @settings.expects(:to_manifest)
+          @settings.print_configs
+        end
+
+        it "should return true from print_configs" do
+          @settings.stubs(:value).with(:genmanifest).returns(true)
+          @settings.stubs(:to_manifest)
+          @settings.print_configs.should be_true
+        end
+      end
+    end
+  end
+
+  describe "when determining if the service user is available" do
+    it "should return false if there is no user setting" do
+      Puppet::Settings.new.should_not be_service_user_available
+    end
+
+    it "should return false if the user provider says the user is missing" do
+      settings = Puppet::Settings.new
+      settings.define_settings :main, :user => { :default => "foo", :desc => "doc" }
+
+      user = mock 'user'
+      user.expects(:exists?).returns false
+
+      Puppet::Type.type(:user).expects(:new).with { |args| args[:name] == "foo" }.returns user
+
+      settings.should_not be_service_user_available
+    end
+
+    it "should return true if the user provider says the user is present" do
+      settings = Puppet::Settings.new
+      settings.define_settings :main, :user => { :default => "foo", :desc => "doc" }
+
+      user = mock 'user'
+      user.expects(:exists?).returns true
+
+      Puppet::Type.type(:user).expects(:new).with { |args| args[:name] == "foo" }.returns user
+
+      settings.should be_service_user_available
+    end
+
+    it "should cache the result"
+  end
+
+  describe "#writesub" do
+    it "should only pass valid arguments to File.open" do
+      settings = Puppet::Settings.new
+      settings.stubs(:get_config_file_default).with(:privatekeydir).returns(OpenStruct.new(:mode => "750"))
+
+      File.expects(:open).with("/path/to/keydir", "w", 750).returns true
+      settings.writesub(:privatekeydir, "/path/to/keydir")
+    end
+  end
+
+
+  describe "when dealing with command-line options" do
+    let(:settings) { Puppet::Settings.new }
+
+    it "should get options from Puppet.settings.optparse_addargs" do
+      settings.expects(:optparse_addargs).returns([])
+
+      settings.send(:parse_global_options, [])
+    end
+
+    it "should add options to OptionParser" do
+      settings.stubs(:optparse_addargs).returns( [["--option","-o", "Funny Option", :NONE]])
+      settings.expects(:handlearg).with("--option", true)
+      settings.send(:parse_global_options, ["--option"])
+    end
+
+    it "should not die if it sees an unrecognized option, because the app/face may handle it later" do
+      expect { settings.send(:parse_global_options, ["--topuppet", "value"]) } .to_not raise_error
+    end
+
+    it "should not pass an unrecognized option to handleargs" do
+      settings.expects(:handlearg).with("--topuppet", "value").never
+      expect { settings.send(:parse_global_options, ["--topuppet", "value"]) } .to_not raise_error
+    end
+
+    it "should pass valid puppet settings options to handlearg even if they appear after an unrecognized option" do
+      settings.stubs(:optparse_addargs).returns( [["--option","-o", "Funny Option", :NONE]])
+      settings.expects(:handlearg).with("--option", true)
+      settings.send(:parse_global_options, ["--invalidoption", "--option"])
+    end
+
+    it "should transform boolean option to normal form" do
+      Puppet::Settings.clean_opt("--[no-]option", true).should == ["--option", true]
+    end
+
+    it "should transform boolean option to no- form" do
+      Puppet::Settings.clean_opt("--[no-]option", false).should == ["--no-option", false]
+    end
+  end
+
+  describe "default_certname" do
+    describe "using hostname and domainname" do
+      before :each do
+        Puppet::Settings.stubs(:hostname_fact).returns("testhostname")
+        Puppet::Settings.stubs(:domain_fact).returns("domain.test.")
+      end
+
+      it "should use both to generate fqdn" do
+        Puppet::Settings.default_certname.should =~ /testhostname\.domain\.test/
+      end
+      it "should remove trailing dots from fqdn" do
+        Puppet::Settings.default_certname.should == 'testhostname.domain.test'
+      end
+    end
+
+    describe "using just hostname" do
+      before :each do
+        Puppet::Settings.stubs(:hostname_fact).returns("testhostname")
+        Puppet::Settings.stubs(:domain_fact).returns("")
+      end
+
+      it "should use only hostname to generate fqdn" do
+        Puppet::Settings.default_certname.should == "testhostname"
+      end
+      it "should removing trailing dots from fqdn" do
+        Puppet::Settings.default_certname.should == "testhostname"
+      end
+    end
+  end
+end