Merge pull request poise#31 from opscode-cookbooks/COOK-2468

Joshua Timberman · Joshua Timberman · commit 4afbc5523b07 · 2013-02-28T06:46:30.000-08:00
COOK-2468 - Chef 11 compat fixes
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,16 @@
+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+.kitchen/
+.kitchen.local.yml
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -0,0 +1,33 @@
+---
+driver_plugin: vagrant
+platforms:
+- name: ubuntu-12.10
+  driver_config:
+    box: canonical-ubuntu-12.10
+    box_url: http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-amd64-vagrant-disk1.box
+    require_chef_omnibus: 11.4.0
+- name: ubuntu-12.04
+  driver_config:
+    box: canonical-ubuntu-12.04
+    box_url: http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box
+    require_chef_omnibus: 11.4.0
+- name: ubuntu-10.04
+  driver_config:
+    box: opscode-ubuntu-10.04
+    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box
+    require_chef_omnibus: 11.4.0
+- name: centos-5.8
+  driver_config:
+    box: opscode-centos-5.8
+    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box
+    require_chef_omnibus: 11.4.0
+- name: centos-6.3
+  driver_config:
+    box: opscode-centos-6.3
+    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box
+    require_chef_omnibus: 11.4.0
+suites:
+- name: default
+  run_list:
+  - recipe[python]
+  attributes: {}
diff --git a/Berksfile b/Berksfile
@@ -0,0 +1,8 @@
+site :opscode
+
+metadata
+
+group :integration do
+  cookbook "apt"
+  cookbook "yum"
+end
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'foodcritic'
+gem 'berkshelf'
+gem 'thor-foodcritic'
+gem 'vagrant', '~> 1.0.6'
+
+group :integration do
+  gem 'test-kitchen', :git => "git://github.com/opscode/test-kitchen.git", :branch => '1.0'
+  gem 'kitchen-vagrant', :git => "git://github.com/opscode/kitchen-vagrant.git"
+  gem 'kitchen-ec2', :git => "git://github.com/opscode/kitchen-ec2.git"
+end
diff --git a/Vagrantfile b/Vagrantfile
@@ -0,0 +1,6 @@
+require 'kitchen/vagrant'
+require 'berkshelf/vagrant'
+
+Vagrant::Config.run do |config|
+  Kitchen::Vagrant.define_vms(config)
+end
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -32,56 +32,56 @@ def whyrun_supported?
 
 action :install do
   # If we specified a version, and it's not the current version, move to the specified version
-  if @new_resource.version != nil && @new_resource.version != @current_resource.version
-    install_version = @new_resource.version
+  if new_resource.version != nil && new_resource.version != current_resource.version
+    install_version = new_resource.version
   # If it's not installed at all, install it
-  elsif @current_resource.version == nil
+  elsif current_resource.version == nil
     install_version = candidate_version
   end
 
   if install_version
-    description = "install package #{@new_resource} version #{install_version}"
+    description = "install package #{new_resource} version #{install_version}"
     converge_by(description) do
-      Chef::Log.info("Installing #{@new_resource} version #{install_version}")
+      Chef::Log.info("Installing #{new_resource} version #{install_version}")
       status = install_package(install_version)
       if status
-        @new_resource.updated_by_last_action(true)
+        new_resource.updated_by_last_action(true)
       end
     end
   end
 end
 
 action :upgrade do
-  if @current_resource.version != candidate_version
-    orig_version = @current_resource.version || "uninstalled"
-    description = "upgrade #{@current_resource} version from #{@current_resource.version} to #{candidate_version}"
+  if current_resource.version != candidate_version
+    orig_version = current_resource.version || "uninstalled"
+    description = "upgrade #{current_resource} version from #{current_resource.version} to #{candidate_version}"
     converge_by(description) do
-      Chef::Log.info("Upgrading #{@new_resource} version from #{orig_version} to #{candidate_version}")
+      Chef::Log.info("Upgrading #{new_resource} version from #{orig_version} to #{candidate_version}")
       status = upgrade_package(candidate_version)
       if status
-        @new_resource.updated_by_last_action(true)
+        new_resource.updated_by_last_action(true)
       end
     end
   end
 end
 
 action :remove do
   if removing_package?
-    description = "remove package #{@new_resource}"
+    description = "remove package #{new_resource}"
     converge_by(description) do
-      Chef::Log.info("Removing #{@new_resource}")
-      remove_package(@new_resource.version)
-      @new_resource.updated_by_last_action(true)
+      Chef::Log.info("Removing #{new_resource}")
+      remove_package(new_resource.version)
+      new_resource.updated_by_last_action(true)
     end
   end
 end
 
 def removing_package?
-  if @current_resource.version.nil?
+  if current_resource.version.nil?
     false # nothing to remove
-  elsif @new_resource.version.nil?
+  elsif new_resource.version.nil?
     true # remove any version of a package
-  elsif @new_resource.version == @current_resource.version
+  elsif new_resource.version == current_resource.version
     true # remove the version we have
   else
     false # we don't have the version we want to remove
@@ -93,8 +93,8 @@ def removing_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 = Chef::Resource::PythonPip.new(new_resource.name)
+  @current_resource.package_name(new_resource.package_name)
   @current_resource.version(nil)
 
   unless current_installed_version.nil?
@@ -108,16 +108,14 @@ def current_installed_version
   @current_installed_version ||= begin
     delimeter = /==/
 
-    version_check_cmd = "#{which_pip(@new_resource)} freeze | grep -i '^#{@new_resource.package_name}=='"
+    version_check_cmd = "#{which_pip(new_resource)} freeze | grep -i '^#{new_resource.package_name}=='"
     # incase you upgrade pip with pip!
-    if @new_resource.package_name.eql?('pip')
+    if new_resource.package_name.eql?('pip')
       delimeter = /\s/
       version_check_cmd = "pip --version"
     end
-    p = shell_out!(version_check_cmd)
-    p.stdout.split(delimeter)[1].strip
-  rescue Chef::Exceptions::ShellCommandFailed
-  rescue Mixlib::ShellOut::ShellCommandFailed
+    result = shell_out(version_check_cmd)
+    (result.exitstatus == 0) ? result.stdout.split(delimeter)[1].strip : nil
   end
 end
 
@@ -126,14 +124,14 @@ def candidate_version
     # `pip search` doesn't return versions yet
     # `pip list` may be coming soon:
     # https://bitbucket.org/ianb/pip/issue/197/option-to-show-what-version-would-be
-    @new_resource.version||'latest'
+    new_resource.version||'latest'
   end
 end
 
 def install_package(version)
   # if a version isn't specified (latest), is a source archive (ex. http://my.package.repo/SomePackage-1.0.4.zip),
   # or from a VCS (ex. git+https://git.repo/some_pkg.git) then do not append a version as this will break the source link
-  if version == 'latest' || @new_resource.name.downcase.start_with?('http:', 'https:') || ['git', 'hg', 'svn'].include?(@new_resource.name.downcase.split('+')[0])
+  if version == 'latest' || new_resource.name.downcase.start_with?('http:', 'https:') || ['git', 'hg', 'svn'].include?(new_resource.name.downcase.split('+')[0])
     version = ''
   else
     version = "==#{version}"
@@ -142,28 +140,28 @@ def install_package(version)
 end
 
 def upgrade_package(version)
-  @new_resource.options "#{@new_resource.options} --upgrade"
+  new_resource.options "#{new_resource.options} --upgrade"
   install_package(version)
 end
 
 def remove_package(version)
-  @new_resource.options "#{@new_resource.options} --yes"
+  new_resource.options "#{new_resource.options} --yes"
   pip_cmd('uninstall')
 end
 
 def pip_cmd(subcommand, version='')
-  options = { :timeout => @new_resource.timeout, :user => @new_resource.user, :group => @new_resource.group }
-  options[:environment] = { 'HOME' => ::File.expand_path("~#{@new_resource.user}") } if @new_resource.user
-  shell_out!("#{which_pip(@new_resource)} #{subcommand} #{@new_resource.options} #{@new_resource.name}#{version}", options)
+  options = { :timeout => new_resource.timeout, :user => new_resource.user, :group => new_resource.group }
+  options[:environment] = { 'HOME' => ::File.expand_path("~#{new_resource.user}") } if new_resource.user
+  shell_out!("#{which_pip(new_resource)} #{subcommand} #{new_resource.options} #{new_resource.name}#{version}", options)
 end
 
 # TODO remove when provider is moved into Chef core
 # this allows PythonPip to work with Chef::Resource::Package
 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 node['python']['install_method'].eql?("source")
+    ::File.join(node['python']['prefix_dir'], "/bin/pip")
   else
     'pip'
   end
diff --git a/providers/virtualenv.rb b/providers/virtualenv.rb
@@ -28,8 +28,8 @@ def whyrun_supported?
 
 action :create do
   unless exists?
-    Chef::Log.info("Creating virtualenv #{@new_resource} at #{@new_resource.path}")
-    execute "#{virtualenv_cmd} --python=#{@new_resource.interpreter} #{@new_resource.options} #{@new_resource.path}" do
+    Chef::Log.info("Creating virtualenv #{new_resource} at #{new_resource.path}")
+    execute "#{virtualenv_cmd} --python=#{new_resource.interpreter} #{new_resource.options} #{new_resource.path}" do
       user new_resource.owner if new_resource.owner
       group new_resource.group if new_resource.group
     end
@@ -39,36 +39,36 @@ def whyrun_supported?
 
 action :delete do
   if exists?
-    description = "delete virtualenv #{@new_resource} at #{@new_resource.path}"
+    description = "delete virtualenv #{new_resource} at #{new_resource.path}"
     converge_by(description) do
-       Chef::Log.info("Deleting virtualenv #{@new_resource} at #{@new_resource.path}")
-       FileUtils.rm_rf(@new_resource.path)
+       Chef::Log.info("Deleting virtualenv #{new_resource} at #{new_resource.path}")
+       FileUtils.rm_rf(new_resource.path)
     end
   end
 end
 
 def load_current_resource
-  @current_resource = Chef::Resource::PythonVirtualenv.new(@new_resource.name)
-  @current_resource.path(@new_resource.path)
+  @current_resource = Chef::Resource::PythonVirtualenv.new(new_resource.name)
+  @current_resource.path(new_resource.path)
 
   if exists?
-    cstats = ::File.stat(@current_resource.path)
+    cstats = ::File.stat(current_resource.path)
     @current_resource.owner(cstats.uid)
     @current_resource.group(cstats.gid)
   end
   @current_resource
 end
 
 def virtualenv_cmd()
-  if "#{node['python']['install_method']}".eql?("source")
-    ::File.join("#{node['python']['prefix_dir']}","/bin/virtualenv")
+  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) \
-    && ::File.exists?("#{@current_resource.path}/bin/activate")
+  ::File.exist?(current_resource.path) && ::File.directory?(current_resource.path) \
+    && ::File.exists?("#{current_resource.path}/bin/activate")
 end
diff --git a/recipes/package.rb b/recipes/package.rb
@@ -25,7 +25,7 @@
 if platform_family?('rhel') && major_version < 6
   include_recipe 'yum::epel'
   python_pkgs = ["python26", "python26-devel"]
-  node['python']['binary'] = "/usr/bin/python26"
+  node.set['python']['binary'] = "/usr/bin/python26"
 else
   python_pkgs = value_for_platform_family(
                   "debian" => ["python","python-dev"],
diff --git a/resources/virtualenv.rb b/resources/virtualenv.rb
@@ -19,6 +19,13 @@
 #
 
 actions :create, :delete
+default_action :create if defined?(default_action) # Chef > 10.8
+
+# Default action for Chef <= 10.8
+def initialize(*args)
+  super
+  @action = :create
+end
 
 attribute :path, :kind_of => String, :name_attribute => true
 attribute :interpreter, :default => 'python'
