chef 0.10.2 → 0.10.4.rc.1

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

@@ -78,9 +78,18 @@ class Chef
           
           @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}"
             )
@@ -92,7 +101,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}"
             )
@@ -104,7 +117,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/remote_directory.rb

@@ -45,7 +45,6 @@ class Chef
         end
         purge_unmanaged_files(files_to_purge)
         Chef::Log.info("#{@new_resource} created")
-        @new_resource.updated_by_last_action(true)
       end
 
       def action_create_if_missing

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/provider/service/systemd.rb

@@ -0,0 +1,102 @@
+#
+# Author:: Stephen Haynes (<sh@nomitor.com>)
+# Copyright:: Copyright (c) 2011 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/service'
+require 'chef/provider/service/simple'
+require 'chef/mixin/command'
+
+class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
+  def load_current_resource
+    @current_resource = Chef::Resource::Service.new(@new_resource.name)
+    @current_resource.service_name(@new_resource.service_name)
+
+    if @new_resource.status_command
+      Chef::Log.debug("#{@new_resource} you have specified a status command, running..")
+
+      begin
+        if run_command_with_systems_locale(:command => @new_resource.status_command) == 0
+          @current_resource.running(true)
+        end
+      rescue Chef::Exceptions::Exec
+        @current_resource.running(false)
+        nil
+      end
+    else
+      @current_resource.running(is_active?)
+    end
+
+    @current_resource.enabled(is_enabled?)
+    @current_resource
+  end
+
+  def start_service
+    if @current_resource.running
+      Chef::Log.debug("#{@new_resource} already running, not starting")
+    else
+      if @new_resource.start_command
+        super
+      else
+        run_command_with_systems_locale(:command => "/bin/systemctl start #{@new_resource.service_name}")
+      end
+    end
+  end
+
+  def stop_service
+    unless @current_resource.running
+      Chef::Log.debug("#{@new_resource} not running, not stopping")
+    else
+      if @new_resource.stop_command
+        super
+      else
+        run_command_with_systems_locale(:command => "/bin/systemctl stop #{@new_resource.service_name}")
+      end
+    end
+  end
+
+  def restart_service
+    if @new_resource.restart_command
+      super
+    else
+      run_command_with_systems_locale(:command => "/bin/systemctl restart #{@new_resource.service_name}")
+    end
+  end
+
+  def reload_service
+    if @new_resource.reload_command
+      super
+    else
+      run_command_with_systems_locale(:command => "/bin/systemctl reload #{@new_resource.service_name}")
+    end
+  end
+
+  def enable_service
+    run_command_with_systems_locale(:command => "/bin/systemctl enable #{@new_resource.service_name}")
+  end 
+
+  def disable_service
+    run_command_with_systems_locale(:command => "/bin/systemctl disable #{@new_resource.service_name}")
+  end 
+
+  def is_active?
+    run_command_with_systems_locale({:command => "/bin/systemctl is-active #{@new_resource.service_name}", :ignore_failure => true}) == 0
+  end
+
+  def is_enabled?
+    run_command_with_systems_locale({:command => "/bin/systemctl is-enabled #{@new_resource.service_name}", :ignore_failure => true}) == 0
+  end
+end

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

@@ -140,8 +140,14 @@ class Chef
         def restart_service
           if @new_resource.restart_command
             super
-          else
-            run_command_with_systems_locale(:command => "/sbin/restart #{@new_resource.service_name}")
+          # Upstart always provides restart functionality so we don't need to mimic it with stop/sleep/start.
+          # Older versions of upstart would fail on restart if the service was currently stopped, check for that. LP:430883
+          else @new_resource.supports[:restart]
+            if @current_resource.running
+              run_command_with_systems_locale(:command => "/sbin/restart #{@new_resource.service_name}")
+            else
+              start_service
+            end
           end
         end
 

data/lib/chef/providers.rb

@@ -69,6 +69,7 @@ require 'chef/provider/service/init'
 require 'chef/provider/service/insserv'
 require 'chef/provider/service/redhat'
 require 'chef/provider/service/simple'
+require 'chef/provider/service/systemd'
 require 'chef/provider/service/upstart'
 require 'chef/provider/service/windows'
 require 'chef/provider/service/solaris'
@@ -83,6 +84,7 @@ require 'chef/provider/group/dscl'
 require 'chef/provider/group/gpasswd'
 require 'chef/provider/group/groupadd'
 require 'chef/provider/group/pw'
+require 'chef/provider/group/suse'
 require 'chef/provider/group/usermod'
 require 'chef/provider/group/windows'
 

data/lib/chef/resource.rb

@@ -87,6 +87,8 @@ F
     attr_accessor :recipe_name
     attr_accessor :enclosing_provider
     attr_accessor :source_line
+    attr_accessor :retries
+    attr_accessor :retry_delay
 
     attr_reader :updated
 
@@ -112,6 +114,8 @@ F
       @updated_by_last_action = false
       @supports = {}
       @ignore_failure = false
+      @retries = 0
+      @retry_delay = 2
       @not_if = nil
       @not_if_args = {}
       @only_if = nil
@@ -224,6 +228,22 @@ F
       )
     end
 
+    def retries(arg=nil)
+      set_or_return(
+        :retries,
+        arg,
+        :kind_of => Integer
+      )
+    end
+
+    def retry_delay(arg=nil)
+      set_or_return(
+        :retry_delay,
+        arg,
+        :kind_of => Integer
+      )
+    end
+
     def epic_fail(arg=nil)
       ignore_failure(arg)
     end
@@ -468,8 +488,8 @@ F
           set_or_return(attr_name.to_sym, arg, validation_opts)
         end
       end
-
-      def build_from_file(cookbook_name, filename)
+      
+      def build_from_file(cookbook_name, filename, run_context)
         rname = filename_to_qualified_string(cookbook_name, filename)
 
         # Add log entry if we override an existing light-weight resource.
@@ -490,6 +510,12 @@ F
 
           class << cls
             include Chef::Mixin::FromFile
+            
+            attr_accessor :run_context
+
+            def node
+              self.run_context.node
+            end
 
             def actions_to_create
               @actions_to_create
@@ -500,6 +526,9 @@ F
             end
           end
 
+          # set the run context in the class instance variable
+          cls.run_context = run_context
+          
           # load resource definition from file
           cls.class_from_file(filename)
 

data/lib/chef/resource/git.rb

@@ -26,6 +26,15 @@ class Chef
         super
         @resource_name = :git
         @provider = Chef::Provider::Git
+        @additional_remotes = Hash[]
+      end
+
+      def additional_remotes(arg=nil)
+        set_or_return(
+          :additional_remotes,
+          arg,
+          :kind_of => Hash
+        )
       end
 
       alias :branch :revision

data/lib/chef/resource/mount.rb

@@ -74,8 +74,7 @@ class Chef
       
       def options(arg=nil)
         if arg.is_a?(String)
-          arg.gsub!(/,/, ' ')
-          converted_arg = arg.split(/ /)
+          converted_arg = arg.gsub(/,/, ' ').split(/ /)
         else
           converted_arg = arg
         end

data/lib/chef/resource/yum_package.rb

@@ -27,6 +27,8 @@ class Chef
         super
         @resource_name = :yum_package
         @provider = Chef::Provider::Package::Yum
+        @flush_cache = { :before => false, :after => false }
+        @allow_downgrade = false
       end
 
       # Install a specific arch
@@ -38,6 +40,24 @@ class Chef
         )
       end
 
+      def flush_cache(args={})
+        if args.is_a? Array
+          args.each { |arg| @flush_cache[arg] = true }
+        elsif args.any?
+          @flush_cache = args
+        else
+          @flush_cache
+        end
+      end
+
+      def allow_downgrade(arg=nil)
+        set_or_return(
+          :allow_downgrade,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
     end
   end
 end