From cdf3b05f35f78971203dfd9fadd2552ad5a41bd4 Mon Sep 17 00:00:00 2001
From: Matthaus Owens <matthaus@puppetlabs.com>
Date: Tue, 23 Oct 2012 14:13:11 -0700
Subject: Add PE facts to stdlib

As many PE modules have PE specific functionality, but are deployed to all
nodes, including FOSS nodes, it is valuable to be able to selectively enable
those PE specific functions. These facts allow modules to use the is_pe fact to
determine whether the module should be used or not. The facts include is_pe,
pe_version, pe_major_version, pe_minor_version, and pe_patch_version. For PE
2.6.0 those facts would have values true, 2.6.0, 2, 6, and 0, respectively.
---
 lib/facter/pe_version.rb | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 lib/facter/pe_version.rb

(limited to 'lib')

diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb
new file mode 100644
index 0000000..7c31e84
--- /dev/null
+++ b/lib/facter/pe_version.rb
@@ -0,0 +1,47 @@
+# Fact: is_pe, pe_version, pe_major_version, pe_minor_version, pe_patch_version
+#
+# Purpose: Return various facts about the PE state of the system
+#
+# Resolution: Uses a regex match against puppetversion to determine whether the
+#   machine has Puppet Enterprise installed, and what version (overall, major,
+#   minor, patch) is installed.
+#
+# Caveats:
+#
+Facter.add("pe_version") do
+  setcode do
+    pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
+    pe_ver[1] if pe_ver
+  end
+end
+
+Facter.add("is_pe") do
+  setcode do
+    if Facter.value(:pe_version).to_s.empty? then
+      false
+    else
+      true
+    end
+  end
+end
+
+Facter.add("pe_major_version") do
+  confine :is_pe => true
+  setcode do
+    Facter.value(:pe_version).split('.')[0]
+  end
+end
+
+Facter.add("pe_minor_version") do
+  confine :is_pe => true
+  setcode do
+    Facter.value(:pe_version).split('.')[1]
+  end
+end
+
+Facter.add("pe_patch_version") do
+  confine :is_pe => true
+  setcode do
+    Facter.value(:pe_version).split('.')[2]
+  end
+end
-- 
cgit v1.2.3


From e68677976b671eb8b7f81393dc6dac6c6d86410c Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 10:00:42 -0700
Subject: Prevent undefined method `split' for nil:NilClass with pe_foo_version
 facts

Without this patch the pe_major_version, pe_minor_version, and
pe_patch_version facts directly depend on the pe_version fact in a
manner that calls split directly on the return value.

This is a problem because Fact values are not always guaranteed to
return strings, or objects that respond to split.  This patch is a
defensive measure to ensure we're always calling the split method on a
string object.

If the Fact returns nil, this will be converted to an empty string
responding to split.
---
 lib/facter/pe_version.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb
index 7c31e84..0cc0f64 100644
--- a/lib/facter/pe_version.rb
+++ b/lib/facter/pe_version.rb
@@ -28,20 +28,26 @@ end
 Facter.add("pe_major_version") do
   confine :is_pe => true
   setcode do
-    Facter.value(:pe_version).split('.')[0]
+    if pe_version = Facter.value(:pe_version)
+      pe_version.to_s.split('.')[0]
+    end
   end
 end
 
 Facter.add("pe_minor_version") do
   confine :is_pe => true
   setcode do
-    Facter.value(:pe_version).split('.')[1]
+    if pe_version = Facter.value(:pe_version)
+      pe_version.to_s.split('.')[1]
+    end
   end
 end
 
 Facter.add("pe_patch_version") do
   confine :is_pe => true
   setcode do
-    Facter.value(:pe_version).split('.')[2]
+    if pe_version = Facter.value(:pe_version)
+      pe_version.to_s.split('.')[2]
+    end
   end
 end
-- 
cgit v1.2.3