chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/platform.rb

@@ -47,6 +47,13 @@ class Chef
               :group => Chef::Provider::Group::Dscl
             }
           },
+          :mac_os_x_server => {
+            :default => {
+              :package => Chef::Provider::Package::Macports,
+              :user => Chef::Provider::User::Dscl,
+              :group => Chef::Provider::Group::Dscl
+            }
+          },
           :freebsd => {
             :default => {
               :group   => Chef::Provider::Group::Pw,
@@ -182,6 +189,26 @@ class Chef
               :group => Chef::Provider::Group::Usermod
             }
           },
+          :netbsd => {
+            :default => {
+              :group => Chef::Provider::Group::Usermod
+            }
+          },
+          :openbsd => {
+            :default => {
+              :group => Chef::Provider::Group::Usermod
+            }
+          },
+          :hpux => {
+            :default => {
+              :group => Chef::Provider::Group::Usermod
+            }
+          },
+          :aix => {
+            :default => {
+              :group => Chef::Provider::Group::Aix
+            }
+          },
           :default  => {
             :file => Chef::Provider::File,
             :directory => Chef::Provider::Directory,

data/lib/chef/provider/cookbook_file.rb

@@ -23,7 +23,7 @@ require 'tempfile'
 class Chef
   class Provider
     class CookbookFile < Chef::Provider::File
-      
+
       def load_current_resource
         @current_resource = Chef::Resource::CookbookFile.new(@new_resource.name)
         @new_resource.path.gsub!(/\\/, "/") # for Windows
@@ -33,21 +33,22 @@ class Chef
 
 
       def action_create
-         if file_cache_location && content_stale?
-           Chef::Log.debug("content of file #{@new_resource.path} requires update")
-           backup_new_resource
-           Tempfile.open(::File.basename(@new_resource.name)) do |staging_file|
-             Chef::Log.debug("staging #{file_cache_location} to #{staging_file.path}")
-             staging_file.close
-             stage_file_to_tmpdir(staging_file.path)
-             FileUtils.mv(staging_file.path, @new_resource.path)
-           end
-           @new_resource.updated_by_last_action(true)
-         else
-           set_all_access_controls(@new_resource.path)
-         end
-         @new_resource.updated_by_last_action?
-       end
+        assert_enclosing_directory_exists!
+        if file_cache_location && content_stale?
+          Chef::Log.debug("content of file #{@new_resource.path} requires update")
+          backup_new_resource
+          Tempfile.open(::File.basename(@new_resource.name)) do |staging_file|
+            Chef::Log.debug("staging #{file_cache_location} to #{staging_file.path}")
+            staging_file.close
+            stage_file_to_tmpdir(staging_file.path)
+            FileUtils.mv(staging_file.path, @new_resource.path)
+          end
+          @new_resource.updated_by_last_action(true)
+        else
+          set_all_access_controls(@new_resource.path)
+        end
+        @new_resource.updated_by_last_action?
+      end
 
       def action_create_if_missing
         if ::File.exists?(@new_resource.path)
@@ -56,21 +57,21 @@ class Chef
           action_create
         end
       end
-      
+
       def file_cache_location
         @file_cache_location ||= begin
           cookbook = run_context.cookbook_collection[resource_cookbook]
           cookbook.preferred_filename_on_disk_location(node, :files, @new_resource.source, @new_resource.path)
         end
       end
-      
-      # Determine the cookbook to get the file from. If new resource sets an 
+
+      # Determine the cookbook to get the file from. If new resource sets an
       # explicit cookbook, use it, otherwise fall back to the implicit cookbook
       # i.e., the cookbook the resource was declared in.
       def resource_cookbook
         @new_resource.cookbook || @new_resource.cookbook_name
       end
-      
+
       # Copy the file from the cookbook cache to a temporary location and then
       # set its file access control settings.
       def stage_file_to_tmpdir(staging_file_location)

data/lib/chef/provider/deploy/revision.rb

@@ -1,6 +1,9 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Author:: Seth Falcon (<seth@opscode.com>)
 # Copyright:: Copyright (c) 2009 Daniel DeLeo
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/provider/file.rb

@@ -75,12 +75,12 @@ class Chef
         return false if @new_resource.owner.nil?
 
         @set_user_id = case @new_resource.owner
-                       when /^\d+$/, Integer
-                         @new_resource.owner.to_i
-                       else
-                         # This raises an ArgumentError if you can't find the user
-                         Etc.getpwnam(@new_resource.owner).uid
-                       end
+        when /^\d+$/, Integer
+          @new_resource.owner.to_i
+        else
+          # This raises an ArgumentError if you can't find the user
+          Etc.getpwnam(@new_resource.owner).uid
+        end
 
         @set_user_id == @current_resource.owner
       end
@@ -100,11 +100,11 @@ class Chef
         return false if @new_resource.group.nil?
 
         @set_group_id = case @new_resource.group
-                        when /^\d+$/, Integer
-                          @new_resource.group.to_i
-                        else
-                          Etc.getgrnam(@new_resource.group).gid
-                        end
+        when /^\d+$/, Integer
+          @new_resource.group.to_i
+        else
+          Etc.getgrnam(@new_resource.group).gid
+        end
 
         @set_group_id == @current_resource.group
       end
@@ -137,6 +137,7 @@ class Chef
       end
 
       def action_create
+        assert_enclosing_directory_exists!
         unless ::File.exists?(@new_resource.path)
           Chef::Log.info("Creating #{@new_resource} at #{@new_resource.path}")
           ::File.open(@new_resource.path, "w+") {|f| f.write @new_resource.content }
@@ -205,6 +206,14 @@ class Chef
 
       private
 
+      def assert_enclosing_directory_exists!
+        enclosing_dir = ::File.dirname(@new_resource.path)
+        unless ::File.directory?(enclosing_dir)
+          msg = "Cannot create a file at #{@new_resource.path} because the enclosing directory (#{enclosing_dir}) does not exist"
+          raise Chef::Exceptions::EnclosingDirectoryDoesNotExist, msg
+        end
+      end
+
       def new_resource_content_checksum
         @new_resource.content && Digest::SHA2.hexdigest(@new_resource.content)
       end

data/lib/chef/provider/git.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,16 +25,16 @@ require 'fileutils'
 class Chef
   class Provider
     class Git < Chef::Provider
-      
+
       include Chef::Mixin::Command
-      
+
       def load_current_resource
         @current_resource = Chef::Resource::Git.new(@new_resource.name)
         if current_revision = find_current_revision
           @current_resource.revision current_revision
         end
       end
-      
+
       def action_checkout
         assert_target_directory_valid!
 
@@ -47,13 +47,13 @@ class Chef
           Chef::Log.info "Taking no action, checkout destination #{@new_resource.destination} already exists or is a non-empty directory"
         end
       end
-      
+
       def action_export
         action_checkout
         FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
         @new_resource.updated_by_last_action(true)
       end
-      
+
       def action_sync
         assert_target_directory_valid!
 
@@ -92,7 +92,7 @@ class Chef
       def find_current_revision
         if ::File.exist?(::File.join(cwd, ".git"))
           status, result, error_message = output_of_command("git rev-parse HEAD", run_options(:cwd=>cwd))
-          
+
           # 128 is returned when we're not in a git repo. this is fine
           unless [0,128].include?(status.exitstatus)
             handle_command_failures(status, "STDOUT: #{result}\nSTDERR: #{error_message}")
@@ -100,27 +100,27 @@ class Chef
         end
         sha_hash?(result) ? result : nil
       end
-      
+
       def clone
         remote = @new_resource.remote
 
         args = []
         args << "-o #{remote}" unless remote == 'origin'
         args << "--depth #{@new_resource.depth}" if @new_resource.depth
-        
+
         Chef::Log.info "Cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
-        
+
         clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
         run_command(run_options(:command => clone_cmd))
       end
-      
+
       def checkout
         sha_ref = target_revision
         Chef::Log.info "Checking out branch: #{@new_resource.revision} reference: #{sha_ref}"
         # checkout into a local branch rather than a detached HEAD
         run_command(run_options(:command => "git checkout -b deploy #{sha_ref}", :cwd => @new_resource.destination))
       end
-      
+
       def enable_submodules
         if @new_resource.enable_submodules
           Chef::Log.info "Enabling git submodules"
@@ -128,7 +128,7 @@ class Chef
           run_command(run_options(:command => command, :cwd => @new_resource.destination))
         end
       end
-      
+
       def fetch_updates
         setup_remote_tracking_branches if @new_resource.remote != 'origin'
 
@@ -161,18 +161,18 @@ class Chef
       def target_revision
         @target_revision ||= begin
           assert_revision_not_remote
-          
+
           if sha_hash?(@new_resource.revision)
-            @target_revision = @new_resource.revision 
+            @target_revision = @new_resource.revision
           else
             resolved_reference = remote_resolve_reference
             @target_revision = extract_revision(resolved_reference)
           end
         end
       end
-      
+
       alias :revision_slug :target_revision
-      
+
       def remote_resolve_reference
         command = git('ls-remote', @new_resource.repository, @new_resource.revision)
         Chef::Log.debug("Executing #{command}")
@@ -187,20 +187,20 @@ class Chef
         end
         result
       end
-      
+
       private
-      
+
       def run_options(run_opts={})
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper
         run_opts
       end
-      
+
       def cwd
         @new_resource.destination
       end
-      
+
       def git(*args)
         ["git", *args].compact.join(" ")
       end
@@ -208,18 +208,18 @@ class Chef
       def sha_hash?(string)
         string =~ /^[0-9a-f]{40}$/
       end
-      
+
       def assert_revision_not_remote
         if @new_resource.revision =~ /^origin\//
           reference = @new_resource.revision
           error_text =  "Deploying remote branches is not supported. " +
                         "Specify the remote branch as a local branch for " +
-                        "the git repository you're deploying from " + 
+                        "the git repository you're deploying from " +
                         "(ie: '#{reference.gsub('origin/', '')}' rather than '#{reference}')."
           raise RuntimeError, error_text
         end
       end
-      
+
       def extract_revision(resolved_reference)
         unless resolved_reference =~ /^([0-9a-f]{40})\s+(\S+)/
           msg = "Unable to parse SHA reference for '#{@new_resource.revision}' in repository '#{@new_resource.repository}'. "
@@ -229,7 +229,7 @@ class Chef
         end
         $1
       end
-      
+
     end
   end
 end

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

@@ -0,0 +1,70 @@
+#
+# 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/group/usermod'
+
+class Chef
+  class Provider
+    class Group
+      class Aix < Chef::Provider::Group::Usermod
+
+        def required_binaries
+          [ "/usr/bin/mkgroup",
+            "/usr/bin/chgroup",
+            "/usr/sbin/rmgroup" ]
+        end
+
+        def create_group
+          command = "mkgroup"
+          command << set_options << " #{@new_resource.group_name}"
+          run_command(:command => command)
+          modify_group_members
+        end
+
+        def manage_group
+          command = "chgroup"
+          options = set_options
+          #Usage: chgroup [-R load_module] "attr=value" ... group
+          if options.size > 0
+            command << options << " #{@new_resource.group_name}"
+            run_command(:command => command)
+          end
+          modify_group_members
+        end
+
+        def remove_group
+          run_command(:command => "rmgroup #{@new_resource.group_name}")
+        end
+
+        def set_options
+          opts = ""
+          { :gid => "id" }.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
+          end
+          opts
+        end
+
+      end
+    end
+  end
+end

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

@@ -21,12 +21,15 @@ class Chef
     class Group
       class Groupadd < Chef::Provider::Group
         
-        def load_current_resource
-          super
-          
+        def required_binaries
           [ "/usr/sbin/groupadd",
             "/usr/sbin/groupmod",
-            "/usr/sbin/groupdel" ].each do |required_binary|
+            "/usr/sbin/groupdel" ]
+        end
+
+        def load_current_resource
+          super
+          required_binaries.each do |required_binary|
             raise Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}" unless ::File.exists?(required_binary)
           end
         end

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

@@ -31,7 +31,7 @@ class Chef
 
         def modify_group_members
           case node[:platform]
-          when "openbsd", "netbsd"
+          when "openbsd", "netbsd", "aix"
             append_flags = "-G"
           when "solaris"
             append_flags = "-a -G"