chef 0.7.16 → 0.8.2

data/lib/chef/provider/user/useradd.rb

@@ -97,6 +97,7 @@ class Chef
               opts << " -d '#{@new_resource.home}'"
             end
           end
+          opts << " -o" if @new_resource.supports[:non_unique]
           opts << " #{@new_resource.username}"
           opts
         end

data/lib/chef/recipe.rb

@@ -21,17 +21,18 @@ 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/language_include_recipe'
 require 'chef/mixin/recipe_definition_dsl_core'
 require 'chef/resource_collection'
 require 'chef/cookbook_loader'
 require 'chef/rest'
-require 'chef/search/result'
 
 class Chef
   class Recipe
     
     include Chef::Mixin::FromFile
     include Chef::Mixin::Language
+    include Chef::Mixin::LanguageIncludeRecipe
     include Chef::Mixin::RecipeDefinitionDSLCore
     
     attr_accessor :cookbook_name, :recipe_name, :recipe, :node, :collection, 
@@ -47,50 +48,10 @@ class Chef
       @params = Hash.new      
     end
     
-    def include_recipe(*args)
-      args.flatten.each do |recipe|
-        if @node.run_state[:seen_recipes].has_key?(recipe)
-          Chef::Log.debug("I am not loading #{recipe}, because I have already seen it.")
-          next
-        end        
-
-        Chef::Log.debug("Loading Recipe #{recipe} via include_recipe")
-        @node.run_state[:seen_recipes][recipe] = true
-        
-        rmatch = recipe.match(/(.+?)::(.+)/)
-        if rmatch
-          cookbook = @cookbook_loader[rmatch[1]]
-          cookbook.load_recipe(rmatch[2], @node, @collection, @definitions, @cookbook_loader)
-        else
-          cookbook = @cookbook_loader[recipe]
-          cookbook.load_recipe("default", @node, @collection, @definitions, @cookbook_loader)
-        end
-      end
-    end
-    
-    def require_recipe(*args)
-      include_recipe(*args)
-    end
-    
     def resources(*args)
       @collection.resources(*args)
     end
     
-    def search(type, query, attributes=[], &block)
-      Chef::Log.debug("Searching #{type} index with #{query}")
-      r = Chef::REST.new(Chef::Config[:search_url])
-
-      results = r.get_rest("search/#{type}?q=#{query}&a=#{attributes.join(',')}")
-      Chef::Log.debug("Searching #{type} index with #{query} returned #{results.length} entries")
-      if block
-        results.each do |sr|
-          block.call(sr)
-        end
-      else
-        results
-      end
-    end
-    
     # Sets a tag, or list of tags, for this node.  Syntactic sugar for
     # @node[:tags].  
     #

data/lib/chef/resource.rb

@@ -33,7 +33,7 @@ class Chef
     include Chef::Mixin::ConvertToClassName
     
     attr_accessor :actions, :params, :provider, :updated, :allowed_actions, :collection, :cookbook_name, :recipe_name, :enclosing_provider
-    attr_reader :resource_name, :source_line, :node
+    attr_reader :resource_name, :source_line, :node, :not_if_args, :only_if_args
     
     def initialize(name, collection=nil, node=nil)
       @name = name
@@ -54,7 +54,9 @@ class Chef
       @supports = {}
       @ignore_failure = false
       @not_if = nil
+      @not_if_args = {}
       @only_if = nil
+      @only_if_args = {}
       sline = caller(4).shift
       if sline
         @source_line = sline.gsub!(/^(.+):(.+):.+$/, '\1 line \2')
@@ -219,20 +221,24 @@ class Chef
       instance_vars
     end
     
-    def only_if(arg=nil, &blk)
+    def only_if(arg=nil, args = {}, &blk)
       if Kernel.block_given?
         @only_if = blk
+        @only_if_args = args
       else
         @only_if = arg if arg
+        @only_if_args = args if arg
       end
       @only_if
     end
     
-    def not_if(arg=nil, &blk)
+    def not_if(arg=nil, args = {}, &blk)
       if Kernel.block_given?
         @not_if = blk
+        @not_if_args = args
       else
         @not_if = arg if arg
+        @not_if_args = args if arg
       end
       @not_if
     end

data/lib/chef/resource/breakpoint.rb

@@ -0,0 +1,35 @@
+#
+# 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/resource'
+
+class Chef
+  class Resource
+    class Breakpoint < Chef::Resource
+      
+      def initialize(action="break", *args)
+        @name = caller.first
+        super(@name, *args)
+        @action = "break"
+        @allowed_actions << :break
+        @provider = Chef::Provider::Breakpoint
+      end
+    end
+  end
+end

data/lib/chef/resource/deploy.rb

@@ -70,13 +70,14 @@ class Chef
         @enable_submodules = false
         @shallow_clone = false
         @scm_provider = Chef::Provider::Git
+        @svn_force_export = false
         @provider = Chef::Provider::Deploy::Timestamped
         @allowed_actions.push(:force_deploy, :deploy, :rollback)
       end
       
       # where the checked out/cloned code goes
       def destination
-        @destination ||= shared_path + "/#{@repository_cache}/"
+        @destination ||= shared_path + "/#{@repository_cache}"
       end
       
       # where shared stuff goes, i.e., logs, tmp, etc. goes here
@@ -244,13 +245,26 @@ class Chef
       end
       
       def scm_provider(arg=nil)
+        klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
+                  lookup_provider_constant(arg)
+                else
+                  arg
+                end
         set_or_return(
           :scm_provider,
-          arg,
+          klass,
           :kind_of => [ Class ]
         )
       end
       
+      def svn_force_export(arg=nil)
+        set_or_return(
+          :svn_force_export,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+      
       def environment(arg=nil)
         if arg.is_a?(String)
           Chef::Log.info "Setting RAILS_ENV, RACK_ENV, and MERB_ENV to `#{arg}'"

data/lib/chef/resource/easy_install_package.rb

@@ -0,0 +1,41 @@
+#
+# 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/resource/package'
+
+class Chef
+  class Resource
+    class EasyInstallPackage < Chef::Resource::Package
+
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :easy_install_package
+        @provider = Chef::Provider::Package::EasyInstall
+      end
+
+      def easy_install_binary(arg=nil)
+        set_or_return(
+          :easy_install_binary,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+    end
+  end
+end

data/lib/chef/resource/erl_call.rb

@@ -0,0 +1,83 @@
+#
+# 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/resource'
+
+class Chef
+  class Resource
+    class ErlCall < Chef::Resource
+
+      # erl_call : http://erlang.org/doc/man/erl_call.html
+
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :erl_call
+
+        @code = "q()." # your erlang code goes here
+        @cookie = nil # cookie of the erlang node
+        @distributed = false # if you want to have a distributed erlang node
+        @name_type = "sname" # type of erlang hostname name or sname
+        @node_name = "chef@localhost" # the erlang node hostname
+
+        @action = "run"
+        @allowed_actions.push(:run)
+      end
+
+      def code(arg=nil)
+        set_or_return(
+          :code,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def cookie(arg=nil)
+        set_or_return(
+          :cookie,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def distributed(arg=nil)
+        set_or_return(
+          :distributed,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def name_type(arg=nil)
+        set_or_return(
+          :name_type,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def node_name(arg=nil)
+        set_or_return(
+          :node_name,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+    end
+  end
+end

data/lib/chef/resource/freebsd_package.rb

@@ -0,0 +1,35 @@
+#
+# Author:: AJ Christensen (<aj@opscode.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/resource/package'
+require 'chef/provider/package/freebsd'
+
+class Chef
+  class Resource
+    class FreebsdPackage < Chef::Resource::Package
+        
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :freebsd_package
+        @provider = Chef::Provider::Package::Freebsd
+      end
+      
+    end
+  end
+end
+

data/lib/chef/resource/log.rb

@@ -0,0 +1,62 @@
+#
+# 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 Resource
+
+    # Sends a string from a recipe to a log provider
+    #
+    # log "some string to log" do
+    #   level :info  # (default)  also supports :warn, :debug, and :error
+    # end
+    #    
+    # === Example
+    # log "your string to log" 
+    #
+    # or 
+    #
+    # log "a debug string" { level :debug }
+    #  
+    class Log < Chef::Resource
+      
+      # Initialize log resource with a name as the string to log 
+      #
+      # === Parameters
+      # name<String>:: Message to log
+      # collection<Array>:: Collection of included recipes
+      # node<Chef::Node>:: Node where resource will be used
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :log
+        @level = :info
+        @action = :write
+      end
+      
+      # <Symbol> Log level, one of :debug, :info, :warn, :error or :fatal
+      def level(arg=nil)
+        set_or_return(
+          :level,
+          arg,
+          :equal_to => [ :debug, :info, :warn, :error, :fatal ]
+        )
+      end
+      
+    end
+  end  
+end
+
+

data/lib/chef/resource/mdadm.rb

@@ -0,0 +1,82 @@
+#
+# 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/resource'
+
+class Chef
+  class Resource
+    class Mdadm < Chef::Resource
+
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :mdadm
+
+        @chunk = 16
+        @devices = []
+        @exists = false
+        @level = 1
+        @raid_device = name
+
+        @action = :create
+        @allowed_actions.push(:create, :assemble, :stop)
+      end
+
+      def chunk(arg=nil)
+        set_or_return(
+          :chunk,
+          arg,
+          :kind_of => [ Integer ]
+        )
+      end
+
+      def devices(arg=nil)
+        set_or_return(
+          :devices,
+          arg,
+          :kind_of => [ Array ]
+        )
+      end
+
+      def exists(arg=nil)
+        set_or_return(
+          :exists,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def level(arg=nil)
+        set_or_return(
+          :level,
+          arg,
+          :kind_of => [ Integer ]
+        )
+      end
+
+      def raid_device(arg=nil)
+        set_or_return(
+          :raid_device,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+
+    end
+  end
+end