Merge pull request #1 from poise/master

bjarocki · bjarocki · commit d7dcca4ea771 · 2014-07-01T19:05:53.000+02:00
merge upstream repo
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -34,7 +34,7 @@
 default['python']['binary'] = "#{node['python']['prefix_dir']}/bin/python"
 
 default['python']['url'] = 'http://www.python.org/ftp/python'
-default['python']['version'] = '2.7.5'
+default['python']['version'] = '2.7.7'
 default['python']['checksum'] = '3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059'
 default['python']['configure_options'] = %W{--prefix=#{python['prefix_dir']}}
 default['python']['make_options'] = %W{install}
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
 
