chef 0.7.16 → 0.8.2

data/lib/chef/provider/mount/mount.rb

@@ -40,7 +40,7 @@ class Chef
           Chef::Log.debug("Checking for mount point #{@current_resource.mount_point}")
 
           # only check for existence of non-remote devices
-          if(@new_resource.device !~ /:/ && !::File.exists?(@new_resource.device) )
+          if(@new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && !::File.exists?(@new_resource.device) )
             raise Chef::Exceptions::Mount, "Device #{@new_resource.device} does not exist"
           elsif( !::File.exists?(@new_resource.mount_point) )
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"

data/lib/chef/provider/package.rb

@@ -47,7 +47,7 @@ class Chef
         end
 
         unless install_version
-          raise(Chef::Exceptions::Package, "No version specified, and no candidate version available!")
+          raise(Chef::Exceptions::Package, "No version specified, and no candidate version available for #{@new_resource.package_name}")
         end
 
         Chef::Log.info("Installing #{@new_resource} version #{install_version}")

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

@@ -0,0 +1,106 @@
+#
+# Author:: Joe Williams (<joe@joetify.com>)
+# Copyright:: Copyright (c) 2009 Joe Williams
+# 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'
+class Chef
+  class Provider
+    class Package
+      class EasyInstall < Chef::Provider::Package
+
+        def install_check(name)
+          command = "python -c \"import sys; print sys.path\""
+          check = false
+          status = popen4(command) do |pid, stdin, stdout, stderr|
+            stdout.each do |line|
+              if line.include? "#{name}"
+                check = true
+              end
+            end
+          end
+          check
+        end
+
+        def easy_install_binary_path
+          path = @new_resource.easy_install_binary
+          path ? path : 'easy_install'
+        end
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+          @current_resource.package_name(@new_resource.package_name)
+          @current_resource.version(nil)
+
+          # get the currently installed version if installed
+          if install_check(@new_resource.package_name)
+            command = "python -c \"import #{@new_resource.package_name}; print #{@new_resource.package_name}.__path__\""
+            pid, stdin, stdout, stderr = popen4(command)
+            install_location = stdout.readline
+            install_location[/\S\S(.*)\/(.*)-(.*)-py(.*).egg\S/]
+            package_version = $3
+          else
+            package_version = nil
+          end
+
+          if package_version == @new_resource.version
+            Chef::Log.debug("#{@new_resource.package_name} at version #{@new_resource.version}")
+            @current_resource.version(@new_resource.version)
+          else
+            Chef::Log.debug("#{@new_resource.package_name} at version #{package_version}")
+            @current_resource.version(package_version)
+          end
+
+          @current_resource
+        end
+
+        def candidate_version
+           return @candidate_version if @candidate_version
+
+           # do a dry run to get the latest version
+           command = "#{easy_install_binary_path} -n #{@new_resource.package_name}"
+           pid, stdin, stdout, stderr = popen4(command)
+           dry_run_output = ""
+           stdout.each do |line|
+             dry_run_output << line
+           end
+           dry_run_output[/(.*)Best match: (.*) (.*)\n/]
+           @candidate_version = $3
+           @candidate_version
+        end
+
+        def install_package(name, version)
+          run_command(:command => "#{easy_install_binary_path} \"#{name}==#{version}\"")
+        end
+
+        def upgrade_package(name, version)
+          install_package(name, version)
+        end
+
+        def remove_package(name, version)
+          run_command(:command => "#{easy_install_binary_path} -m #{name}")
+        end
+
+        def purge_package(name, version)
+          remove_package(name, version)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,101 @@
+#
+# Author:: Jan Zimmek (<jan.zimmek@web.de>)
+# Copyright:: Copyright (c) 2010 Jan Zimmek
+# 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'
+
+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)
+
+          @current_resource.version(nil)
+
+          Chef::Log.debug("Checking pacman for #{@new_resource.package_name}")
+          status = popen4("pacman -Qi #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+            stdout.each do |line|
+              case line
+              when /^Version(\s?)*: (.+)$/
+                Chef::Log.debug("Current version is #{$2}")
+                @current_resource.version($2)
+              end
+            end
+          end
+
+          unless status.exitstatus == 0 || status.exitstatus == 1
+            raise Chef::Exceptions::Package, "pacman failed - #{status.inspect}!"
+          end
+
+          @current_resource
+        end
+
+        def candidate_version
+          return @candidate_version if @candidate_version
+
+          status = popen4("pacman -Ss #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+            stdout.each do |line|
+              case line
+                when /^(extra|core|community)\/#{@new_resource.package_name} (.+)$/
+                  # $2 contains a string like "4.4.0-1 (kde kdenetwork)" or "3.10-4 (base)"
+                  # simply split by space and use first token
+                  @candidate_version = $2.split(" ").first
+              end
+            end
+          end
+
+          unless status.exitstatus == 0 || status.exitstatus == 1
+            raise Chef::Exceptions::Package, "pacman failed - #{status.inspect}!"
+          end
+
+          unless @candidate_version
+            raise Chef::Exceptions::Package, "pacman does not have a version of package #{@new_resource.package_name}"
+          end
+
+          @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
+end

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

@@ -38,7 +38,7 @@ class Chef
 
           if( ::File.exists?(catdir) )
             Dir.entries(catdir).each do |entry|
-              if(entry =~ /^#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?)/)
+              if(entry =~ /^#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)/)
                 @current_resource.version($1)
                 Chef::Log.debug("Got current version #{$1}")
                 break

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

@@ -69,16 +69,18 @@ class Chef
         end
         
         def install_package(name, version)
-          run_command_with_systems_locale(
-            :command => "rpm -i #{@new_resource.source}"
-          )
+          unless @current_resource.version
+            run_command_with_systems_locale(
+              :command => "rpm -i #{@new_resource.source}"
+            )
+          else
+            run_command_with_systems_locale(
+              :command => "rpm -U #{@new_resource.source}"
+            )
+          end
         end
         
-        def upgrade_package(name, version)
-          run_command_with_systems_locale(
-            :command => "rpm -U #{@new_resource.source}"
-          )
-        end
+        alias_method :upgrade_package, :install_package
         
         def remove_package(name, version)
           if version

data/lib/chef/provider/package/yum-dump.py

@@ -45,8 +45,17 @@ failure = False
 try:
   try:
     y = yum.YumBase()
-    # Only want our output
-    y.doConfigSetup(debuglevel=0, errorlevel=0)
+    try:
+        # Only want our output
+        y.doConfigSetup(errorlevel=0,debuglevel=0)
+    except:
+        # but of course, yum on even moderately old
+        # redhat/centosen doesn't know how to do logging properly
+        # so we duck punch our way to victory
+        def __log(a,b): pass
+        y.doConfigSetup()
+        y.log = __log
+        y.errorlog = __log
     
     # Yum assumes it can update the cache directory. Disable this for non root 
     # users.
@@ -70,7 +79,17 @@ try:
     y.doTsSetup()
     y.doRpmDBSetup()
     
-    db = y.doPackageLists('all')
+    try:
+        db = y.doPackageLists('all')
+    except AttributeError:
+        # some people claim that testing for yum.__version__ should be
+        # enough to see if this is required, but I say they're liars.
+        # the yum on 4.8 at least understands yum.__version__ but still
+        # needs to get its repos and sacks set up manually.
+        # Thus, we just try it, fail, and then try again. WCPGW?
+        y.doRepoSetup()
+        y.doSackSetup()
+        db = y.doPackageLists('all')
     
     y.closeRpmDB()
   

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

@@ -115,6 +115,23 @@ class Chef
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
         
+          if @new_resource.source
+            unless ::File.exists?(@new_resource.source)
+              raise Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
+            end
+
+            Chef::Log.debug("Checking rpm status for  #{@new_resource.package_name}")
+            status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
+              stdout.each do |line|
+                case line
+                when /([\w\d_.-]+)\s([\w\d_.-]+)/
+                  @current_resource.package_name($1)
+                  @new_resource.version($2)
+                end
+              end
+            end
+          end
+
           Chef::Log.debug("Checking yum info for #{@new_resource.package_name}")
     
           @yum.refresh
@@ -133,17 +150,24 @@ class Chef
         end
 
         def install_package(name, version)
-          run_command_with_systems_locale(
-            :command => "yum -q -y install #{name}-#{version}"
-          )
+          if @new_resource.source 
+            run_command_with_systems_locale(
+              :command => "yum -d0 -e0 -y localinstall #{@new_resource.source}"
+            )
+          else
+            run_command_with_systems_locale(
+              :command => "yum -d0 -e0 -y install #{name}-#{version}"
+            )
+          end
           @yum.flush
         end
       
         def upgrade_package(name, version)
-          # If we have a version, we can upgrade - otherwise, install
-          if @current_resource.version
+          # If we're not given a version, running update is the correct
+          # option. If we are, then running install_package is right.
+          unless version
             run_command_with_systems_locale(
-              :command => "yum -q -y update #{name}-#{version}"
+              :command => "yum -d0 -e0 -y update #{name}"
             )   
             @yum.flush
           else
@@ -154,11 +178,11 @@ class Chef
         def remove_package(name, version)
           if version
             run_command_with_systems_locale(
-             :command => "yum -q -y remove #{name}-#{version}"
+             :command => "yum -d0 -e0 -y remove #{name}-#{version}"
             )
           else
             run_command_with_systems_locale(
-             :command => "yum -q -y remove #{name}"
+             :command => "yum -d0 -e0 -y remove #{name}"
             )
           end
             

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

@@ -0,0 +1,132 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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 'singleton'
+
+class Chef
+  class Provider
+    class Package
+      class Zypper < Chef::Provider::Package  
+      
+ 
+        def load_current_resource
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+          @current_resource.package_name(@new_resource.package_name)
+
+          is_installed=false
+          version=''
+          is_out_of_date=false
+          Chef::Log.debug("Checking zypper for #{@new_resource.package_name}")
+          status = popen4("zypper info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+            stdout.each do |line|
+              case line
+              when /^Version: (.+)$/
+                version = $1
+                Chef::Log.debug("zypper version=#{$1}")
+              when /^Installed: Yes$/
+                is_installed=true
+                Chef::Log.debug("zypper installed true")
+                
+              when /^Installed: No$/
+                is_installed=false
+                Chef::Log.debug("zypper installed false")
+              when /^Status: out-of-date \(version (.+) installed\)$/
+                is_out_of_date=true
+                oud_version=$1
+                Chef::Log.debug("zypper out of date version=#{$1}")
+              end
+            end
+          end
+
+          if is_installed==false
+            @candidate_version=version
+            @current_resource.version(nil)
+            Chef::Log.debug("dentro installed false");
+          end
+ 
+          if is_installed==true
+            if is_out_of_date==true
+              @current_resource.version(oud_version)
+              @candidate_version=version
+              Chef::Log.debug("dentro installed outofdate");
+            else 
+              @current_resource.version(version)
+              @candidate_version=version
+              Chef::Log.debug("dentro installed");
+            end
+          end
+
+
+          unless status.exitstatus == 0
+            raise Chef::Exceptions::Package, "zypper failed - #{status.inspect}!"
+          end
+
+          
+          Chef::Log.debug("zypper current resource      #{@current_resource}")
+          @current_resource
+        end
+
+        def install_package(name, version)
+          if version
+            run_command(
+              :command => "zypper -n --no-gpg-checks install -l  #{name}=#{version}"
+            )
+          else
+            run_command(
+              :command => "zypper -n --no-gpg-checks install -l  #{name}"
+            )
+          end
+        end
+
+        def upgrade_package(name, version)
+          if version
+            run_command(
+              :command => "zypper -n --no-gpg-checks update -l  #{name}=#{version}"
+            )
+          else
+            run_command(
+              :command => "zypper -n --no-gpg-checks update -l  #{name}"
+            )
+          end
+        end
+
+        def remove_package(name, version)
+          if version
+            run_command(
+              :command => "zypper -n --no-gpg-checks remove  #{name}=#{version}"
+            )
+          else
+            run_command(
+              :command => "zypper -n --no-gpg-checks remove  #{name}"
+            )
+          end
+            
+         
+        end
+      
+        def purge_package(name, version)
+          remove_package(name, version)
+        end
+      
+      end
+    end
+  end
+end