chef 0.8.16 → 0.9.0.a3

data/lib/chef/provider/group/pw.rb

@@ -53,13 +53,9 @@ class Chef
         # <string>:: A string containing the option and then the quoted value
         def set_options
           opts = " #{@new_resource.group_name}"
-          { :gid => "-g" }.sort { |a,b| a[0] <=> b[0] }.each do |field, option|
-            if @current_resource.send(field) != @new_resource.send(field)
-              if @new_resource.send(field)
-                Chef::Log.debug("#{@new_resource}: setting #{field.to_s} to #{@new_resource.send(field)}")
-                opts << " #{option} '#{@new_resource.send(field)}'"
-              end
-            end
+          if @new_resource.gid && (@current_resource.gid != @new_resource.gid)
+            Chef::Log.debug("#{@new_resource}: current gid (#{@current_resource.gid}) doesnt match target gid (#{@new_resource.gid}), changing it")
+            opts << " -g '#{@new_resource.gid}'"
           end
           opts
         end

data/lib/chef/provider/group/windows.rb

@@ -0,0 +1,79 @@
+#
+# Author:: Doug MacEachern (<dougm@vmware.com>)
+# Copyright:: Copyright (c) 2010 VMware, 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/user'
+if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+  require 'chef/util/windows/net_group'
+end
+
+class Chef
+  class Provider
+    class Group
+      class Windows < Chef::Provider::Group
+        
+        def initialize(new_resource,run_context)
+          super
+          @net_group = Chef::Util::Windows::NetGroup.new(@new_resource.name)
+        end
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Group.new(@new_resource.name)
+          @current_resource.group_name(@new_resource.group_name)
+        
+          members = nil
+          begin
+            members = @net_group.local_get_members
+          rescue => e
+            @group_exists = false
+            Chef::Log.debug("#{@new_resource}: group does not exist")
+          end
+
+          if members
+            @current_resource.members(members)
+          end
+
+          @current_resource
+        end
+        
+        def create_group
+          @net_group.local_add
+          manage_group
+        end
+        
+        def manage_group
+          if @new_resource.append
+            begin
+              #ERROR_MEMBER_IN_ALIAS if a member already exists in the group
+              @net_group.local_add_members(@new_resource.members)
+            rescue
+              members = @new_resource.members + @current_resource.members
+              @net_group.local_set_members(members.uniq)
+            end
+          else
+            @net_group.local_set_members(@new_resource.members)
+          end
+        end
+        
+        def remove_group
+          @net_group.local_delete
+        end
+        
+      end
+    end
+  end
+end

data/lib/chef/provider/link.rb

@@ -18,14 +18,15 @@
 
 require 'chef/config'
 require 'chef/log'
-require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'chef/resource/link'
 require 'chef/provider'
 
 class Chef
   class Provider
     class Link < Chef::Provider
-      include Chef::Mixin::Command
+      include Chef::Mixin::ShellOut
+      #include Chef::Mixin::Command
 
       def negative_complement(big)
         if big > 1073741823 # Fixnum max
@@ -117,9 +118,7 @@ class Chef
         if @current_resource.to != ::File.expand_path(@new_resource.to, @new_resource.target_file)
           Chef::Log.info("Creating a #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file} for #{@new_resource}")
           if @new_resource.link_type == :symbolic
-            run_command(
-              :command => "ln -nfs #{@new_resource.to} #{@new_resource.target_file}"
-            )
+            shell_out! "ln -nfs #{@new_resource.to} #{@new_resource.target_file}"
           elsif @new_resource.link_type == :hard
             ::File.link(@new_resource.to, @new_resource.target_file)
           end

data/lib/chef/provider/mdadm.rb

@@ -17,53 +17,60 @@
 #
 
 require 'chef/log'
-require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'chef/provider'
 
 class Chef
   class Provider
     class Mdadm < Chef::Provider
 
-      include Chef::Mixin::Command
+      #include Chef::Mixin::Command
+      include Chef::Mixin::ShellOut
+      
+      def popen4
+        raise Exception, "deprecated, bitches"
+      end
 
       def load_current_resource
         @current_resource = Chef::Resource::Mdadm.new(@new_resource.name)
         @current_resource.raid_device(@new_resource.raid_device)
         Chef::Log.debug("Checking for software raid device #{@current_resource.raid_device}")
 
-        command = "mdadm --detail --scan"
-        exists = false
-        status = popen4(command) do |pid, stdin, stdout, stderr|
-          stdout.each do |line|
-            if line.include? @new_resource.raid_device
-              exists = true
-            end
-          end
-        end
+        mdadm = shell_out!("mdadm --detail --scan")
+        exists = mdadm.stdout.include?(@new_resource.raid_device)
+        #exists = false
+        # popen4(command) do |pid, stdin, stdout, stderr|
+        #   stdout.each do |line|
+        #     if line.include? @new_resource.raid_device
+        #       exists = true
+        #     end
+        #   end
+        # end
         @current_resource.exists(exists)
       end
 
       def action_create
         unless @current_resource.exists
-          command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level} --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.collect{|x| x + " "}.to_s.chop}"
+          command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level} --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
           Chef::Log.debug("mdadm command: #{command}")
-          pid, stdin, stdout, stderr = popen4(command)
+          #pid, stdin, stdout, stderr = popen4(command)
+          shell_out!(command)
           Chef::Log.info("Created mdadm raid device (#{@new_resource.raid_device})")
           @new_resource.updated = true
         else
-          Chef::Log.debug("mdadm raid device already exists (#{@new_resource.raid_device})")
+          Chef::Log.debug("mdadm raid device already exists, skipping create (#{@new_resource.raid_device})")
         end
       end
 
       def action_assemble
         unless @current_resource.exists
-          command = "yes | mdadm --assemble #{@new_resource.raid_device} #{@new_resource.devices.collect{|x| x + " "}.to_s.chop}"
+          command = "yes | mdadm --assemble #{@new_resource.raid_device} #{@new_resource.devices.join(" ")}"
           Chef::Log.debug("mdadm command: #{command}")
-          pid, stdin, stdout, stderr = popen4(command)
+          shell_out!(command)
           Chef::Log.info("Assembled mdadm raid device (#{@new_resource.raid_device})")
           @new_resource.updated = true
         else
-          Chef::Log.debug("mdadm raid device already exists (#{@new_resource.raid_device})")
+          Chef::Log.debug("mdadm raid device already exists, skipping assemble (#{@new_resource.raid_device})")
         end
       end
 
@@ -71,7 +78,7 @@ class Chef
         if @current_resource.exists
           command = "yes | mdadm --stop #{@new_resource.raid_device}"
           Chef::Log.debug("mdadm command: #{command}")
-          pid, stdin, stdout, stderr = popen4(command)
+          shell_out!(command)
           Chef::Log.info("Stopped mdadm raid device (#{@new_resource.raid_device})")
           @new_resource.updated = true
         else

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

@@ -18,17 +18,16 @@
 
 require 'chef/provider/mount'
 require 'chef/log'
-require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Mount
       class Mount < Chef::Provider::Mount
+        include Chef::Mixin::ShellOut
 
-        include Chef::Mixin::Command
-
-        def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
-          super(node, new_resource, collection, definitions, cookbook_loader)
+        def initialize(new_resource, run_context)
+          super
           @real_device = nil
         end
         attr_accessor :real_device
@@ -48,16 +47,14 @@ class Chef
 
           # Check to see if the volume is mounted. Last volume entry wins.
           mounted = false
-          popen4("mount") do |pid, stdin, stdout, stderr|
-            stdout.each do |line|
-              case line
-              when /^#{device_mount_regex}\s+on\s+#{@new_resource.mount_point}/
-                mounted = true
-                Chef::Log.debug("Special device #{device_logstring} mounted as #{@new_resource.mount_point}")
-              when /^([\/\w])+\son\s#{@new_resource.mount_point}\s+/
-                mounted = false
-                Chef::Log.debug("Special device #{$~[1]} mounted as #{@new_resource.mount_point}")
-              end
+          shell_out!("mount").stdout.each_line do |line|
+            case line
+            when /^#{device_mount_regex}\s+on\s+#{@new_resource.mount_point}/
+              mounted = true
+              Chef::Log.debug("Special device #{device_logstring} mounted as #{@new_resource.mount_point}")
+            when /^([\/\w])+\son\s#{@new_resource.mount_point}\s+/
+              mounted = false
+              Chef::Log.debug("Special device #{$~[1]} mounted as #{@new_resource.mount_point}")
             end
           end
           @current_resource.mounted(mounted)
@@ -89,7 +86,7 @@ class Chef
             command << " -o #{@new_resource.options.join(',')}" unless @new_resource.options.nil? || @new_resource.options.empty?
             command << " #{device_real}"
             command << " #{@new_resource.mount_point}"
-            run_command(:command => command)
+            shell_out!(command)
             Chef::Log.info("Mounted #{@new_resource.mount_point}")
           else
             Chef::Log.debug("#{@new_resource.mount_point} is already mounted.")
@@ -98,8 +95,7 @@ class Chef
 
         def umount_fs
           if @current_resource.mounted
-            command = "umount #{@new_resource.mount_point}"
-            run_command(:command => command)
+            shell_out!("umount #{@new_resource.mount_point}")
             Chef::Log.info("Unmounted #{@new_resource.mount_point}")
           else
             Chef::Log.debug("#{@new_resource.mount_point} is not mounted.")
@@ -108,8 +104,7 @@ class Chef
 
         def remount_fs
           if @current_resource.mounted and @new_resource.supports[:remount]
-            command = "mount -o remount #{@new_resource.mount_point}"
-            run_command(:command => command)
+            shell_out!("mount -o remount #{@new_resource.mount_point}")
 
             @new_resource.updated = true
             Chef::Log.info("Remounted #{@new_resource.mount_point}")
@@ -123,14 +118,12 @@ class Chef
         end
 
         def enable_fs
+          if @current_resource.enabled && mount_options_unchanged?
+            Chef::Log.debug("#{@new_resource.mount_point} is already enabled.")
+            return nil
+          end
+          
           if @current_resource.enabled
-            if @current_resource.fstype == @new_resource.fstype and
-                @current_resource.options == @new_resource.options and
-                @current_resource.dump == @new_resource.dump and
-                @current_resource.pass == @new_resource.pass
-              Chef::Log.debug("#{@new_resource.mount_point} is already enabled.")
-              return
-            end
             # The current options don't match what we have, so
             # disable, then enable.
             disable_fs
@@ -214,6 +207,14 @@ class Chef
             device_fstab
           end
         end
+        
+        def mount_options_unchanged?
+          @current_resource.fstype == @new_resource.fstype and
+          @current_resource.options == @new_resource.options and
+          @current_resource.dump == @new_resource.dump and
+          @current_resource.pass == @new_resource.pass
+        end
+        
       end
     end
   end

data/lib/chef/provider/package.rb

@@ -30,8 +30,8 @@ class Chef
       
       attr_accessor :candidate_version
       
-      def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
-        super(node, new_resource, collection, definitions, cookbook_loader)
+      def initialize(new_resource, run_context)
+        super
         @candidate_version = nil
       end
       
@@ -75,29 +75,28 @@ class Chef
       end
       
       def action_remove        
-        if should_remove_package(@current_resource.version, @new_resource.version)
+        if removing_package?
           Chef::Log.info("Removing #{@new_resource}")
           remove_package(@current_resource.package_name, @new_resource.version)
           @new_resource.updated = true
+        else
         end
       end
       
-      def should_remove_package(current_version, new_version)
-        to_remove_package = false
-        if current_version != nil
-          if new_version != nil 
-            if new_version == current_version
-              to_remove_package = true
-            end
-          else
-            to_remove_package = true
-          end
+      def removing_package?
+        if @current_resource.version.nil?
+          false # nothing to remove
+        elsif @new_resource.version.nil?
+          true # remove any version of a package
+        elsif @new_resource.version == @current_resource.version
+          true # remove the version we have
+        else
+          false # we don't have the version we want to remove
         end
-        to_remove_package
       end
       
       def action_purge
-        if should_remove_package(@current_resource.version, @new_resource.version)
+        if removing_package?
           Chef::Log.info("Purging #{@new_resource}")
           purge_package(@current_resource.package_name, @new_resource.version)
           @new_resource.updated = true
@@ -124,31 +123,32 @@ class Chef
         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)        
-        full_cache_dir = Chef::FileCache.create_cache_path("preseed/#{@new_resource.cookbook_name}")
-        full_cache_file = "#{full_cache_dir}/#{name}-#{version}.seed"
-        cache_path = "preseed/#{@new_resource.cookbook_name}/#{name}-#{version}.seed"
-              
-        Chef::Log.debug("Fetching preseed file to #{cache_path}")
+      def get_preseed_file(name, version)
+        resource = preseed_resource(name, version)
+        Chef::Log.debug("Fetching preseed file to #{resource.path}")
+        resource.run_action('create')
         
-        remote_file = Chef::Resource::RemoteFile.new(
-          full_cache_file,
-          nil,
-          @node
-        )
+        if resource.updated?
+          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}")
+        # The full path where the preseed file will be stored
+        cache_seed_to = "#{file_cache_dir}/#{name}-#{version}.seed"
+
+        Chef::Log.debug("Fetching preseed file to #{cache_seed_to}")
+
+        remote_file = Chef::Resource::CookbookFile.new(cache_seed_to)
         remote_file.cookbook_name = @new_resource.cookbook_name
         remote_file.source(@new_resource.response_file)
         remote_file.backup(false)
         
-        rf_provider = Chef::Platform.provider_for_node(@node, remote_file)
-        rf_provider.load_current_resource
-        rf_provider.action_create
-        
-        if remote_file.updated
-          Chef::FileCache.load(cache_path, false)
-        else
-          false
-        end
+        remote_file
       end
 
       def expand_options(options)

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

@@ -24,12 +24,20 @@ class Chef
   class Provider
     class Package
       class Dpkg < Chef::Provider::Package::Apt
+        DPKG_INFO = /([a-z\d\-\+]+)\t([\w\d.-]+)/
+        DPKG_INSTALLED = /^Status: install ok installed/
+        DPKG_VERSION = /^Version: (.+)$/
       
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
           @new_resource.version(nil)
 
+          # if the source was not set, and we're installing, fail
+          if Array(@new_resource.action).include?(:install) && @new_resource.source.nil?
+            raise Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
+          end
+
           # We only -need- source for action install
           if @new_resource.source
             unless ::File.exists?(@new_resource.source)
@@ -39,29 +47,24 @@ class Chef
             # Get information from the package if supplied
             Chef::Log.debug("Checking dpkg status for #{@new_resource.package_name}")
             status = popen4("dpkg-deb -W #{@new_resource.source}") do |pid, stdin, stdout, stderr|
-              stdout.each do |line|
-                if pkginfo = /([a-z\d\-\+]+)\t([\w\d.-]+)/.match(line)
+              stdout.each_line do |line|
+                if pkginfo = DPKG_INFO.match(line)
                   @current_resource.package_name(pkginfo[1])
                   @new_resource.version(pkginfo[2])
                 end
               end
             end
-          else
-            # if the source was not set, and we're installing, fail
-            if @new_resource.action.include?(:install)
-              raise Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
-            end
           end
           
           # Check to see if it is installed
           package_installed = nil
           Chef::Log.debug("Checking install state for #{@current_resource.package_name}")
           status = popen4("dpkg -s #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
-            stdout.each do |line|
+            stdout.each_line do |line|
               case line
-              when /^Status: install ok installed/
+              when DPKG_INSTALLED
                 package_installed = true
-              when /^Version: (.+)$/
+              when DPKG_VERSION
                 if package_installed
                   Chef::Log.debug("Current version is #{$1}")                
                   @current_resource.version($1)