(#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d

README_DEVELOPER.markdown

@@ -0,0 +1,35 @@
+Puppet Specific Facts
+=====================
+
+Facter is meant to stand alone and apart from Puppet.  However, Facter often
+runs inside Puppet and all custom facts included in the stdlib module will
+almost always be evaluated in the context of Puppet and Facter working
+together.
+
+Still, we don't want to write custom facts that blow up in the users face if
+Puppet is not loaded in memory.  This is often the case if the user run
+`facter` without also supplying the `--puppet` flag.
+
+Ah! But Jeff, the custom fact won't be in the `$LOAD_PATH` unless the user
+supplies `--facter`! You might say...
+
+Not (always) true I say!  If the user happens to have a CWD of
+`<modulepath>/stdlib/lib` then the facts will automatically be evaluated and
+blow up.
+
+In any event, it's pretty easy to write a fact that has no value if Puppet is
+not loaded.  Simply do it like this:
+
+    Facter.add(:node_vardir) do
+      setcode do
+        # This will be nil if Puppet is not available.
+        Facter::Util::PuppetSettings.with_puppet do
+          Puppet[:vardir]
+        end
+      end
+    end
+
+The `Facter::Util::PuppetSettings.with_puppet` method accepts a block and
+yields to it only if the Puppet library is loaded.  If the Puppet library is
+not loaded, then the method silently returns `nil` which Facter interprets as
+an undefined fact value.  The net effect is that the fact won't be set.

lib/facter/facter_dot_d.rb

@@ -11,6 +11,9 @@
 # The cache is stored in /tmp/facts_cache.yaml as a mode
 # 600 file and will have the end result of not calling your
 # fact scripts more often than is needed
+
+require 'facter/util/puppet_settings'
+
 class Facter::Util::DotD
     require 'yaml'
 
@@ -182,3 +185,8 @@ def create
 
 Facter::Util::DotD.new("/etc/facter/facts.d").create
 Facter::Util::DotD.new("/etc/puppetlabs/facter/facts.d").create
+
+# The Windows installer creates TXT facts in <confdir>/facts.d/
+Facter::Util::PuppetSettings.with_puppet do
+  Facter::Util::DotD.new(File.join(Puppet[:confdir], "facts.d")).create
+end

lib/facter/puppet_vardir.rb

@@ -0,0 +1,16 @@
+# This facter fact returns the value of the Puppet vardir setting for the node
+# running puppet or puppet agent.  The intent is to enable Puppet modules to
+# automatically have insight into a place where they can place variable data,
+# regardless of the node's platform.
+#
+# The value should be directly usable in a File resource path attribute.
+require 'facter/util/puppet_settings'
+
+Facter.add(:puppet_vardir) do
+  setcode do
+    # This will be nil if Puppet is not available.
+    Facter::Util::PuppetSettings.with_puppet do
+      Puppet[:vardir]
+    end
+  end
+end

lib/facter/util/puppet_settings.rb

@@ -0,0 +1,17 @@
+module Facter
+  module Util
+    module PuppetSettings
+      class << self
+        def with_puppet
+          begin
+            Module.const_get("Puppet")
+          rescue NameError
+            nil
+          else
+            yield
+          end
+        end
+      end
+    end
+  end
+end

spec/unit/facter/util/puppet_settings_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'facter/util/puppet_settings'
+
+describe Facter::Util::PuppetSettings do
+
+  describe "#with_puppet" do
+    context "Without Puppet loaded" do
+      before(:each) do
+        Module.expects(:const_get).with("Puppet").raises(NameError)
+      end
+
+      it 'should be nil' do
+        subject.with_puppet { Puppet[:vardir] }.should be_nil
+      end
+      it 'should not yield to the block' do
+        Puppet.expects(:[]).never
+        subject.with_puppet { Puppet[:vardir] }.should be_nil
+      end
+    end
+    context "With Puppet loaded" do
+      module Puppet; end
+      let(:vardir) { "/var/lib/puppet" }
+
+      before :each do
+        Puppet.expects(:[]).with(:vardir).returns vardir
+      end
+      it 'should yield to the block' do
+        subject.with_puppet { Puppet[:vardir] }
+      end
+      it 'should return the nodes vardir' do
+        subject.with_puppet { Puppet[:vardir] }.should eq vardir
+      end
+    end
+  end
+end