merged check_upgrade branch

Peter Bell · Peter Bell · commit 00e5bd9fc01d · 2014-11-17T16:05:42.000-08:00
diff --git a/Berksfile b/Berksfile
@@ -2,6 +2,8 @@ site :opscode
 
 metadata
 
+cookbook "chef-sugar"
+
 group :integration do
   cookbook "minitest-handler"
   cookbook "apt"
diff --git a/metadata.rb b/metadata.rb
@@ -7,6 +7,7 @@
 
 depends           "build-essential"
 depends           "yum-epel"
+depends           "chef-sugar"
 
 recipe "python", "Installs python, pip, and virtualenv"
 recipe "python::package", "Installs python using packages."
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -20,7 +20,7 @@
 
 require 'chef/mixin/shell_out'
 require 'chef/mixin/language'
-require 'versionub'
+require 'chef/sugar/core_extensions'
 include Chef::Mixin::ShellOut
 
 def whyrun_supported?
@@ -128,10 +128,17 @@ def candidate_version
       if out.match(/not installed/) then
         new_resource.version||'latest'
       elsif out.match(/#{new_resource.package_name} [\d\.]+ \([\d\.]+\)/) then
+<<<<<<< HEAD
         available_version = Versionub.parse(out.split(' ').last.tr('()',''))
         if ! new_resource.version
           available_version.to_s
         elsif available_version > Versionub.parse(new_resource.version)
+=======
+        available_version = out.split(' ').last.tr('()','')
+        if ! new_resource.version
+          available_version
+        elsif available_version.satisfies?(">= #{new_resource.version}")
+>>>>>>> check_upgrade
           new_resource.version
         else
           available_version.to_s
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -33,10 +33,6 @@
   pip_binary = "/usr/local/bin/pip"
 end
 
-chef_gem 'versionub' do
-  action :nothing
-end.run_action(:install)
-
 cookbook_file "#{Chef::Config[:file_cache_path]}/get-pip.py" do
   source 'get-pip.py'
   mode "0644"
