Merge branch 'stable'

puppetlabs · Nov 30, 2015 · 107f142 · 107f142
2 parents 70452b4 + 3ac31e2
commit 107f142
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2.2)
 
 set(LIBFACTER_VERSION_MAJOR 3)
 set(LIBFACTER_VERSION_MINOR 1)
-set(LIBFACTER_VERSION_PATCH 3)
+set(LIBFACTER_VERSION_PATCH 4)
 
 # Get the HEAD SHA1 commit message
 get_commit_string(LIBFACTER_COMMIT)

diff --git a/lib/Doxyfile b/lib/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = facter
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.1.2
+PROJECT_NUMBER         = 3.1.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/lib/src/ruby/ruby.cc b/lib/src/ruby/ruby.cc
@@ -15,10 +15,17 @@ static const char load_puppet[] =
 "require 'puppet'\n"
 "Puppet.initialize_settings\n"
 "unless $LOAD_PATH.include?(Puppet[:libdir])\n"
-"    $LOAD_PATH << Puppet[:libdir]\n"
+"  $LOAD_PATH << Puppet[:libdir]\n"
 "end\n"
 "Facter.reset\n"
-"Facter.search_external([Puppet[:pluginfactdest]])";
+"Facter.search_external([Puppet[:pluginfactdest]])\n"
+"if Puppet.respond_to? :initialize_facts\n"
+"  Puppet.initialize_facts\n"
+"else\n"
+"  Facter.add(:puppetversion) do\n"
+"    setcode { Puppet.version.to_s }\n"
+"  end\n"
+"end\n";
 
 namespace facter { namespace ruby {