fixed merge conflicts

Peter Bell · Peter Bell · commit 7858d43c21e3 · 2014-11-13T13:45:02.000-08:00
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -44,3 +44,5 @@
 default['python']['setuptools_version'] = nil # defaults to latest
 default['python']['virtualenv_version'] = nil
 default['python']['pip_version'] = nil
+default['python']['yolk_version'] = nil
+default['python']['yolk_location'] = "#{node['python']['prefix_dir']}/bin/yolk"
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -20,6 +20,7 @@
 
 require 'chef/mixin/shell_out'
 require 'chef/mixin/language'
+require 'version'
 include Chef::Mixin::ShellOut
 
 def whyrun_supported?
@@ -117,11 +118,28 @@ def current_installed_version
 end
 
 def candidate_version
+  yolk_path = which_yolk(new_resource)
   @candidate_version ||= begin
-    # `pip search` doesn't return versions yet
-    # `pip list` may be coming soon:
-    # https://bitbucket.org/ianb/pip/issue/197/option-to-show-what-version-would-be
-    new_resource.version||'latest'
+    # if yolk is installed, check if a newer version is available in PyPi
+    # then check if newer version is greater then the version specified by new_resource
+    # return as appropriate
+    if ::File.exists?(yolk_path) then
+      out = shell_out("#{yolk_path} -U #{new_resource.package_name}").stdout
+      if out.match(/not installed/) then
+        new_resource.version||'latest'
+      elsif out.match(/#{new_resource.package_name} [\d\.]+ \([\d\.]+\)/) then
+        available_version = Version.new(out.split(' ').last.tr('()',''))
+        if available_version > ( Version.new(new_resource.version) || Version.new('0.0') )
+          new_resource.version
+        else
+          available_version
+        end
+      else
+        current_installed_version
+      end
+    else
+      new_resource.version||'latest'
+    end
   end
 end
 
@@ -166,3 +184,13 @@ def which_pip(nr)
     'pip'
   end
 end
+
+def which_yolk(nr)
+  if (nr.respond_to?("virtualenv") && nr.virtualenv)
+    ::File.join(nr.virtualenv,'/bin/yolk')
+  elsif ::File.exists?(node['python']['yolk_location'])
+    node['python']['yolk_location']
+  else
+    'yolk'
+  end
+end
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -33,6 +33,10 @@
   pip_binary = "/usr/local/bin/pip"
 end
 
+chef_gem 'version' do
+  action :nothing
+end.run_action(:install)
+
 cookbook_file "#{Chef::Config[:file_cache_path]}/get-pip.py" do
   source 'get-pip.py'
   mode "0644"
@@ -52,6 +56,11 @@
   version node['python']['pip_version']
 end
 
+python_pip 'yolk' do
+  action :upgrade
+  version node['python']['yolk_version']
+end
+
 python_pip 'setuptools' do
   action :upgrade
   version node['python']['setuptools_version']
