puppet 0.24.7 → 0.24.8

data/lib/puppet/util/inifile.rb

@@ -163,6 +163,7 @@ module Puppet::Util::IniConfig
                 end
                 if dirty
                     Puppet::Util::FileType.filetype(:flat).new(file).write(text)
+                    return file
                 end
             end
         end

data/lib/puppet/util/nagios_maker.rb

@@ -42,6 +42,7 @@ module Puppet::Util::NagiosMaker
 
         target = "/etc/nagios/#{full_name.to_s}.cfg"
         provider = type.provide(:naginator, :parent => Puppet::Provider::Naginator, :default_target => target) {}
+        provider.nagios_type
 
         type.desc "The Nagios type #{name.to_s}.  This resource type is autogenerated using the
             model developed in Naginator_, and all of the Nagios types are generated using the
@@ -51,6 +52,9 @@ module Puppet::Util::NagiosMaker
             files.  By default, the statements will be added to ``#{target}``, but
             you can send them to a different file by setting their ``target`` attribute.
 
+            You can purge Nagios resources using the ``resources`` type, but *only*
+            in the default file locations.  This is an architectural limitation.
+
             .. _naginator: http://reductivelabs.com/trac/naginator
         "
     end

data/lib/puppet/util/package.rb

@@ -28,4 +28,6 @@ module Puppet::Util::Package
         end
         return version_a <=> version_b;
     end
+    
+    module_function :versioncmp
 end

data/lib/puppet/util/rails/reference_serializer.rb

@@ -0,0 +1,18 @@
+
+module Puppet::Util::ReferenceSerializer
+    def unserialize_value(val)
+        if val =~ /^--- [!:]/
+            YAML.load(val)
+        else
+            val
+        end
+    end
+
+    def serialize_value(val)
+        if val.is_a?(Puppet::Parser::Resource::Reference)
+            YAML.dump(val)
+        else
+            val
+        end
+    end
+end

data/lib/puppet/util/selinux.rb

@@ -153,7 +153,9 @@ module Puppet::Util::SELinux
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
         begin
-            mounts = File.read("/proc/mounts")
+            mountfh = File.open("/proc/mounts", NONBLOCK)
+            mounts = mountfh.read
+            mountfh.close
         rescue
             return nil
         end

data/spec/integration/checksum.rb

@@ -9,6 +9,7 @@ require 'puppet/checksum'
 
 describe Puppet::Checksum, " when using the file terminus" do
     before do
+        Puppet.settings.stubs(:use)
         Puppet::Checksum.terminus_class = :file
         @content = "this is some content"
         @sum = Puppet::Checksum.new(@content)

data/spec/integration/defaults.rb

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'puppet/defaults'
 
 describe "Puppet defaults" do
+        include Puppet::Util::Execution
     after { Puppet.settings.clear }
 
     describe "when setting the :factpath" do
@@ -44,4 +45,12 @@ describe "Puppet defaults" do
     it "should default to yaml as the catalog format" do
         Puppet.settings[:catalog_format].should == "yaml"
     end
+
+    it "should add /usr/sbin and /sbin to the path if they're not there" do
+        withenv("PATH" => "/usr/bin:/usr/local/bin") do
+            Puppet.settings[:path] = "none" # this causes it to ignore the setting
+            ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
+            ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
+        end
+    end
 end

data/spec/integration/reports.rb

@@ -8,6 +8,10 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'puppet/reports'
 
 describe Puppet::Reports, " when using report types" do
+    before do
+        Puppet.settings.stubs(:use)
+    end
+
     it "should load report types as modules" do
         Puppet::Reports.report(:store).should be_instance_of(Module)
     end

data/spec/integration/transaction/report.rb

@@ -7,7 +7,13 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Transaction::Report do
     describe "when using the indirector" do
-        after { Puppet::Transaction::Report.indirection.clear_cache }
+        before do
+            Puppet.settings.stubs(:use)
+        end
+
+        after do
+            Puppet::Transaction::Report.indirection.clear_cache
+        end
 
         it "should be able to delegate to the :processor terminus" do
             Puppet::Transaction::Report.indirection.stubs(:terminus_class).returns :processor

data/spec/integration/type/package.rb

@@ -9,7 +9,7 @@ describe Puppet::Type.type(:package), "when choosing a default package provider"
     end
 
     def provider_name(os)
-        {"Debian" => :apt, "Darwin" => :apple, "RedHat" => :up2date, "Fedora" => :yum, "FreeBSD" => :ports, "OpenBSD" => :openbsd, "Solaris" => :sun}[os]
+        {"Ubuntu" => :apt, "Debian" => :apt, "Darwin" => :apple, "RedHat" => :up2date, "Fedora" => :yum, "FreeBSD" => :ports, "OpenBSD" => :openbsd, "Solaris" => :sun}[os]
     end
 
     it "should have a default provider" do
@@ -17,6 +17,9 @@ describe Puppet::Type.type(:package), "when choosing a default package provider"
     end
 
     it "should choose the correct provider each platform" do
-        Puppet::Type.type(:package).defaultprovider.name.should == provider_name(Facter.value(:operatingsystem))
+        unless default_provider = provider_name(Facter.value(:operatingsystem))
+            pending("No default provider specified in this test for %s" % Facter.value(:operatingsystem))
+        end
+        Puppet::Type.type(:package).defaultprovider.name.should == default_provider
     end
 end

data/spec/unit/executables/client/certhandler.rb

@@ -91,6 +91,19 @@ describe cert_handler, "when handling certificates" do
         end
     end
 
+    describe "when waitforcert is disabled" do
+        before do
+            @handler = cert_handler.new(0, false)
+            @handler.stubs(:read_cert).returns false
+        end
+
+        it "should exit if the cert request does not return a certificate" do
+            @caclient.stubs(:request_cert).returns(false)
+            @handler.expects(:exit).with(1).raises(SystemExit)
+            lambda { @handler.retrieve_cert }.should raise_error(SystemExit)
+        end
+    end
+
     describe "when in one time mode" do
         before do
             #true puts us in onetime mode

data/spec/unit/file_collection.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'puppet/file_collection'
+
+describe Puppet::FileCollection do
+    before do
+        @collection = Puppet::FileCollection.new
+    end
+
+    it "should be able to convert a file name into an index" do
+        @collection.index("/my/file").should be_instance_of(Fixnum)
+    end
+
+    it "should be able to convert an index into a file name" do
+        index = @collection.index("/path/to/file")
+        @collection.path(index).should == "/path/to/file"
+    end
+
+    it "should always give the same file name for a given index" do
+        index = @collection.index("/path/to/file")
+        @collection.path(index).should == @collection.path(index)
+    end
+
+    it "should always give the same index for a given file name" do
+        @collection.index("/my/file").should == @collection.index("/my/file")
+    end
+
+    it "should always correctly relate a file name and its index even when multiple files are in the collection" do
+        indexes = %w{a b c d e f}.inject({}) do |hash, letter|
+            hash[letter] = @collection.index("/path/to/file/%s" % letter)
+            hash
+        end
+
+        indexes.each do |letter, index|
+            @collection.index("/path/to/file/%s" % letter).should == indexes[letter]
+            @collection.path(index).should == @collection.path(index)
+        end
+    end
+
+    it "should return nil as the file name when an unknown index is provided" do
+        @collection.path(50).should be_nil
+    end
+
+    it "should provide a global collection" do
+        Puppet::FileCollection.collection.should be_instance_of(Puppet::FileCollection)
+    end
+
+    it "should reuse the global collection" do
+        Puppet::FileCollection.collection.should equal(Puppet::FileCollection.collection)
+    end
+end

data/spec/unit/file_collection/lookup.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'puppet/file_collection/lookup'
+
+class LookupTester
+    include Puppet::FileCollection::Lookup
+end
+
+describe Puppet::FileCollection::Lookup do
+    before do
+        @tester = LookupTester.new
+
+        @file_collection = mock 'file_collection'
+        Puppet::FileCollection.stubs(:collection).returns @file_collection
+    end
+
+    it "should use the file collection to determine the index of the file name" do
+        @file_collection.expects(:index).with("/my/file").returns 50
+
+        @tester.file = "/my/file"
+        @tester.file_index.should == 50
+    end
+
+    it "should return nil as the file name if no index is set" do
+        @tester.file.should be_nil
+    end
+
+    it "should use the file collection to convert the index to a file name" do
+        @file_collection.expects(:path).with(25).returns "/path/to/file"
+
+        @tester.file_index = 25
+
+        @tester.file.should == "/path/to/file"
+    end
+
+    it "should support a line attribute" do
+        @tester.line = 50
+        @tester.line.should == 50
+    end
+
+    it "should default to the global file collection" do
+        Puppet::FileCollection.expects(:collection).returns "collection"
+        @tester.file_collection.should == "collection"
+    end
+end

data/spec/unit/indirector/facts/facter.rb

@@ -70,7 +70,32 @@ describe Puppet::Node::Facts::Facter do
         end
     end
 
-    describe Puppet::Node::Facts::Facter, " when loading facts from the factpath" do
-        it "should load every fact in each factpath directory"
+    describe Puppet::Node::Facts::Facter, "when loading facts from disk" do
+        it "should load each directory in the Fact path" do
+            Puppet.settings.stubs(:value).returns "foo"
+            Puppet.settings.expects(:value).with(:factpath).returns("one%stwo" % File::PATH_SEPARATOR)
+
+            Puppet::Node::Facts::Facter.expects(:loaddir).with("one", "fact")
+            Puppet::Node::Facts::Facter.expects(:loaddir).with("two", "fact")
+
+            Puppet::Node::Facts::Facter.loadfacts
+        end
+
+        it "should load all facts from the modules" do
+            Puppet.settings.stubs(:value).returns "foo"
+            Puppet::Node::Facts::Facter.stubs(:loaddir)
+
+            Puppet.settings.expects(:value).with(:modulepath).returns("one%stwo" % File::PATH_SEPARATOR)
+
+            Dir.expects(:glob).with("one/*/plugins/facter").returns %w{oneA oneB}
+            Dir.expects(:glob).with("two/*/plugins/facter").returns %w{twoA twoB}
+
+            Puppet::Node::Facts::Facter.expects(:loaddir).with("oneA", "fact")
+            Puppet::Node::Facts::Facter.expects(:loaddir).with("oneB", "fact")
+            Puppet::Node::Facts::Facter.expects(:loaddir).with("twoA", "fact")
+            Puppet::Node::Facts::Facter.expects(:loaddir).with("twoB", "fact")
+
+            Puppet::Node::Facts::Facter.loadfacts
+        end
     end
 end

data/spec/unit/indirector/node/ldap.rb

@@ -91,6 +91,26 @@ describe Puppet::Node::Ldap do
                 @searcher.entry2hash(@entry)[:parameters]["foo"].should == "one"
             end
 
+            it "should convert 'true' values to the boolean 'true'" do
+                @entry.stubs(:to_hash).returns({"one" => ["true"]})
+                @searcher.entry2hash(@entry)[:parameters]["one"].should == true
+            end
+
+            it "should convert 'false' values to the boolean 'false'" do
+                @entry.stubs(:to_hash).returns({"one" => ["false"]})
+                @searcher.entry2hash(@entry)[:parameters]["one"].should == false
+            end
+
+            it "should convert 'true' values to the boolean 'true' inside an array" do
+                @entry.stubs(:to_hash).returns({"one" => ["true", "other"]})
+                @searcher.entry2hash(@entry)[:parameters]["one"].should == [true, "other"]
+            end
+
+            it "should convert 'false' values to the boolean 'false' inside an array" do
+                @entry.stubs(:to_hash).returns({"one" => ["false", "other"]})
+                @searcher.entry2hash(@entry)[:parameters]["one"].should == [false, "other"]
+            end
+
             it "should add the parent's name if present" do
                 @entry.stubs(:vals).with("parentnode").returns(%w{foo})
                 @searcher.entry2hash(@entry)[:parent].should == "foo"