chef 0.10.10.beta.1 → 0.10.10.rc.1

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

@@ -172,8 +172,13 @@ class Chef
           end
         end
 
+        def network_device?
+          @new_resource.device =~ /:/ || @new_resource.device =~ /\/\//
+        end
+
         def device_should_exist?
-          @new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && @new_resource.fstype != "tmpfs" && @new_resource.fstype != 'fuse'
+          ( not network_device? ) &&
+            ( not %w[ tmpfs fuse ].include? @new_resource.fstype )
         end
 
         private
@@ -216,7 +221,14 @@ class Chef
         end
 
         def device_mount_regex
-          ::File.symlink?(device_real) ? "(?:#{Regexp.escape(device_real)})|(?:#{Regexp.escape(::File.readlink(device_real))})" : Regexp.escape(device_real)
+          if network_device?
+            # ignore trailing slash
+            Regexp.escape(device_real)+"/?"
+          elsif ::File.symlink?(device_real)
+            "(?:#{Regexp.escape(device_real)})|(?:#{Regexp.escape(::File.readlink(device_real))})"
+          else
+            Regexp.escape(device_real)
+          end
         end
 
         def device_fstab_regex

data/lib/chef/provider/package.rb

@@ -36,7 +36,7 @@ class Chef
 
       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
+        if @new_resource.version != nil && !target_version_already_installed?
           install_version = @new_resource.version
         # If it's not installed at all, install it
         elsif @current_resource.version == nil
@@ -199,6 +199,12 @@ class Chef
         options ? " #{options}" : ""
       end
 
+    private
+
+      def target_version_already_installed?
+        @new_resource.version == @current_resource.version
+      end
+
     end
   end
 end

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

@@ -68,13 +68,29 @@ class Chef
           ports_makefile_variable_value("PORTVERSION")
         end
 
+        def file_candidate_version_path
+          Dir["#{@new_resource.source}/#{@current_resource.package_name}*"][-1].to_s
+        end
+
+        def file_candidate_version
+          file_candidate_version_path.split(/-/).last.split(/.tbz/).first
+        end
+
         def load_current_resource
           @current_resource.package_name(@new_resource.package_name)
 
           @current_resource.version(current_installed_version)
           Chef::Log.debug("#{@new_resource} current version is #{@current_resource.version}") if @current_resource.version
 
-          @candidate_version = ports_candidate_version
+          case @new_resource.source
+          when /^http/, /^ftp/
+            @candidate_version = "0.0.0"
+          when /^\//
+            @candidate_version = file_candidate_version
+          else
+            @candidate_version = ports_candidate_version
+          end
+
           Chef::Log.debug("#{@new_resource} ports candidate version is #{@candidate_version}") if @candidate_version
 
           @current_resource
@@ -86,10 +102,14 @@ class Chef
 
         # The name of the package (without the version number) as understood by pkg_add and pkg_info
         def package_name
-          if ports_makefile_variable_value("PKGNAME") =~ /^(.+)-[^-]+$/
-            $1
+          if ::File.exist?("/usr/ports/Makefile")
+            if ports_makefile_variable_value("PKGNAME") =~ /^(.+)-[^-]+$/
+              $1
+            else
+              raise Chef::Exceptions::Package, "Unexpected form for PKGNAME variable in #{port_path}/Makefile"
+            end
           else
-            raise Chef::Exceptions::Package, "Unexpected form for PKGNAME variable in #{port_path}/Makefile"
+            @new_resource.package_name
           end
         end
 
@@ -99,10 +119,14 @@ class Chef
             when /^ports$/
               shell_out!("make -DBATCH install", :timeout => 1200, :env => nil, :cwd => port_path).status
             when /^http/, /^ftp/
-              shell_out!("pkg_add -r #{package_name}", :env => { "PACKAGESITE" => @new_resource.source, 'LC_ALL' => nil }).status
+              if @new_resource.source =~ /\/$/
+                shell_out!("pkg_add -r #{package_name}", :env => { "PACKAGESITE" => @new_resource.source, 'LC_ALL' => nil }).status
+              else
+                shell_out!("pkg_add -r #{package_name}", :env => { "PACKAGEROOT" => @new_resource.source, 'LC_ALL' => nil }).status
+              end
               Chef::Log.debug("#{@new_resource} installed from: #{@new_resource.source}")
             when /^\//
-              shell_out!("pkg_add #{@new_resource.name}", :env => { "PKG_PATH" => @new_resource.source , 'LC_ALL'=>nil}).status
+              shell_out!("pkg_add #{file_candidate_version_path}", :env => { "PKG_PATH" => @new_resource.source , 'LC_ALL'=>nil}).status
               Chef::Log.debug("#{@new_resource} installed from: #{@new_resource.source}")
             else
               shell_out!("pkg_add -r #{latest_link_name}", :env => nil).status

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

@@ -34,6 +34,7 @@ class Chef
           Chef::Log.debug("#{@new_resource} checking pacman for #{@new_resource.package_name}")
           status = popen4("pacman -Qi #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
+              line.force_encoding(Encoding::UTF_8) if line.respond_to?(:force_encoding)
               case line
               when /^Version(\s?)*: (.+)$/
                 Chef::Log.debug("#{@new_resource} current version is #{$2}")

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

@@ -353,7 +353,7 @@ class Chef
         end
 
         def is_omnibus?
-          if RbConfig::CONFIG['bindir'] == "/opt/opscode/embedded/bin"
+          if RbConfig::CONFIG['bindir'] == "/opt/chef/embedded/bin"
             Chef::Log.debug("#{@new_resource} detected omnibus installation in #{RbConfig::CONFIG['bindir']}")
             # Omnibus installs to a static path because of linking on unix, find it.
             true
@@ -444,9 +444,7 @@ class Chef
         def target_version_already_installed?
           return false unless @current_resource && @current_resource.version
           return false if @current_resource.version.nil?
-          # in the future we could support squiggly requirements like "~> 1.2.0"
-          # for now, the behavior when using anything other than exact
-          # requirements is undefined.
+
           Gem::Requirement.new(@new_resource.version).satisfied_by?(Gem::Version.new(@current_resource.version))
         end
 

data/lib/chef/provider/remote_directory.rb

@@ -62,7 +62,7 @@ class Chef
       def purge_unmanaged_files(unmanaged_files)
         if @new_resource.purge
           unmanaged_files.sort.reverse.each do |f|
-            if ::File.directory?(f)
+            if ::File.directory?(f) && !::File.symlink?(f)
               Dir::rmdir(f)
               Chef::Log.debug("#{@new_resource} removed directory #{f}")
             else

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

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/mixin/shell_out'
 require 'chef/provider/service'
 require 'chef/mixin/command'
 
@@ -24,6 +25,8 @@ class Chef
     class Service
       class Freebsd < Chef::Provider::Service::Init
 
+        include Chef::Mixin::ShellOut
+
         def load_current_resource
           @current_resource = Chef::Resource::Service.new(@new_resource.name)
           @current_resource.service_name(@new_resource.service_name)
@@ -38,52 +41,7 @@ class Chef
           end
           Chef::Log.debug("#{@current_resource} found at #{@init_command}")
 
-          if @new_resource.supports[:status]
-            begin
-              if run_command(:command => "#{@init_command} status") == 0
-                @current_resource.running true
-                Chef::Log.debug("#{@new_resource} is running")
-              end
-            rescue Chef::Exceptions::Exec
-              @current_resource.running false
-              nil
-            end
-
-          elsif @new_resource.status_command
-            begin
-              if run_command(:command => @new_resource.status_command) == 0
-                @current_resource.running true
-                Chef::Log.debug("#{@new_resource} is running")
-              end
-            rescue Chef::Exceptions::Exec
-              @current_resource.running false
-              nil
-            end
-
-          else
-            Chef::Log.debug("#{@new_resource} does not support status and you have not specified a status command, falling back to process table inspection")
-
-            if node[:command][:ps].nil? or node[:command][:ps].empty?
-              raise Chef::Exceptions::Service, "#{@new_resource} could not determine how to inspect the process table, please set this nodes 'ps' attribute"
-            end
-
-            status = popen4(node[:command][:ps]) do |pid, stdin, stdout, stderr|
-              r = Regexp.new(@new_resource.pattern)
-              Chef::Log.debug("#{@new_resource} attempting to match #{@new_resource.pattern} (#{r}) against process table")
-              stdout.each_line do |line|
-                if r.match(line)
-                  @current_resource.running true
-                  break
-                end
-              end
-              @current_resource.running false unless @current_resource.running
-            end
-            unless status.exitstatus == 0
-              raise Chef::Exceptions::Service, "Command #{node[:command][:ps]} failed"
-            else
-              Chef::Log.debug("#{@new_resource} #{node[:command][:ps]} exited and parsed successfully, process running: #{@current_resource.running}")
-            end
-          end
+          determine_current_status!
 
           if ::File.exists?("/etc/rc.conf")
             read_rc_conf.each do |line|
@@ -104,6 +62,34 @@ class Chef
           @current_resource
         end
 
+        def start_service
+          if @new_resource.start_command
+            super
+          else
+            shell_out!("#{@init_command} faststart")
+          end
+        end
+
+        def stop_service
+          if @new_resource.stop_command
+            super
+          else
+            shell_out!("#{@init_command} faststop")
+          end
+        end
+
+        def restart_service
+          if @new_resource.restart_command
+            super
+          elsif @new_resource.supports[:restart]
+            shell_out!("#{@init_command} fastrestart")
+          else
+            stop_service
+            sleep 1
+            start_service
+          end
+        end
+
         def read_rc_conf
           ::File.open("/etc/rc.conf", 'r') { |file| file.readlines }
         end

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

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/mixin/shell_out'
 require 'chef/provider/service'
 require 'chef/provider/service/simple'
 require 'chef/mixin/command'
@@ -24,7 +25,9 @@ class Chef
   class Provider
     class Service
       class Init < Chef::Provider::Service::Simple
-        
+
+        include Chef::Mixin::ShellOut
+
         def initialize(new_resource, run_context)
           super
           @init_command = "/etc/init.d/#{@new_resource.service_name}"
@@ -34,7 +37,7 @@ class Chef
           if @new_resource.start_command
             super
           else
-            run_command(:command => "#{@init_command} start")
+            shell_out!("#{@init_command} start")
           end
         end
 
@@ -42,7 +45,7 @@ class Chef
           if @new_resource.stop_command
             super
           else
-            run_command(:command => "#{@init_command} stop")
+            shell_out!("#{@init_command} stop")
           end
         end
 
@@ -50,7 +53,7 @@ class Chef
           if @new_resource.restart_command
             super
           elsif @new_resource.supports[:restart]
-            run_command(:command => "#{@init_command} restart")
+            shell_out!("#{@init_command} restart")
           else
             stop_service
             sleep 1
@@ -62,7 +65,7 @@ class Chef
           if @new_resource.reload_command
             super
           elsif @new_resource.supports[:reload]
-            run_command(:command => "#{@init_command} reload")
+            shell_out!("#{@init_command} reload")
           end
         end
       end

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

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/mixin/shell_out'
 require 'chef/provider/service'
 require 'chef/mixin/command'
 
@@ -23,18 +24,63 @@ class Chef
   class Provider
     class Service
       class Simple < Chef::Provider::Service
+
+        include Chef::Mixin::ShellOut
+
         def load_current_resource
           @current_resource = Chef::Resource::Service.new(@new_resource.name)
           @current_resource.service_name(@new_resource.service_name)
+
+          determine_current_status!
+
+          @current_resource
+        end
+
+        def start_service
+          if @new_resource.start_command
+            shell_out!(@new_resource.start_command)
+          else
+            raise Chef::Exceptions::Service, "#{self.to_s} requires that start_command to be set"
+          end
+        end
+
+        def stop_service
+          if @new_resource.stop_command
+            shell_out!(@new_resource.stop_command)
+          else
+            raise Chef::Exceptions::Service, "#{self.to_s} requires that stop_command to be set"
+          end
+        end
+
+        def restart_service
+          if @new_resource.restart_command
+            shell_out!(@new_resource.restart_command)
+          else
+            stop_service
+            sleep 1
+            start_service
+          end
+        end
+
+        def reload_service
+          if @new_resource.reload_command
+            shell_out!(@new_resource.reload_command)
+          else
+            raise Chef::Exceptions::Service, "#{self.to_s} requires that reload_command to be set"
+          end
+        end
+
+      protected
+        def determine_current_status!
           if @new_resource.status_command
             Chef::Log.debug("#{@new_resource} you have specified a status command, running..")
 
             begin
-              if run_command(:command => @new_resource.status_command) == 0
+              if shell_out(@new_resource.status_command).exitstatus == 0
                 @current_resource.running true
                 Chef::Log.debug("#{@new_resource} is running")
               end
-            rescue Chef::Exceptions::Exec
+            rescue Mixlib::ShellOut::ShellCommandFailed
               @current_resource.running false
               nil
             end
@@ -43,11 +89,11 @@ class Chef
             Chef::Log.debug("#{@new_resource} supports status, running")
 
             begin
-              if run_command(:command => "#{@init_command} status") == 0
+              if shell_out("#{@init_command} status").exitstatus == 0
                 @current_resource.running true
                 Chef::Log.debug("#{@new_resource} is running")
               end
-            rescue Chef::Exceptions::Exec
+            rescue Mixlib::ShellOut::ShellCommandFailed
               @current_resource.running false
               nil
             end
@@ -56,59 +102,22 @@ class Chef
             if ps_cmd.nil? or ps_cmd.empty?
               raise Chef::Exceptions::Service, "#{@new_resource} could not determine how to inspect the process table, please set this nodes 'command.ps' attribute"
             end
-            status = popen4(ps_cmd) do |pid, stdin, stdout, stderr|
-              r = Regexp.new(@new_resource.pattern)
-              Chef::Log.debug "#{@new_resource} attempting to match '#{@new_resource.pattern}' (#{r.inspect}) against process list"
-              stdout.each_line do |line|
+
+            r = Regexp.new(@new_resource.pattern)
+            Chef::Log.debug "#{@new_resource} attempting to match '#{@new_resource.pattern}' (#{r.inspect}) against process list"
+            begin
+              shell_out!(ps_cmd).stdout.each_line do |line|
                 if r.match(line)
                   @current_resource.running true
                   break
                 end
               end
               @current_resource.running false unless @current_resource.running
-            end
-            unless status.exitstatus == 0
-              raise Chef::Exceptions::Service, "Command #{ps_cmd} failed"
-            else
               Chef::Log.debug "#{@new_resource} running: #{@current_resource.running}"
+            rescue Mixlib::ShellOut::ShellCommandFailed
+              raise Chef::Exceptions::Service, "Command #{ps_cmd} failed"
             end
           end
-
-          @current_resource
-        end
-
-        def start_service
-          if @new_resource.start_command
-            run_command(:command => @new_resource.start_command)
-          else
-            raise Chef::Exceptions::Service, "#{self.to_s} requires that start_command to be set"
-          end
-        end
-
-        def stop_service
-          if @new_resource.stop_command
-            run_command(:command => @new_resource.stop_command)
-          else
-            raise Chef::Exceptions::Service, "#{self.to_s} requires that stop_command to be set"
-          end
-        end
-
-        def restart_service
-          if @new_resource.restart_command
-            run_command(:command => @new_resource.restart_command)
-          else
-            stop_service
-            sleep 1
-            start_service
-          end
-        end
-
-        def reload_service
-          if @new_resource.reload_command
-            run_command(:command => @new_resource.reload_command)
-          else
-            raise Chef::Exceptions::Service, "#{self.to_s} requires that reload_command to be set"
-          end
         end
 
         def ps_cmd