chef 0.9.16 → 0.9.18

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/zypper.rb

@@ -84,9 +84,18 @@ 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 version
+          if zypper_version < 1.0
+            run_command(
+              :command => "zypper install -y #{name}"
+            )
+          elsif version
             run_command(
               :command => "zypper -n --no-gpg-checks install -l  #{name}=#{version}"
             )
@@ -98,7 +107,11 @@ class Chef
         end
 
         def upgrade_package(name, version)
-          if version
+          if zypper_version < 1.0
+            run_command(
+              :command => "zypper install -y #{name}"
+            )
+          elsif version
             run_command(
               :command => "zypper -n --no-gpg-checks install -l #{name}=#{version}"
             )
@@ -110,7 +123,11 @@ class Chef
         end
 
         def remove_package(name, version)
-          if version
+          if zypper_version < 1.0
+            run_command(
+              :command => "zypper remove -y #{name}"
+            )
+          elsif version
             run_command(
               :command => "zypper -n --no-gpg-checks remove  #{name}=#{version}"
             )

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=\((.*)\)/)
+    raise Chef::Exceptions::Service unless ::File.read("/etc/rc.conf").match(/DAEMONS=\((.*)\)/m)
 
     super
 
@@ -38,38 +38,46 @@ 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=\((.*)\)/)
-      entries += $1.split(" ") if $1.length > 0
+    if ::File.read("/etc/rc.conf").match(/DAEMONS=\((.*)\)/m)
+      entries += $1.gsub(/\\?[\r\n]/, ' ').gsub(/# *[^ ]+/,' ').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=\((.*)\)/, "DAEMONS=(#{entries.join(' ')})")
+    content = ::File.read("/etc/rc.conf").gsub(/DAEMONS=\((.*)\)/m, "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)
-      # exists and already enabled
-      new_daemons += entries
+
+    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
     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
@@ -78,32 +86,31 @@ 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)
-        # exists but enabled
+      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 ?
         entries.each do |daemon|
-          if daemon == new_resource.service_name  
+          if [new_resource.service_name, "@#{new_resource.service_name}"].include?(daemon)
             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

data/lib/chef/shef.rb

@@ -20,6 +20,7 @@ require "pp"
 require "etc"
 require "mixlib/cli"
 
+require 'chef'
 require 'chef/version'
 require "chef/client"
 require "chef/config"

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.16'
+  VERSION = '0.9.18'
 end

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.16
+  version: 0.9.18
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -07:00
+date: 2011-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency