Merge pull request poise#48 from ka2n/setuptools_0_8_x

Use setuptools instead of distribute

Author: coderanger

attributes/default.rb

@@ -38,5 +38,5 @@
 default['python']['checksum']='3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059'
 default['python']['configure_options']=%W{--prefix=#{python['prefix_dir']}}
 
-default['python']['distribute_script_url']='http://python-distribute.org/distribute_setup.py'
-default['python']['distribute_option']['download_base']='https://pypi.python.org/packages/source/d/distribute/'
+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'

recipes/pip.rb

@@ -33,21 +33,30 @@
 pip_binary="/usr/local/bin/pip"
 end
 
-# 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
-sourcenode['python']['distribute_script_url']
+remote_file"#{Chef::Config[:file_cache_path]}/ez_setup.py"do
+sourcenode['python']['setuptools_script_url']
+mode"0644"
+not_if"#{node['python']['binary']} -c 'import setuptools'"
+end
+
+remote_file"#{Chef::Config[:file_cache_path]}/get-pip.py"do
+sourcenode['python']['pip_script_url']
 mode"0644"
 not_if{ ::File.exists?(pip_binary)}
 end
 
+execute"install-setuptools"do
+cwdChef::Config[:file_cache_path]
+command<<-EOF
+#{node['python']['binary']} ez_setup.py
+ EOF
+not_if"#{node['python']['binary']} -c 'import setuptools'"
+end
+
 execute"install-pip"do
 cwdChef::Config[:file_cache_path]
 command<<-EOF
-#{node['python']['binary']} distribute_setup.py --download-base=#{node['python']['distribute_option']['download_base']}
-#{::File.dirname(pip_binary)}/easy_install pip
+#{node['python']['binary']} get-pip.py
  EOF
 not_if{ ::File.exists?(pip_binary)}
 end