chef 11.6.2 → 11.8.0.rc.1

data/lib/chef/provider/package/aix.rb

@@ -0,0 +1,146 @@
+#
+# Author:: Deepali Jagtap
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+require 'chef/provider/package'
+require 'chef/mixin/command'
+require 'chef/resource/package'
+require 'chef/mixin/get_source_from_package'
+
+class Chef
+  class Provider
+    class Package
+      class Aix < Chef::Provider::Package
+
+        include Chef::Mixin::GetSourceFromPackage
+
+        def define_resource_requirements
+          super
+          requirements.assert(:install) do |a|
+            a.assertion { @new_resource.source }
+            a.failure_message Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
+          end
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !@new_resource.source || @package_source_found }
+            a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
+            a.whyrun "would assume #{@new_resource.source} would be have previously been made available"
+          end
+        end
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+          @current_resource.package_name(@new_resource.package_name)
+          @new_resource.version(nil)
+
+          if @new_resource.source
+            @package_source_found = ::File.exists?(@new_resource.source)
+            if @package_source_found
+              Chef::Log.debug("#{@new_resource} checking pkg status")
+              status = popen4("installp -L -d #{@new_resource.source}") do |pid, stdin, stdout, stderr|
+                package_found = false
+                stdout.each do |line|
+                  case line
+                  when /#{@new_resource.package_name}:/
+                    package_found = true
+                    fields = line.split(":")
+                    @new_resource.version(fields[2])
+                  end
+                end
+              end
+            end
+          end
+
+          Chef::Log.debug("#{@new_resource} checking install state")
+          status = popen4("lslpp -lcq #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
+            stdout.each do |line|
+              case line
+              when /#{@current_resource.package_name}/
+                fields = line.split(":")
+                Chef::Log.debug("#{@new_resource} version #{fields[2]} is already installed")
+                @current_resource.version(fields[2])
+              end
+            end
+          end
+
+          unless status.exitstatus == 0 || status.exitstatus == 1
+            raise Chef::Exceptions::Package, "lslpp failed - #{status.inspect}!"
+          end
+
+          @current_resource
+        end
+
+        def candidate_version
+          return @candidate_version if @candidate_version
+          status = popen4("installp -L -d #{@new_resource.source}") do |pid, stdin, stdout, stderr|
+            stdout.each_line do |line|
+              case line
+              when /\w:{Regexp.escape(@new_resource.package_name)}:(.*)/
+                fields = line.split(":")
+                @candidate_version = fields[2]
+                @new_resource.version(fields[2])
+                Chef::Log.debug("#{@new_resource} setting install candidate version to #{@candidate_version}")
+              end
+            end
+          end
+          unless status.exitstatus == 0
+            raise Chef::Exceptions::Package, "installp -L -d #{@new_resource.source} - #{status.inspect}!"
+          end
+          @candidate_version
+        end
+
+        #
+        # The install/update action needs to be tested with various kinds of packages
+        # on AIX viz. packages with or without licensing file dependencies, packages
+        # with dependencies on other packages which will help to test additional
+        # options of installp.
+        # So far, the code has been tested only with standalone packages.
+        #
+        def install_package(name, version)
+          Chef::Log.debug("#{@new_resource} package install options: #{@new_resource.options}")
+          if @new_resource.options.nil?
+            run_command_with_systems_locale(
+                    :command => "installp -aYF -d #{@new_resource.source} #{@new_resource.package_name}"
+                  )
+            Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
+          else
+            run_command_with_systems_locale(
+              :command => "installp -aYF #{expand_options(@new_resource.options)} -d #{@new_resource.source} #{@new_resource.package_name}"
+            )
+            Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
+          end
+        end
+
+        alias_method :upgrade_package, :install_package
+
+        def remove_package(name, version)
+          if @new_resource.options.nil?
+            run_command_with_systems_locale(
+                    :command => "installp -u #{name}"
+                  )
+            Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
+          else
+            run_command_with_systems_locale(
+              :command => "installp -u #{expand_options(@new_resource.options)} #{name}"
+            )
+            Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/provider/package/apt.rb

@@ -65,7 +65,8 @@ class Chef
                 @is_virtual_package = true
                 showpkg = shell_out!("apt-cache showpkg #{package}").stdout
                 providers = Hash.new
-                showpkg.rpartition(/Reverse Provides:? #{$/}/)[2].each_line do |line|
+                # Returns all lines after 'Reverse Provides:'
+                showpkg.rpartition(/Reverse Provides:\s*#{$/}/)[2].each_line do |line|
                   provider, version = line.split
                   providers[provider] = version
                 end
@@ -90,12 +91,7 @@ class Chef
         def install_package(name, version)
           package_name = "#{name}=#{version}"
           package_name = name if @is_virtual_package
-          run_command_with_systems_locale(
-            :command => "apt-get -q -y#{expand_options(default_release_options)}#{expand_options(@new_resource.options)} install #{package_name}",
-            :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive"
-            }
-          )
+          run_noninteractive("apt-get -q -y#{expand_options(default_release_options)}#{expand_options(@new_resource.options)} install #{package_name}")
         end
 
         def upgrade_package(name, version)
@@ -104,41 +100,30 @@ class Chef
 
         def remove_package(name, version)
           package_name = "#{name}"
-          run_command_with_systems_locale(
-            :command => "apt-get -q -y#{expand_options(@new_resource.options)} remove #{package_name}",
-            :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive"
-            }
-          )
+          run_noninteractive("apt-get -q -y#{expand_options(@new_resource.options)} remove #{package_name}")
         end
 
         def purge_package(name, version)
-          run_command_with_systems_locale(
-            :command => "apt-get -q -y#{expand_options(@new_resource.options)} purge #{@new_resource.package_name}",
-            :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive"
-            }
-          )
+          run_noninteractive("apt-get -q -y#{expand_options(@new_resource.options)} purge #{@new_resource.package_name}")
         end
 
         def preseed_package(preseed_file)
           Chef::Log.info("#{@new_resource} pre-seeding package installation instructions")
-          run_command_with_systems_locale(
-            :command => "debconf-set-selections #{preseed_file}",
-            :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive"
-            }
-          )
+          run_noninteractive("debconf-set-selections #{preseed_file}")
         end
 
         def reconfig_package(name, version)
           Chef::Log.info("#{@new_resource} reconfiguring")
-          run_command_with_systems_locale(
-            :command => "dpkg-reconfigure #{name}",
-            :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive"
-            }
-          )
+          run_noninteractive("dpkg-reconfigure #{name}")
+        end
+
+        private
+
+        # Runs command via shell_out with magic environment to disable
+        # interactive prompts. Command is run with default localization rather
+        # than forcing locale to "C", so command output may not be stable.
+        def run_noninteractive(command)
+          shell_out!(command, :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
         end
 
       end

data/lib/chef/provider/package/dpkg.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,14 +32,14 @@ class Chef
         include Chef::Mixin::GetSourceFromPackage
         def define_resource_requirements
           super
-          requirements.assert(:install) do |a| 
+          requirements.assert(:install) do |a|
             a.assertion{ not @new_resource.source.nil? }
             a.failure_message Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
           end
 
           # TODO this was originally written for any action in which .source is provided
           # but would it make more sense to only look at source if the action is :install?
-          requirements.assert(:all_actions) do |a| 
+          requirements.assert(:all_actions) do |a|
             a.assertion { @source_exists }
             a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
             a.whyrun "Assuming it would have been previously downloaded."
@@ -53,7 +53,7 @@ class Chef
           @new_resource.version(nil)
 
           if @new_resource.source
-            @source_exists = ::File.exists?(@new_resource.source) 
+            @source_exists = ::File.exists?(@new_resource.source)
             if @source_exists
               # Get information from the package if supplied
               Chef::Log.debug("#{@new_resource} checking dpkg status")
@@ -71,7 +71,7 @@ class Chef
             end
 
           end
-          
+
           # Check to see if it is installed
           package_installed = nil
           Chef::Log.debug("#{@new_resource} checking install state")
@@ -92,10 +92,10 @@ class Chef
           unless status.exitstatus == 0 || status.exitstatus == 1
             raise Chef::Exceptions::Package, "dpkg failed - #{status.inspect}!"
           end
-          
+
           @current_resource
         end
-     
+
         def install_package(name, version)
           run_command_with_systems_locale(
             :command => "dpkg -i#{expand_options(@new_resource.options)} #{@new_resource.source}",
@@ -113,7 +113,7 @@ class Chef
             }
           )
         end
-      
+
         def purge_package(name, version)
           run_command_with_systems_locale(
             :command => "dpkg -P#{expand_options(@new_resource.options)} #{@new_resource.package_name}",

data/lib/chef/provider/package/freebsd.rb

@@ -37,7 +37,7 @@ class Chef
 
         def current_installed_version
           pkg_info = shell_out!("pkg_info -E \"#{package_name}*\"", :env => nil, :returns => [0,1])
-          pkg_info.stdout[/^#{package_name}-(.+)/, 1]
+          pkg_info.stdout[/^#{Regexp.escape(package_name)}-(.+)/, 1]
         end
 
         def port_path
@@ -52,7 +52,7 @@ class Chef
           # Otherwise look up the path to the ports directory using 'whereis'
           else
             whereis = shell_out!("whereis -s #{@new_resource.package_name}", :env => nil)
-            unless path = whereis.stdout[/^#{@new_resource.package_name}:\s+(.+)$/, 1]
+            unless path = whereis.stdout[/^#{Regexp.escape(@new_resource.package_name)}:\s+(.+)$/, 1]
               raise Chef::Exceptions::Package, "Could not find port with the name #{@new_resource.package_name}"
             end
             path

data/lib/chef/provider/package/ips.rb

@@ -33,12 +33,12 @@ class Chef
 
         def define_resource_requirements
           super
-        
+
           requirements.assert(:all_actions) do |a|
             a.assertion { ! @candidate_version.nil? }
             a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.package_name} not found"
             a.whyrun "Assuming package #{@new_resource.package_name} would have been made available."
-          end 
+          end
         end
 
         def load_current_resource
@@ -52,7 +52,7 @@ class Chef
           Chef::Log.debug("Checking package status for #{package}")
           installed = false
           depends = false
-          
+
           shell_out!("pkg info -r #{package}").stdout.each_line do |line|
             case line
             when /^\s+State: Installed/

data/lib/chef/provider/package/macports.rb

@@ -44,7 +44,7 @@ class Chef
         def install_package(name, version)
           unless @current_resource.version == version
             command = "port#{expand_options(@new_resource.options)} install #{name}"
-            command << " @#{version}" if version and !version.empty? 
+            command << " @#{version}" if version and !version.empty?
             run_command_with_systems_locale(
               :command => command
             )

data/lib/chef/provider/package/pacman.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@ class Chef
   class Provider
     class Package
       class Pacman < Chef::Provider::Package
-      
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
@@ -84,27 +84,27 @@ class Chef
           @candidate_version
 
         end
-        
+
         def install_package(name, version)
           run_command_with_systems_locale(
             :command => "pacman --sync --noconfirm --noprogressbar#{expand_options(@new_resource.options)} #{name}"
           )
         end
-      
+
         def upgrade_package(name, version)
           install_package(name, version)
         end
-      
+
         def remove_package(name, version)
           run_command_with_systems_locale(
             :command => "pacman --remove --noconfirm --noprogressbar#{expand_options(@new_resource.options)} #{name}"
           )
         end
-      
+
         def purge_package(name, version)
           remove_package(name, version)
         end
-      
+
       end
     end
   end

data/lib/chef/provider/package/rpm.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,18 +30,18 @@ class Chef
         def define_resource_requirements
           super
 
-          requirements.assert(:all_actions) do |a| 
+          requirements.assert(:all_actions) do |a|
             a.assertion { @package_source_exists }
             a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
             a.whyrun "Assuming package #{@new_resource.name} would have been made available."
           end
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { !@rpm_status.nil? && (@rpm_status.exitstatus == 0 || @rpm_status.exitstatus == 1) } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !@rpm_status.nil? && (@rpm_status.exitstatus == 0 || @rpm_status.exitstatus == 1) }
             a.failure_message Chef::Exceptions::Package, "Unable to determine current version due to RPM failure. Detail: #{@rpm_status.inspect}"
             a.whyrun "Assuming current version would have been determined for package#{@new_resource.name}."
           end
         end
-        
+
         def load_current_resource
           @package_source_provided = true
           @package_source_exists = true
@@ -49,13 +49,13 @@ class Chef
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
           @new_resource.version(nil)
-          
+
           if @new_resource.source
             unless ::File.exists?(@new_resource.source)
               @package_source_exists = false
               return
             end
-            
+
             Chef::Log.debug("#{@new_resource} checking rpm status")
             status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
               stdout.each do |line|
@@ -72,7 +72,7 @@ class Chef
               return
             end
           end
-          
+
           Chef::Log.debug("#{@new_resource} checking install state")
           @rpm_status = popen4("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
@@ -83,11 +83,11 @@ class Chef
               end
             end
           end
-          
-          
+
+
           @current_resource
         end
-        
+
         def install_package(name, version)
           unless @current_resource.version
             run_command_with_systems_locale(
@@ -99,9 +99,9 @@ class Chef
             )
           end
         end
-        
+
         alias_method :upgrade_package, :install_package
-        
+
         def remove_package(name, version)
           if version
             run_command_with_systems_locale(