Added support for pip installed virtualenv facter

Jarl Stefansson · Jarl Stefansson · commit 42e0f436f087 · 2013-11-04T16:32:46.000-05:00
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
@@ -1,7 +1,19 @@
+# Show the virtualenv version
+# works with virualenv loaded and without, pip installed and package installed
 require 'puppet'
 pkg = Puppet::Type.type(:package).new(:name => "virtualenv")
 Facter.add("virtualenv_version") do
+  has_weight 100
   setcode do
-    /^(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+    Facter::Util::Resolution.exec('virtualenv --version')
+  end
+end
+
+Facter.add("virtualenv_version") do
+  has_eight 50
+  setcode do
+    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+        /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+    end
   end
 end
