chef 0.7.10 → 0.7.12

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

@@ -70,7 +70,7 @@ class Chef
             end
 
             status = popen4(@node[:command][:ps]) do |pid, stdin, stdout, stderr|
-              stdin.close
+              stdin.close rescue nil
               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|

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

@@ -17,76 +17,22 @@
 #
 
 require 'chef/provider/service'
+require 'chef/provider/service/simple'
 require 'chef/mixin/command'
 
 class Chef
   class Provider
     class Service
-      class Init < Chef::Provider::Service
+      class Init < Chef::Provider::Service::Simple
         
-        def initialize(node, new_resource)
-          super(node, new_resource)
+        def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+          super(node, new_resource, collection, definitions, cookbook_loader)
           @init_command = "/etc/init.d/#{@new_resource.service_name}"
         end
 
-        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(:command => @new_resource.status_command) == 0
-                @current_resource.running true
-              end
-            rescue Chef::Exceptions::Exec
-              @current_resource.running false
-              nil
-            end
-
-          elsif @new_resource.supports[:status]
-            Chef::Log.debug("#{@new_resource} supports status, running")
-
-            begin
-              if run_command(:command => "#{@init_command} status") == 0
-                @current_resource.running true
-              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
-
-          @current_resource
-        end
-
         def start_service
           if @new_resource.start_command
-            run_command(:command => @new_resource.start_command)
+            super
           else
             run_command(:command => "#{@init_command} start")
           end
@@ -94,7 +40,7 @@ class Chef
 
         def stop_service
           if @new_resource.stop_command
-            run_command(:command => @new_resource.stop_command)
+            super
           else
             run_command(:command => "#{@init_command} stop")
           end
@@ -102,7 +48,7 @@ class Chef
 
         def restart_service
           if @new_resource.restart_command
-            run_command(:command => @new_resource.restart_command)
+            super
           elsif @new_resource.supports[:restart]
             run_command(:command => "#{@init_command} restart")
           else
@@ -114,12 +60,11 @@ class Chef
 
         def reload_service
           if @new_resource.reload_command
-            run_command(:command => @new_resource.reload_command)
+            super
           elsif @new_resource.supports[:reload]
             run_command(:command => "#{@init_command} reload")
           end
         end
-
       end
     end
   end

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

@@ -25,8 +25,8 @@ class Chef
     class Service
       class Redhat < Chef::Provider::Service::Init
         
-        def initialize(node, new_resource)
-           super(node, new_resource)
+        def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+          super(node, new_resource, collection, definitions, cookbook_loader)
            @init_command = "/sbin/service #{@new_resource.service_name}"
          end
         

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

@@ -0,0 +1,115 @@
+#
+# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
+# Copyright:: Copyright (c) 2009 Mathieu Sauve-Frankel
+# 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/mixin/command'
+
+class Chef
+  class Provider
+    class Service
+      class Simple < Chef::Provider::Service
+        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(:command => @new_resource.status_command) == 0
+                @current_resource.running true
+              end
+            rescue Chef::Exceptions::Exec
+              @current_resource.running false
+              nil
+            end
+
+          elsif @new_resource.supports[:status]
+            Chef::Log.debug("#{@new_resource} supports status, running")
+
+            begin
+              if run_command(:command => "#{@init_command} status") == 0
+                @current_resource.running true
+              end
+            rescue Chef::Exceptions::Exec
+              @current_resource.running false
+              nil
+            end
+          elsif
+            Chef::Log.warn "#{@new_resource}: 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 'command.ps' attribute"
+            end
+            status = popen4(@node[:command][:ps]) do |pid, stdin, stdout, stderr|
+              stdin.close rescue nil
+              r = Regexp.new(@new_resource.pattern)
+              Chef::Log.warn "#{@new_resource}: attempting to match '#{@new_resource.pattern}' (#{r}) against process list"
+              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}: running: #{@current_resource.running}"
+            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
+      end
+    end
+  end
+end

data/lib/chef/provider/subversion.rb

@@ -0,0 +1,145 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.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.
+#
+
+
+require 'chef/log'
+require 'chef/provider'
+require 'chef/mixin/command'
+require 'fileutils'
+
+class Chef
+  class Provider
+    class Subversion < Chef::Provider
+      
+      include Chef::Mixin::Command
+      
+      def load_current_resource
+        @current_resource = Chef::Resource::Subversion.new(@new_resource.name)
+        if current_revision = find_current_revision
+          @current_resource.revision current_revision
+        end
+      end
+      
+      def action_checkout
+        run_command(run_options(:command => checkout_command))
+      end
+      
+      def action_export
+        run_command(run_options(:command => export_command))
+      end
+      
+      def action_sync
+        if !::File.exist?(@new_resource.destination + "/.svn") || ::Dir.entries(@new_resource.destination) == ['.','..']
+          action_checkout
+        else
+          run_command(run_options(:command => sync_command))
+        end
+      end
+      
+      def sync_command
+        Chef::Log.info "Updating working copy #{@new_resource.destination} to revision #{@new_resource.revision}"
+        scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination
+      end
+      
+      def checkout_command
+        Chef::Log.info "checking out #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
+        scm :checkout, @new_resource.svn_arguments, verbose, authentication, 
+            "-r#{revision_int}", @new_resource.repository, @new_resource.destination
+      end
+      
+      def export_command
+        Chef::Log.info "exporting #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
+        scm :export, @new_resource.svn_arguments, verbose, authentication,
+            "-r#{revision_int}", @new_resource.repository, @new_resource.destination
+      end
+      
+      # If the specified revision isn't an integer ("HEAD" for example), look
+      # up the revision id by asking the server
+      # If the specified revision is an integer, trust it.
+      def revision_int
+        @revision_int ||= begin
+          if @new_resource.revision =~ /^\d+$/
+            @new_resource.revision
+          else
+            command = scm(:info, @new_resource.repository, authentication, "-r#{@new_resource.revision}")
+            status, svn_info, error_message = output_of_command(command, run_options)
+            handle_command_failures(status, "STDOUT: #{svn_info}\nSTDERR: #{error_message}")
+            extract_revision_info(svn_info)
+          end
+        end
+      end
+      
+      alias :revision_slug :revision_int
+      
+      def find_current_revision
+        return nil unless ::File.exist?(@new_resource.destination)
+        command = scm(:info)
+        status, svn_info, error_message = output_of_command(command, run_options(:cwd => cwd))
+        
+        unless [0,1].include?(status.exitstatus)
+          handle_command_failures(status, "STDOUT: #{svn_info}\nSTDERR: #{error_message}")
+        end
+        extract_revision_info(svn_info)
+      end
+      
+      def run_options(run_opts={})
+        run_opts[:user] = @new_resource.user if @new_resource.user
+        run_opts
+      end
+      
+      private
+      
+      def cwd
+        @new_resource.destination
+      end
+      
+      def verbose
+        "-q"
+      end
+      
+      def extract_revision_info(svn_info)
+        begin
+          repo_attrs = YAML.load(svn_info)
+        rescue ArgumentError
+          # YAML doesn't appreciate input like "svn: '/tmp/deploydir' is not a working copy\n"
+          return nil
+        end
+        raise "tried to run `#{command}' and got unexpected result #{result.inspect}" unless repo_attrs.kind_of?(Hash)
+        rev = (repo_attrs['Last Changed Rev'] || repo_attrs['Revision']).to_s
+        Chef::Log.debug "Resolved revision #{@new_resource.revision} to #{rev}"
+        rev
+      end
+      
+      # If a username is configured for the SCM, return the command-line
+      # switches for that. Note that we don't need to return the password
+      # switch, since Capistrano will check for that prompt in the output
+      # and will respond appropriately.
+      def authentication
+        return "" unless @new_resource.svn_username
+        result = "--username #{@new_resource.svn_username} "
+        result << "--password #{@new_resource.svn_password} "
+        result
+      end
+      
+      def scm(*args)
+        ['svn', *args].compact.join(" ")
+      end
+
+    end
+  end
+end

data/lib/chef/provider/template.rb

@@ -39,6 +39,8 @@ class Chef
         
         cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
         
+        Chef::Log.debug("looking for template #{@new_resource.source} in cookbook #{cookbook_name.inspect}")
+        
         cache_file_name = "cookbooks/#{cookbook_name}/templates/default/#{@new_resource.source}"
         template_cache_name = "#{cookbook_name}_#{@new_resource.source}"
         

data/lib/chef/provider/user.rb

@@ -29,8 +29,8 @@ class Chef
       
       attr_accessor :user_exists, :locked
       
-      def initialize(node, new_resource)
-        super(node, new_resource)
+      def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+        super(node, new_resource, collection, definitions, cookbook_loader)
         @user_exists = true
         @locked = nil
       end

data/lib/chef/recipe.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +21,7 @@ require 'chef/resource'
 Dir[File.join(File.dirname(__FILE__), 'resource/**/*.rb')].sort.each { |lib| require lib }
 require 'chef/mixin/from_file'
 require 'chef/mixin/language'
+require 'chef/mixin/recipe_definition_dsl_core'
 require 'chef/resource_collection'
 require 'chef/cookbook_loader'
 require 'chef/rest'
@@ -30,7 +32,8 @@ class Chef
     
     include Chef::Mixin::FromFile
     include Chef::Mixin::Language
-        
+    include Chef::Mixin::RecipeDefinitionDSLCore
+    
     attr_accessor :cookbook_name, :recipe_name, :recipe, :node, :collection, 
                   :definitions, :params, :cookbook_loader
     
@@ -38,25 +41,9 @@ class Chef
       @cookbook_name = cookbook_name
       @recipe_name = recipe_name
       @node = node
-      
-      if collection
-        @collection = collection
-      else
-        @collection = Chef::ResourceCollection.new()
-      end
-      
-      if definitions
-        @definitions = definitions
-      else
-        @definitions = Hash.new
-      end
-      
-      if cookbook_loader
-        @cookbook_loader = cookbook_loader
-      else
-        @cookbook_loader = Chef::CookbookLoader.new()
-      end
-      
+      @collection = collection || Chef::ResourceCollection.new
+      @definitions = definitions || Hash.new
+      @cookbook_loader = cookbook_loader || Chef::CookbookLoader.new
       @params = Hash.new      
     end
     
@@ -152,59 +139,6 @@ class Chef
         @node[:tags].delete(tag)
       end
     end
-        
-    def method_missing(method_symbol, *args, &block)
-      resource = nil
-      # If we have a definition that matches, we want to use that instead.  This should
-      # let you do some really crazy over-riding of "native" types, if you really want
-      # to. 
-      if @definitions.has_key?(method_symbol)
-        # This dupes the high level object, but we still need to dup the params
-        new_def = @definitions[method_symbol].dup
-        new_def.params = new_def.params.dup
-        new_def.node = @node
-        # This sets up the parameter overrides
-        new_def.instance_eval(&block) if block
-        new_recipe = Chef::Recipe.new(@cookbook_name, @recipe_name, @node, @collection, @definitions, @cookbook_loader)
-        new_recipe.params = new_def.params
-        new_recipe.params[:name] = args[0]
-        new_recipe.instance_eval(&new_def.recipe)
-      else
-        method_name = method_symbol.to_s
-        # Otherwise, we're rocking the regular resource call route.
-        rname = nil
-        regexp = %r{^(.+?)(_(.+))?$}
-
-        mn = method_name.match(regexp)
-        if mn
-          rname = "Chef::Resource::#{mn[1].capitalize}"
-
-          while mn && mn[3]
-            mn = mn[3].match(regexp)          
-            rname << mn[1].capitalize if mn
-          end
-        end
-
-        begin
-          args << @collection
-          args << @node
-          resource = eval(rname).new(*args)
-          # If we have a resource like this one, we want to steal it's state
-          resource.load_prior_resource
-          resource.cookbook_name = @cookbook_name
-          resource.recipe_name = @recipe_name
-          resource.params = @params
-          resource.instance_eval(&block) if block
-        rescue Exception => e
-          if e.kind_of?(NameError) && e.to_s =~ /Chef::Resource/
-            raise NameError, "Cannot find #{rname} for #{method_name}\nOriginal: #{e.to_s}"
-          else
-            raise e
-          end
-        end
-        @collection << resource
-        resource
-      end
-    end
+    
   end
 end