chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/provider/package.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.
@@ -25,17 +25,17 @@ require 'chef/platform'
 class Chef
   class Provider
     class Package < Chef::Provider
-      
+
       include Chef::Mixin::Command
-      
+
       attr_accessor :candidate_version
-      
+
       def initialize(new_resource, run_context)
         super
         @candidate_version = nil
       end
-      
-      def action_install  
+
+      def action_install
         # 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
@@ -51,18 +51,18 @@ class Chef
         end
 
         Chef::Log.info("Installing #{@new_resource} version #{install_version}")
-          
+
         # We need to make sure we handle the preseed file
         if @new_resource.response_file
           preseed_package(@new_resource.package_name, install_version)
         end
-          
+
         status = install_package(@new_resource.package_name, install_version)
         if status
           @new_resource.updated_by_last_action(true)
         end
       end
-      
+
       def action_upgrade
         if @current_resource.version != candidate_version
           orig_version = @current_resource.version || "uninstalled"
@@ -73,8 +73,8 @@ class Chef
           end
         end
       end
-      
-      def action_remove        
+
+      def action_remove
         if removing_package?
           Chef::Log.info("Removing #{@new_resource}")
           remove_package(@current_resource.package_name, @new_resource.version)
@@ -82,7 +82,7 @@ class Chef
         else
         end
       end
-      
+
       def removing_package?
         if @current_resource.version.nil?
           false # nothing to remove
@@ -94,7 +94,7 @@ class Chef
           false # we don't have the version we want to remove
         end
       end
-      
+
       def action_purge
         if removing_package?
           Chef::Log.info("Purging #{@new_resource}")
@@ -102,39 +102,39 @@ class Chef
           @new_resource.updated_by_last_action(true)
         end
       end
-      
+
       def install_package(name, version)
         raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :install"
       end
-      
+
       def upgrade_package(name, version)
-        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :upgrade" 
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :upgrade"
       end
-      
+
       def remove_package(name, version)
-        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remove" 
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remove"
       end
-      
+
       def purge_package(name, version)
-        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :purge" 
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :purge"
       end
-      
+
       def preseed_package(name, version)
-        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support pre-seeding package install/upgrade instructions - don't ask it to!" 
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support pre-seeding package install/upgrade instructions - don't ask it to!"
       end
-      
+
       def get_preseed_file(name, version)
         resource = preseed_resource(name, version)
         Chef::Log.debug("Fetching preseed file to #{resource.path}")
         resource.run_action('create')
-        
+
         if resource.updated_by_last_action?
           resource.path
         else
           false
         end
       end
-      
+
       def preseed_resource(name, version)
         # A directory in our cache to store this cookbook's preseed files in
         file_cache_dir = Chef::FileCache.create_cache_path("preseed/#{@new_resource.cookbook_name}")
@@ -147,14 +147,14 @@ class Chef
         remote_file.cookbook_name = @new_resource.cookbook_name
         remote_file.source(@new_resource.response_file)
         remote_file.backup(false)
-        
+
         remote_file
       end
 
       def expand_options(options)
         options ? " #{options}" : ""
       end
-      
+
     end
   end
 end

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

@@ -24,7 +24,7 @@ class Chef
   class Provider
     class Package
       class Dpkg < Chef::Provider::Package::Apt
-        DPKG_INFO = /([a-z\d\-\+]+)\t([\w\d.~-]+)/
+        DPKG_INFO = /([a-z\d\-\+]+)\t([\w\d.-]+)/
         DPKG_INSTALLED = /^Status: install ok installed/
         DPKG_VERSION = /^Version: (.+)$/
       

data/lib/chef/provider/package/portage.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,48 +24,59 @@ class Chef
   class Provider
     class Package
       class Portage < Chef::Provider::Package
-      
+        PACKAGE_NAME_PATTERN = %r{(([^/]+)/)?([^/]+)}
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
 
-          category = @new_resource.package_name.split('/').first
-          pkg = @new_resource.package_name.split('/').last
-
           @current_resource.version(nil)
 
-          catdir = "/var/db/pkg/#{category}"
+          _, category_with_slash, category, pkg = %r{^#{PACKAGE_NAME_PATTERN}$}.match(@new_resource.package_name).to_a
 
-          if( ::File.exists?(catdir) )
-            Dir.entries(catdir).each do |entry|
-              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
-              end
+          possibilities = Dir["/var/db/pkg/#{category || "*"}/#{pkg}-*"].map {|d| d.sub(%r{/var/db/pkg/}, "") }
+          versions = possibilities.map do |entry|
+            if(entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)})
+              [$&, $1]
             end
+          end.compact
+
+          if versions.size > 1
+            atoms = versions.map {|v| v.first }.sort
+            raise Chef::Exceptions::Package, "Multiple packages found for #{@new_resource.package_name}: #{atoms.join(" ")}. Specify a category."
+          elsif versions.size == 1
+            @current_resource.version(versions.first.last)
+            Chef::Log.debug("Got current version #{$1}")
           end
 
           @current_resource
         end
-      
-      
+
+
         def parse_emerge(package, txt)
-          available, installed, pkg = nil
-          txt.each do |line|
-            if line =~ /\*(.*)/
-              pkg = $1.strip
+          availables = {}
+          package_without_category = package.split("/").last
+          found_package_name = nil
+
+          txt.each_line do |line|
+            if line =~ /\*\s+#{PACKAGE_NAME_PATTERN}/
+              found_package_name = $&.strip
+              if found_package_name == package || found_package_name.split("/").last == package_without_category
+                availables[found_package_name] = nil
+              end
             end
-            if (pkg == package) || (pkg.split('/').last == package rescue false)
-              if line =~ /Latest version available: (.*)/
-                available = $1
-              elsif line =~ /Latest version installed: (.*)/
-                installed = $1
-              end  
+
+            if line =~ /Latest version available: (.*)/ && availables.has_key?(found_package_name)
+              availables[found_package_name] = $1.strip
             end
-          end  
-          available = installed unless available
-          [available, installed]
+          end
+
+          if availables.size > 1
+            # shouldn't happen if a category is specified so just use `package`
+            raise Chef::Exceptions::Package, "Multiple emerge results found for #{package}: #{availables.keys.join(" ")}. Specify a category."
+          end
+
+          availables.values.first
         end
 
         def candidate_version
@@ -83,29 +94,29 @@ class Chef
           @candidate_version
 
         end
-        
-        
+
+
         def install_package(name, version)
-          pkg = "=#{name}-#{version}" 
-          
+          pkg = "=#{name}-#{version}"
+
           if(version =~ /^\~(.+)/)
             # If we start with a tilde
             pkg = "~#{name}-#{$1}"
           end
-     
+
           run_command_with_systems_locale(
             :command => "emerge -g --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}"
           )
         end
-      
+
         def upgrade_package(name, version)
           install_package(name, version)
         end
-      
+
         def remove_package(name, version)
           if(version)
             pkg = "=#{@new_resource.package_name}-#{version}"
-          else            
+          else
             pkg = "#{@new_resource.package_name}"
           end
 
@@ -113,11 +124,11 @@ class Chef
             :command => "emerge --unmerge --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}"
           )
         end
-      
+
         def purge_package(name, version)
           remove_package(name, version)
         end
-      
+
       end
     end
   end

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

@@ -353,7 +353,7 @@ class Chef
         end
 
         def gem_sources
-          @new_resource.source ? [@new_resource.source, 'http://rubygems.org'] : nil
+          @new_resource.source ? Array(@new_resource.source) : nil
         end
 
         def load_current_resource

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

@@ -84,18 +84,9 @@ class Chef
           Chef::Log.debug("zypper current resource      #{@current_resource}")
           @current_resource
         end
-        
-        #Gets the zypper Version from command output (Returns Floating Point number)
-        def zypper_version()
-          `zypper -V 2>&1`.scan(/\d+/).join(".").to_f
-        end
 
         def install_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper install -y #{name}"
-            )
-          elsif version
+          if version
             run_command(
               :command => "zypper -n --no-gpg-checks install -l  #{name}=#{version}"
             )
@@ -107,11 +98,7 @@ class Chef
         end
 
         def upgrade_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper install -y #{name}"
-            )
-          elsif version
+          if version
             run_command(
               :command => "zypper -n --no-gpg-checks install -l #{name}=#{version}"
             )
@@ -123,11 +110,7 @@ class Chef
         end
 
         def remove_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper remove -y #{name}"
-            )
-          elsif version
+          if version
             run_command(
               :command => "zypper -n --no-gpg-checks remove  #{name}=#{version}"
             )

data/lib/chef/provider/remote_directory.rb

@@ -18,8 +18,6 @@
 
 require 'chef/provider/file'
 require 'chef/provider/directory'
-#require 'chef/rest'
-#require 'chef/mixin/find_preferred_file'
 require 'chef/resource/directory'
 require 'chef/resource/remote_file'
 require 'chef/platform'

data/lib/chef/provider/remote_file.rb

@@ -18,7 +18,6 @@
 
 require 'chef/provider/file'
 require 'chef/rest'
-require 'chef/mixin/find_preferred_file'
 require 'uri'
 require 'tempfile'
 require 'net/https'
@@ -27,14 +26,14 @@ class Chef
   class Provider
     class RemoteFile < Chef::Provider::File
 
-      include Chef::Mixin::FindPreferredFile
-
       def load_current_resource
         super
         @current_resource.checksum(checksum(@current_resource.path)) if ::File.exist?(@current_resource.path)
       end
 
       def action_create
+        assert_enclosing_directory_exists!
+
         Chef::Log.debug("Checking #{@new_resource} for changes")
 
         if current_resource_matches_target_checksum?

data/lib/chef/provider/service/arch.rb

@@ -20,16 +20,16 @@ require 'chef/provider/service/init'
 require 'chef/mixin/command'
 
 class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
-
+  
   def initialize(new_resource, run_context)
     super
     @init_command = "/etc/rc.d/#{@new_resource.service_name}"
   end
-
+  
   def load_current_resource
-
+  
     raise Chef::Exceptions::Service unless ::File.exists?("/etc/rc.conf")
-    raise Chef::Exceptions::Service unless ::File.read("/etc/rc.conf").match(/DAEMONS=\((.*)\)/m)
+    raise Chef::Exceptions::Service unless ::File.read("/etc/rc.conf").match(/DAEMONS=\((.*)\)/)
 
     super
 
@@ -38,46 +38,38 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
     @current_resource
   end
 
-  # Get list of all daemons from the file '/etc/rc.conf'.
-  # Mutiple lines and background form are supported. Example:
-  #   DAEMONS=(\
-  #     foobar \
-  #     @example \
-  #     !net \
-  #   )
   def daemons
     entries = []
-    if ::File.read("/etc/rc.conf").match(/DAEMONS=\((.*)\)/m)
-      entries += $1.gsub(/\\?[\r\n]/, ' ').gsub(/# *[^ ]+/,' ').split(' ') if $1.length > 0
+    if ::File.read("/etc/rc.conf").match(/DAEMONS=\((.*)\)/)
+      entries += $1.split(" ") if $1.length > 0
     end
-
+    
     yield(entries) if block_given?
-
+    
     entries
   end
-
-  # FIXME: Multiple entries of DAEMONS will cause very bad results :)
+  
   def update_daemons(entries)
-    content = ::File.read("/etc/rc.conf").gsub(/DAEMONS=\((.*)\)/m, "DAEMONS=(#{entries.join(' ')})")
+    content = ::File.read("/etc/rc.conf").gsub(/DAEMONS=\((.*)\)/, "DAEMONS=(#{entries.join(' ')})")
     ::File.open("/etc/rc.conf", "w") do |f|
       f.write(content)
     end
   end
-
+  
   def enable_service()
     new_daemons = []
     entries = daemons
-
-    if entries.include?(new_resource.service_name) or entries.include?("@#{new_resource.service_name}")
-      # exists and already enabled (or already enabled as a background service)
-      # new_daemons += entries
+    
+    if entries.include?(new_resource.service_name)
+      # exists and already enabled
+      new_daemons += entries
     else
       if entries.include?("!#{new_resource.service_name}")
         # exists but disabled
         entries.each do |daemon|
-          if daemon == "!#{new_resource.service_name}"
+          if daemon == "!#{new_resource.service_name}"  
             new_daemons << new_resource.service_name
-          else
+          else                                          
             new_daemons << daemon
           end
         end
@@ -86,31 +78,32 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
         new_daemons += entries
         new_daemons << new_resource.service_name
       end
-      update_daemons(new_daemons)
     end
+    
+    update_daemons(new_daemons)
   end
-
+  
   def disable_service()
     new_daemons = []
     entries = daemons
-
+    
     if entries.include?("!#{new_resource.service_name}")
       # exists and disabled
-      # new_daemons += entries
+      new_daemons += entries
     else
-      if entries.include?(new_resource.service_name) or entries.include?("@#{new_resource.service_name}")
-        # exists but enabled (or enabled as a back-ground service)
-        # FIXME: Does arch support !@foobar ?
+      if entries.include?(new_resource.service_name)
+        # exists but enabled
         entries.each do |daemon|
-          if [new_resource.service_name, "@#{new_resource.service_name}"].include?(daemon)
+          if daemon == new_resource.service_name  
             new_daemons << "!#{new_resource.service_name}"
-          else
+          else                                    
             new_daemons << daemon
           end
         end
       end
-      update_daemons(new_daemons)
     end
+    
+    update_daemons(new_daemons)
   end
 
 end