Merge pull request poise#22 from opscode-cookbooks/COOK-1727

Joshua Timberman · Joshua Timberman · commit ead613fa2389 · 2012-10-31T16:26:11.000-07:00
Cook 1727
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -26,17 +26,9 @@
   default['python']['prefix_dir']         = '/usr/local'
 end
 
-case platform
-when "redhat","centos","scientific","fedora","suse","amazon"
-  set['python']['pip']['prefix_dir']  = '/usr'
-when "debian","ubuntu"
-  set['python']['pip']['prefix_dir']  = '/usr/local'
-else
-  set['python']['pip']['prefix_dir']  = '/usr/local'
-end
+default['python']['binary'] = "#{python['prefix_dir']}/bin/python"
 
 default['python']['url'] = 'http://www.python.org/ftp/python'
 default['python']['version'] = '2.7.1'
 default['python']['checksum'] = '80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292'
 default['python']['configure_options'] = %W{--prefix=#{python['prefix_dir']}}
-
diff --git a/recipes/package.rb b/recipes/package.rb
@@ -18,38 +18,22 @@
 # limitations under the License.
 #
 
-# COOK-1016 Handle RHEL/CentOS namings of python packages, by installing EPEL repo & package
-# This implementation was determined a stopgap measure until CHEF-2410 is implemented and widespread.
-if node['platform'] == 'centos' || node['platform'] == 'redhat'
-  major_version = node['platform_version'].split('.').first.to_i
-  if major_version == 5
-    include_recipe 'yum::epel'
-  else
-    # Do nothing.
-  end
-end
+major_version = node['platform_version'].split('.').first.to_i
 
-python_pkgs = if node['platform'] == 'centos' || node['platform'] == 'redhat'
-                major_version = node['platform_version'].split('.').first.to_i
-                if major_version == 6
-                  ["python", "python-devel"]
-                else
-                  ["python26", "python26-devel"]
-                end
-              else
-                value_for_platform(
-                                   ["debian","ubuntu"] => {
-                                     "default" => ["python","python-dev"]
-                                   },
-                                   ["fedora","amazon"] => {
-                                     "default" => ["python","python-devel"]
-                                   },
-                                   ["freebsd"] => {
-                                     "default" => ["python"]
-                                   },
-                                   "default" => ["python","python-dev"]
-                                   )
-              end
+# COOK-1016 Handle RHEL/CentOS namings of python packages, by installing EPEL
+# repo & package
+if platform_family?('rhel') && major_version < 6
+  include_recipe 'yum::epel'
+  python_pkgs = ["python26", "python26-devel"]
+  node['python']['binary'] = "/usr/bin/python26"
+else
+  python_pkgs = value_for_platform_family(
+                  "debian" => ["python","python-dev"],
+                  "rhel" => ["python","python-devel"],
+                  "freebsd" => ["python"],
+                  "default" => ["python","python-dev"]
+                )
+end
 
 python_pkgs.each do |pkg|
   package pkg do
diff --git a/recipes/pip.rb b/recipes/pip.rb
@@ -18,8 +18,11 @@
 # limitations under the License.
 #
 
-python_bindir = "#{node['python']['prefix_dir']}/bin"
-pip_bindir    = "#{node['python']['pip']['prefix_dir']}/bin"
+if platform_family?("rhel")
+  pip_binary = "/usr/bin/pip"
+else
+  pip_binary = "/usr/local/bin/pip"
+end
 
 # Ubuntu's python-setuptools, python-pip and python-virtualenv packages
 # are broken...this feels like Rubygems!
@@ -28,14 +31,14 @@
 remote_file "#{Chef::Config[:file_cache_path]}/distribute_setup.py" do
   source "http://python-distribute.org/distribute_setup.py"
   mode "0644"
-  not_if { ::File.exists?("#{pip_bindir}/pip") }
+  not_if { ::File.exists?(pip_binary) }
 end
 
-bash "install-pip" do
+execute "install-pip" do
   cwd Chef::Config[:file_cache_path]
-  code <<-EOF
-  #{python_bindir}/python distribute_setup.py
-  #{pip_bindir}/easy_install pip
+  command <<-EOF
+  #{node['python']['binary']} distribute_setup.py
+  #{::File.dirname(pip_binary)}/easy_install pip
   EOF
-  not_if { ::File.exists?("#{pip_bindir}/pip") }
+  not_if { ::File.exists?(pip_binary) }
 end
diff --git a/recipes/source.rb b/recipes/source.rb
@@ -20,12 +20,10 @@
 
 configure_options = node['python']['configure_options'].join(" ")
 
-packages = value_for_platform(
-    ["centos","redhat","fedora"] => 
-        {"default" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"]},
-    "default" => 
-        ["libssl-dev","libbz2-dev","zlib1g-dev","libexpat1-dev","libdb4.8-dev","libsqlite3-dev","libncursesw5-dev","libncurses5-dev","libreadline-dev"]
-  )
+packages = value_for_platform_family(
+             "rhel" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"],
+             "default" => ["libssl-dev","libbz2-dev","zlib1g-dev","libexpat1-dev","libdb4.8-dev","libsqlite3-dev","libncursesw5-dev","libncurses5-dev","libreadline-dev"]
+           )
 
 packages.each do |dev_pkg|
   package dev_pkg
