[COOK-3719] Allow alternative install python and update pip location

garrypolley · sethvargo · commit 5e02477ff9f0 · 2013-10-09T17:23:13.000-04:00
Signed-off-by: Seth Vargo &lt;sethvargo@gmail.com&gt;
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -31,12 +31,15 @@
   default['python']['prefix_dir']         = '/usr/local'
 end
 
-default['python']['binary'] = "#{python['prefix_dir']}/bin/python"
+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']['checksum'] = '3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059'
 default['python']['configure_options'] = %W{--prefix=#{python['prefix_dir']}}
+default['python']['make_options'] = %W{install}
 
 default['python']['setuptools_script_url'] = 'https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py'
 default['python']['pip_script_url'] = 'https://raw.github.com/pypa/pip/master/contrib/get-pip.py'
+default['python']['pip_location'] = "#{node['python']['prefix_dir']}/bin/pip"
+default['python']['virtualenv_location'] = "#{node['python']['prefix_dir']}/bin/virtualenv"
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -160,8 +160,8 @@ def pip_cmd(subcommand, version='')
 def which_pip(nr)
   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")
+  elsif ::File.exists?(node['python']['pip_location'])
+    node['python']['pip_location']
   else
     'pip'
   end
diff --git a/providers/virtualenv.rb b/providers/virtualenv.rb
@@ -61,8 +61,8 @@ def load_current_resource
 end
 
 def virtualenv_cmd()
-  if node['python']['install_method'].eql?("source")
-    ::File.join(node['python']['prefix_dir'], "/bin/virtualenv")
+  if ::File.exists?(node['python']['virtualenv_location'])
+    node['python']['virtualenv_location']
   else
     "virtualenv"
   end
diff --git a/recipes/source.rb b/recipes/source.rb
@@ -21,6 +21,7 @@
 include_recipe "build-essential"
 
 configure_options = node['python']['configure_options'].join(" ")
+make_options = node['python']['make_options'].join(" ")
 
 packages = value_for_platform_family(
              "rhel" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"],
@@ -46,7 +47,7 @@
   code <<-EOF
   tar -jxvf Python-#{version}.tar.bz2
   (cd Python-#{version} && ./configure #{configure_options})
-  (cd Python-#{version} && make && make install)
+  (cd Python-#{version} && make && make #{make_options})
   EOF
   environment({
       "LDFLAGS" => "-L#{node['python']['prefix_dir']} -L/usr/lib",
