COOK-1048: pip and virtualenv honor python installed from source, with custom prefix_dir

captnswing · jtimberman · commit a5cce1a3e145 · 2012-03-16T23:04:01.000-06:00
Signed-off-by: jtimberman &lt;joshua@opscode.com&gt;
diff --git a/README.md b/README.md
@@ -23,7 +23,6 @@ Attributes
 See `attributes/default.rb` for default values.
 
 * `node["python"]["install_method"]` - method to install python with, default `package`.
-* `node["python"]["distribute_install_py_version"]` - version of python to use when installing distribute. default '', specify version like '2.6' (uses python2.6 binary).
 
 The file also contains the following attributes:
 
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -18,13 +18,9 @@
 # limitations under the License.
 #
 
-default['python']['distribute_install_py_version'] = ''
-
 default['python']['install_method'] = 'package'
-
+default['python']['prefix_dir'] = '/usr/local'
 default['python']['url'] = 'http://www.python.org/ftp/python'
 default['python']['version'] = '2.7.1'
 default['python']['checksum'] = '80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292'
-default['python']['prefix_dir'] = '/usr/local'
-
 default['python']['configure_options'] = %W{--prefix=#{python['prefix_dir']}}
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -22,7 +22,7 @@
 require 'chef/mixin/language'
 include Chef::Mixin::ShellOut
 
-# the logic in all action methods mirror that of 
+# the logic in all action methods mirror that of
 # the Chef::Provider::Package which will make
 # refactoring into core chef easy
 
@@ -40,7 +40,7 @@
   if @new_resource.timeout
     timeout = @new_resource.timeout
   end
-  
+
   if install_version
     Chef::Log.info("Installing #{@new_resource} version #{install_version}")
     status = install_package(@new_resource.package_name, install_version, timeout)
@@ -98,26 +98,26 @@ def expand_options(options)
   options ? " #{options}" : ""
 end
 
-# these methods are the required overrides of 
-# a provider that extends from Chef::Provider::Package 
+# these methods are the required overrides of
+# a provider that extends from Chef::Provider::Package
 # so refactoring into core Chef should be easy
 
 def load_current_resource
   @current_resource = Chef::Resource::PythonPip.new(@new_resource.name)
   @current_resource.package_name(@new_resource.package_name)
   @current_resource.version(nil)
-  
+
   unless current_installed_version.nil?
     @current_resource.version(current_installed_version)
   end
-  
+
   @current_resource
 end
 
 def current_installed_version
   @current_installed_version ||= begin
     delimeter = /==/
-    
+
     version_check_cmd = "#{pip_cmd(@new_resource)} freeze | grep -i '^#{@new_resource.package_name}=='"
     # incase you upgrade pip with pip!
     if @new_resource.package_name.eql?('pip')
@@ -133,7 +133,7 @@ def current_installed_version
 def candidate_version
   @candidate_version ||= begin
     # `pip search` doesn't return versions yet
-    # `pip list` may be coming soon: 
+    # `pip list` may be coming soon:
     # https://bitbucket.org/ianb/pip/issue/197/option-to-show-what-version-would-be
     @new_resource.version||'latest'
   end
@@ -156,5 +156,11 @@ def remove_package(name, version, timeout)
 # TODO remove when provider is moved into Chef core
 # this allows PythonPip to work with Chef::Resource::Package
 def pip_cmd(nr)
-  (nr.respond_to?("virtualenv") && nr.virtualenv) ? ::File.join(nr.virtualenv,'/bin/pip') : 'pip'
+  if (nr.respond_to?("virtualenv") && nr.virtualenv)
+    ::File.join(nr.virtualenv,'/bin/pip')
+  elsif "#{node['python']['install_method']}".eql?("source")
+    ::File.join("#{node['python']['prefix_dir']}","/bin/pip")
+  else
+    'pip'
+  end
 end
diff --git a/providers/virtualenv.rb b/providers/virtualenv.rb
@@ -25,15 +25,15 @@
 action :create do
   unless exists?
     Chef::Log.info("Creating virtualenv #{@new_resource} at #{@new_resource.path}")
-    execute "virtualenv --python=#{@new_resource.interpreter} #{@new_resource.path}" do
+    execute "#{virtualenv_cmd} --python=#{@new_resource.interpreter} #{@new_resource.path}" do
       user new_resource.owner if new_resource.owner
       group new_resource.group if new_resource.group
     end
     new_resource.updated_by_last_action(true)
   end
 end
 
-action :delete do 
+action :delete do
   if exists?
     Chef::Log.info("Deleting virtualenv #{@new_resource} at #{@new_resource.path}")
     FileUtils.rm_rf(@new_resource.path)
@@ -44,7 +44,7 @@
 def load_current_resource
   @current_resource = Chef::Resource::PythonVirtualenv.new(@new_resource.name)
   @current_resource.path(@new_resource.path)
-  
+
   if exists?
     cstats = ::File.stat(@current_resource.path)
     @current_resource.owner(cstats.uid)
@@ -53,6 +53,14 @@ def load_current_resource
   @current_resource
 end
 
+def virtualenv_cmd()
+  if "#{node['python']['install_method']}".eql?("source")
+    ::File.join("#{node['python']['prefix_dir']}","/bin/virtualenv")
+  else
+    "virtualenv"
+  end
+end
+
 private
 def exists?
   ::File.exist?(@current_resource.path) && ::File.directory?(@current_resource.path) \
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -18,23 +18,23 @@
 # limitations under the License.
 #
 
-# Ubuntu's python-setuptools, python-pip and python-virtualenv packages 
+python_bindir = "#{node['python']['prefix_dir']}/bin/"
+
+# Ubuntu's python-setuptools, python-pip and python-virtualenv packages
 # are broken...this feels like Rubygems!
 # http://stackoverflow.com/questions/4324558/whats-the-proper-way-to-install-pip-virtualenv-and-distribute-for-python
 # https://bitbucket.org/ianb/pip/issue/104/pip-uninstall-on-ubuntu-linux
 remote_file "#{Chef::Config[:file_cache_path]}/distribute_setup.py" do
   source "http://python-distribute.org/distribute_setup.py"
   mode "0644"
-  not_if "which pip"
+  not_if { ::File.exists?(python_bindir+'pip') }
 end
 
-use_version = node['python']['distribute_install_py_version']
-
 bash "install-pip" do
   cwd Chef::Config[:file_cache_path]
   code <<-EOF
-  python#{use_version} distribute_setup.py
-  easy_install pip
+  #{python_bindir}python distribute_setup.py
+  #{python_bindir}easy_install pip
   EOF
-  not_if "which pip"
+  not_if { ::File.exists?(python_bindir+'pip') }
 end
