chef 0.7.16 → 0.8.2

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

@@ -53,8 +53,7 @@ class Chef
         def load_cache
           begin
             JSON.parse(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
-          rescue
-            Chef::Exceptions::FileNotFound
+          rescue Chef::Exceptions::FileNotFound
             save_cache([])
           end
         end
@@ -67,4 +66,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/provider/erl_call.rb

@@ -0,0 +1,72 @@
+#
+# Author:: Joe Williams (<joe@joetify.com>)
+# Copyright:: Copyright (c) 2009 Joe Williams
+# 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/log'
+require 'chef/mixin/command'
+require 'chef/provider'
+
+class Chef
+  class Provider
+    class ErlCall < Chef::Provider
+      include Chef::Mixin::Command
+
+      def initialize(node, new_resource)
+        super(node, new_resource)
+      end
+
+      def load_current_resource
+        true
+      end
+
+      def action_run
+        case @new_resource.name_type
+        when "sname"
+          node = "-sname #{@new_resource.node_name}"
+        when "name"
+          node = "-name #{@new_resource.node_name}"
+        end
+
+        if @new_resource.cookie
+          cookie = "-c #{@new_resource.cookie}"
+        else
+          cookie = ""
+        end
+
+        if @new_resource.distributed
+          distributed = "-s"
+        else
+          distributed = ""
+        end
+
+        command = "erl_call -e #{distributed} #{node} #{cookie}"
+
+        status = popen4(command, :waitlast => true) do |pid, stdin, stdout, stderr|
+          Chef::Log.debug("Running erl_call[#{@new_resource.name}]")
+          Chef::Log.debug("erl_call[#{@new_resource.name}] command: #{command}")
+          Chef::Log.debug("erl_call[#{@new_resource.name}] code: #{@new_resource.code}")
+          @new_resource.code.each { |line| stdin.puts "#{line.chomp!}" }
+          stdin.close
+          Chef::Log.info("Ran erl_call[#{@new_resource.name}] successfully")
+          Chef::Log.debug("erl_call[#{@new_resource.name}] output: ")
+          stdout.each { |line| Chef::Log.debug("#{line}")}
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/provider/file.rb

@@ -165,12 +165,16 @@ class Chef
           time = Time.now
           savetime = time.strftime("%Y%m%d%H%M%S")
           backup_filename = "#{@new_resource.path}.chef-#{savetime}"
-          Chef::Log.info("Backing up #{@new_resource} to #{backup_filename}")
-          FileUtils.cp(file, backup_filename, :preserve => true)
+          prefix = Chef::Config[:file_backup_path] || ""
+          if Chef::Config[:file_backup_path]
+            FileUtils.mkdir_p(::File.dirname(Chef::Config[:file_backup_path] + backup_filename))
+          end
+          Chef::Log.info("Backing up #{@new_resource} to #{prefix + backup_filename}")
+          FileUtils.cp(file, prefix + backup_filename, :preserve => true)
           
           # Clean up after the number of backups
-          slice_number = @new_resource.backup - 1
-          backup_files = Dir["#{@new_resource.path}.chef-*"].sort { |a,b| b <=> a }
+          slice_number = @new_resource.backup
+          backup_files = Dir[prefix + "#{@new_resource.path}.chef-*"].sort { |a,b| b <=> a }
           if backup_files.length >= @new_resource.backup
             remainder = backup_files.slice(slice_number..-1)
             remainder.each do |backup_to_delete|

data/lib/chef/provider/git.rb

@@ -36,10 +36,14 @@ class Chef
       end
       
       def action_checkout
-        clone
-        checkout
-        enable_submodules
-        @new_resource.updated = true
+        if !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination) == ['.','..']
+          clone
+          checkout
+          enable_submodules
+          @new_resource.updated = true
+        else
+          Chef::Log.info "Taking no action, checkout destination #{@new_resource.destination} already exists or is a non-empty directory"
+        end
       end
       
       def action_export
@@ -117,7 +121,7 @@ class Chef
         end
 
         # since we're in a local branch already, just reset to specified revision rather than merge
-        sync_command << "#{git} fetch #{@new_resource.remote} && #{git} reset --hard #{revision}"
+        sync_command << "#{git} fetch #{@new_resource.remote} && #{git} fetch #{@new_resource.remote} --tags && #{git} reset --hard #{revision}"
         Chef::Log.info "Fetching updates from #{new_resource.remote} and resetting to revison #{revision}"
         run_command(run_options(:command => sync_command.join(" && "), :cwd => @new_resource.destination))
       end
@@ -155,6 +159,7 @@ class Chef
       
       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

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

@@ -0,0 +1,128 @@
+#
+# Author:: Dreamcat4 (<dreamcat4@gmail.com>)
+# Copyright:: Copyright (c) 2009 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.
+#
+
+class Chef
+  class Provider
+    class Group
+      class Dscl < Chef::Provider::Group
+
+        def dscl(*args)
+          host = "."
+          stdout_result = ""; stderr_result = ""; cmd = "dscl #{host} -#{args.join(' ')}"
+          status = popen4(cmd) do |pid, stdin, stdout, stderr|
+            stdout.each { |line| stdout_result << line }
+            stderr.each { |line| stderr_result << line }
+          end
+          return [cmd, status, stdout_result, stderr_result]
+        end
+
+        def safe_dscl(*args)
+          result = dscl(*args)
+          return "" if ( args.first =~ /^delete/ ) && ( result[1].exitstatus != 0 )
+          raise(Chef::Exceptions::Group,"dscl error: #{result.inspect}") unless result[1].exitstatus == 0
+          raise(Chef::Exceptions::Group,"dscl error: #{result.inspect}") if result[2] =~ /No such key: /
+          return result[2]
+        end
+        
+        # This is handled in providers/group.rb by Etc.getgrnam()
+        # def group_exists?(group)
+        #   groups = safe_dscl("list /Groups")
+        #   !! ( groups =~ Regexp.new("\n#{group}\n") )
+        # end
+
+        # get a free GID greater than 200
+        def get_free_gid(search_limit=1000)
+          gid = nil; next_gid_guess = 200
+          groups_gids = safe_dscl("list /Groups gid")
+          while(next_gid_guess < search_limit + 200)
+            if groups_gids =~ Regexp.new("#{next_gid_guess}\n")
+              next_gid_guess += 1
+            else
+              gid = next_gid_guess
+              break
+            end
+          end
+          return gid || raise("gid not found. Exhausted. Searched #{search_limit} times")
+        end
+
+        def gid_used?(gid)
+          return false unless gid
+          groups_gids = safe_dscl("list /Groups gid")
+          !! ( groups_gids =~ Regexp.new("#{gid}\n") )
+        end
+
+        def set_gid
+          @new_resource.gid(get_free_gid) if [nil,""].include? @new_resource.gid
+          raise(Chef::Exceptions::Group,"gid is already in use") if gid_used?(@new_resource.gid)
+          safe_dscl("create /Groups/#{@new_resource.group_name} PrimaryGroupID #{@new_resource.gid}")
+        end
+
+        def set_members
+          unless @new_resource.append
+            Chef::Log.debug("#{@new_resource}: removing group members #{@current_resource.members.join(' ')}") unless @current_resource.members.empty?
+            safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembers") # clear guid list
+            safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembership") # clear user list
+          end
+          Chef::Log.debug("#{@new_resource}: setting group members #{@new_resource.members.join(', ')}") unless @new_resource.members.empty?
+          safe_dscl("append /Groups/#{@new_resource.group_name} GroupMembership #{@new_resource.members.join(' ')}")
+        end
+
+        def load_current_resource
+          super
+          raise Chef::Exceptions::Group, "Could not find binary /usr/bin/dscl for #{@new_resource}" unless ::File.exists?("/usr/bin/dscl")
+        end
+        
+        def create_group
+          manage_group(false)
+        end
+        
+        def manage_group(manage=true)#
+          fields = []
+          if manage
+            [:group_name,:gid,:members].each do |field|
+              if @current_resource.send(field) != @new_resource.send(field)
+                fields << field if @new_resource.send(field)
+              end
+            end
+          else
+            # create
+            fields = [:group_name,:gid,:members]
+          end
+
+          fields.each do |field|
+            case field
+            when :group_name
+              safe_dscl("create /Groups/#{@new_resource.group_name}")
+              safe_dscl("create /Groups/#{@new_resource.group_name} Password '*'")
+              
+            when :gid
+              set_gid
+              
+            when :members
+              set_members
+            end
+          end
+        end
+        
+        def remove_group
+          safe_dscl("delete /Groups/#{@new_resource.group_name}")
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/http_request.rb

@@ -25,7 +25,7 @@ class Chef
       attr_accessor :rest
       
       def load_current_resource
-        @rest = Chef::REST.new(@new_resource.url)
+        @rest = Chef::REST.new(@new_resource.url, nil, nil)
       end
       
       # Send a GET request to @new_resource.url, with ?message=@new_resource.message
@@ -34,6 +34,7 @@ class Chef
         body = @rest.run_request(
           :GET, 
           @rest.create_url("#{@new_resource.url}?message=#{message}"),
+          {},
           false,
           10,
           false
@@ -49,6 +50,7 @@ class Chef
         body = @rest.run_request(
           :PUT,
           @rest.create_url("#{@new_resource.url}"),
+          {},
           message,
           10,
           false
@@ -64,6 +66,7 @@ class Chef
         body = @rest.run_request(
           :POST,
           @rest.create_url("#{@new_resource.url}"),
+          {},
           message,
           10,
           false
@@ -78,6 +81,7 @@ class Chef
         body = @rest.run_request(
           :DELETE,
           @rest.create_url("#{@new_resource.url}"),
+          {},
           false,
           10,
           false
@@ -99,4 +103,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/provider/ifconfig.rb

@@ -19,6 +19,7 @@
 require 'chef/log'
 require 'chef/mixin/command'
 require 'chef/provider'
+require 'erb'
 
 class Chef
   class Provider

data/lib/chef/provider/link.rb

@@ -114,7 +114,7 @@ class Chef
       end
       
       def action_create
-        if @current_resource.to != @new_resource.to
+        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(

data/lib/chef/provider/log.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Cary Penniman (<cary@rightscale.com>)
+# Copyright:: Copyright (c) 2008 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.
+#
+
+class Chef
+
+  class Provider
+
+    class Log
+
+      # Chef log provider, allows logging to chef's logs from recipes
+      class ChefLog < Chef::Provider
+
+        # No concept of a 'current' resource for logs, this is a no-op
+        #
+        # === Return
+        # true:: Always return true
+        def load_current_resource
+          true
+        end
+      
+        # Write the log to Chef's log
+        #
+        # === Return
+        # true:: Always return true
+        def action_write
+          Chef::Log.send(@new_resource.level, @new_resource.name)
+        end
+
+      end
+
+    end
+
+  end
+
+end
+
+
+

data/lib/chef/provider/mdadm.rb

@@ -0,0 +1,88 @@
+#
+# Author:: Joe Williams (<joe@joetify.com>)
+# Copyright:: Copyright (c) 2009 Joe Williams
+# 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/log'
+require 'chef/mixin/command'
+require 'chef/provider'
+
+class Chef
+  class Provider
+    class Mdadm < Chef::Provider
+
+      include Chef::Mixin::Command
+
+      def initialize(node, new_resource)
+        super(node, new_resource)
+      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
+        @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}"
+          Chef::Log.debug("mdadm command: #{command}")
+          pid, stdin, stdout, stderr = popen4(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})")
+        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}"
+          Chef::Log.debug("mdadm command: #{command}")
+          pid, stdin, stdout, stderr = popen4(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})")
+        end
+      end
+
+      def action_stop
+        if @current_resource.exists
+          command = "yes | mdadm --stop #{@new_resource.raid_device}"
+          Chef::Log.debug("mdadm command: #{command}")
+          pid, stdin, stdout, stderr = popen4(command)
+          Chef::Log.info("Stopped mdadm raid device (#{@new_resource.raid_device})")
+          @new_resource.updated = true
+        else
+          Chef::Log.debug("mdadm raid device doesn't exist (#{@new_resource.raid_device})")
+        end
+      end
+
+    end
+  end
+end