Merge pull request poise#94 from idio-cookbooks/version-detection

coderanger · coderanger · commit 56424ab64b06 · 2014-06-30T15:59:26.000-07:00
Fix version detection (setuptools and distribute)
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -106,17 +106,13 @@ def load_current_resource
 
 def current_installed_version
   @current_installed_version ||= begin
-    delimeter = /==/
-
-    normalized_package_name = new_resource.package_name.gsub('_', '-')
-    version_check_cmd = "#{which_pip(new_resource)} freeze | grep -i '^#{normalized_package_name}=='"
-    # incase you upgrade pip with pip!
-    if new_resource.package_name.eql?('pip')
-      delimeter = /\s/
-      version_check_cmd = "#{which_pip(@new_resource)} --version"
+    out = nil
+    package_name = new_resource.package_name.gsub('_', '-')
+    pattern = Regexp.new("^#{Regexp.escape(package_name)} \\(([^)]+)\\)$", true)
+    shell_out("#{which_pip(new_resource)} list").stdout.lines.find do |line|
+      out = pattern.match(line)
     end
-    result = shell_out(version_check_cmd)
-    (result.exitstatus == 0) ? result.stdout.split(delimeter)[1].strip : nil
+    out.nil? ? nil : out[1]
   end
 end
 
