summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2013-11-04 16:32:46 -0500
committerJarl Stefansson <jarl@sdelements.com>2013-11-04 16:32:46 -0500
commit42e0f436f08778374bc44aa6a0b81d6fd48d6f43 (patch)
tree773a238e404badd2c93187929df8a877c80be711 /lib
parentb044b0b9fa03adb6897a20fdc5adbb56f97856e4 (diff)
Added support for pip installed virtualenv facter
Diffstat (limited to 'lib')
-rw-r--r--lib/facter/virtualenv_version.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
index 2ede3f9..327b2ca 100644
--- 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