chef 10.34.6 → 11.0.0.beta.0

data/lib/chef/resource/lwrp_base.rb

@@ -0,0 +1,127 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008-2012 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
+
+    # == Chef::Resource::LWRPBase
+    # Base class for LWRP resources. Adds DSL sugar on top of Chef::Resource,
+    # so attributes, default action, etc. can be defined with pleasing syntax.
+    class LWRPBase < Resource
+
+      NULL_ARG = Object.new
+
+      extend Chef::Mixin::ConvertToClassName
+      extend Chef::Mixin::FromFile
+
+      # Evaluates the LWRP resource file and instantiates a new Resource class.
+      def self.build_from_file(cookbook_name, filename, run_context)
+        rname = filename_to_qualified_string(cookbook_name, filename)
+
+        # Add log entry if we override an existing light-weight resource.
+        class_name = convert_to_class_name(rname)
+        overriding = Chef::Resource.const_defined?(class_name)
+        Chef::Log.info("#{class_name} light-weight resource already initialized -- overriding!") if overriding
+
+        resource_class = Class.new(self)
+
+        resource_class.resource_name = rname
+        resource_class.run_context = run_context
+        resource_class.class_from_file(filename)
+
+        Chef::Resource.const_set(class_name, resource_class)
+        Chef::Log.debug("Loaded contents of #{filename} into a resource named #{rname} defined in Chef::Resource::#{class_name}")
+
+        resource_class
+      end
+
+      # Set the resource snake_case name. Should only be called via
+      # build_from_file.
+      def self.resource_name=(resource_name)
+        @resource_name = resource_name
+      end
+
+      # Returns the resource snake_case name
+      def self.resource_name
+        @resource_name
+      end
+
+      # Define an attribute on this resource, including optional validation
+      # parameters.
+      def self.attribute(attr_name, validation_opts={})
+        # Ruby 1.8 doesn't support default arguments to blocks, but we have to
+        # use define_method with a block to capture +validation_opts+.
+        # Workaround this by defining two methods :(
+        class_eval(<<-SHIM, __FILE__, __LINE__)
+          def #{attr_name}(arg=nil)
+            _set_or_return_#{attr_name}(arg)
+          end
+        SHIM
+
+        define_method("_set_or_return_#{attr_name.to_s}".to_sym) do |arg|
+          set_or_return(attr_name.to_sym, arg, validation_opts)
+        end
+      end
+
+      # Sets the default action
+      def self.default_action(action_name=NULL_ARG)
+        unless action_name.equal?(NULL_ARG)
+          valid_actions.push(action_name)
+          @default_action = action_name
+        end
+        @default_action
+      end
+
+      # Adds +action_names+ to the list of valid actions for this resource.
+      def self.actions(*action_names)
+        valid_actions.push(*action_names)
+      end
+
+      def self.valid_actions
+        @valid_actions ||= []
+      end
+
+      # Set the run context on the class. Used to provide access to the node
+      # during class definition.
+      def self.run_context=(run_context)
+        @run_context = run_context
+      end
+
+      def self.run_context
+        @run_context
+      end
+
+      def self.node
+        run_context.node
+      end
+
+      # Default initializer. Sets the default action and allowed actions.
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = self.class.resource_name.to_sym
+        @action = self.class.default_action
+        allowed_actions.push(self.class.valid_actions).flatten!
+      end
+
+    end
+  end
+end

data/lib/chef/resource/mount.rb

@@ -76,21 +76,20 @@ class Chef
           :kind_of => [ String ]
         )
       end
-
+      
       def options(arg=nil)
-        ret = set_or_return(
-                            :options,
-                            arg,
-                            :kind_of => [ Array, String ]
-                            )
-        if ret.is_a? String
-          ret.gsub(/,/, ' ').split(/ /)
+        if arg.is_a?(String)
+          converted_arg = arg.gsub(/,/, ' ').split(/ /)
         else
-          ret
+          converted_arg = arg
         end
-
+        set_or_return(
+          :options,
+          converted_arg,
+          :kind_of => [ Array ]
+        )
       end
-
+      
       def dump(arg=nil)
         set_or_return(
           :dump,

data/lib/chef/resource/registry_key.rb

@@ -0,0 +1,86 @@
+# Author:: Prajakta Purohit (<prajakta@opscode.com>)
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+#
+# Copyright:: 2011, Opscode, Inc.
+#
+# 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/registry_key'
+require 'chef/resource'
+
+class Chef
+  class Resource
+    class RegistryKey < Chef::Resource
+
+      identity_attr :key
+      state_attrs :values
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :registry_key
+        @action = :create
+        @architecture = :machine
+        @recursive = false
+        @key = name
+        @values = []
+        @allowed_actions.push(:create, :create_if_missing, :delete, :delete_key)
+      end
+
+      def key(arg=nil)
+        set_or_return(
+          :key,
+          arg,
+          :kind_of => String
+        )
+      end
+      def values(arg=nil)
+        if not arg.nil?
+          if arg.is_a?(Hash)
+            @values = [ arg ]
+          elsif arg.is_a?(Array)
+            @values = arg
+          else
+            raise ArgumentError, "Bad type for RegistryKey resource, use Hash or Array"
+          end
+          @values.each do |v|
+            raise ArgumentError, "Missing name key in RegistryKey values hash" unless v.has_key?(:name)
+            raise ArgumentError, "Missing type key in RegistryKey values hash" unless v.has_key?(:type)
+            raise ArgumentError, "Missing data key in RegistryKey values hash" unless v.has_key?(:data)
+            v.each_key do |key|
+              raise ArgumentError, "Bad key #{key} in RegistryKey values hash" unless [:name,:type,:data].include?(key)
+            end
+            raise ArgumentError, "Type of name => #{v[:name]} should be string" unless v[:name].is_a?(String)
+            raise Argument Error "Type of type => #{v[:name]} should be symbol" unless v[:type].is_a?(Symbol)
+          end
+        elsif self.instance_variable_defined?(:@values) == true
+          @values
+        end
+      end
+      def recursive(arg=nil)
+        set_or_return(
+          :recursive,
+          arg,
+          :kind_of => [TrueClass, FalseClass]
+        )
+      end
+      def architecture(arg=nil)
+        set_or_return(
+          :architecture,
+          arg,
+          :kind_of => Symbol
+        )
+      end
+
+    end
+  end
+end

data/lib/chef/resource/remote_directory.rb

@@ -51,6 +51,12 @@ class Chef
         @provider = Chef::Provider::RemoteDirectory
       end
 
+      if Chef::Platform.windows?
+        # create a second instance of the 'rights' attribute
+        rights_attribute(:files_rights)
+      end
+
+
       def source(args=nil)
         set_or_return(
           :source,
@@ -83,11 +89,6 @@ class Chef
         )
       end
 
-      if Chef::Platform.windows?
-        # create a second instance of the 'rights' attribute
-        Chef::Mixin::Securable.rights_attribute(:files_rights)
-      end
-
       def files_mode(arg=nil)
         set_or_return(
           :files_mode,

data/lib/chef/resource/remote_file.rb

@@ -32,25 +32,18 @@ class Chef
         super
         @resource_name = :remote_file
         @action = "create"
-        @source = ::File.basename(name)
-        @cookbook = nil
+        @source = nil
         @provider = Chef::Provider::RemoteFile
       end
 
-      def source(args=nil)
-        set_or_return(
-          :source,
-          args,
-          :kind_of => String
-        )
-      end
-
-      def cookbook(args=nil)
-        set_or_return(
-          :cookbook,
-          args,
-          :kind_of => String
-        )
+      def source(*args)
+        if not args.empty?
+          args = Array(args).flatten
+          validate_source(args)
+          @source = args
+        elsif self.instance_variable_defined?(:@source) == true
+          @source
+        end
       end
 
       def checksum(args=nil)
@@ -61,26 +54,24 @@ class Chef
         )
       end
 
-      # The provider that should be used for this resource.
-      # === Returns:
-      # Chef::Provider::RemoteFile    when the source is an absolute URI, like
-      #                               http://www.google.com/robots.txt
-      # Chef::Provider::CookbookFile  when the source is a relative URI, like
-      #                               'myscript.pl', 'dir/config.conf'
-      def provider
-        if absolute_uri?(source)
-          Chef::Provider::RemoteFile
-        else
-          Chef::Log.warn("remote_file is deprecated for fetching files from cookbooks. Use cookbook_file instead")
-          Chef::Log.warn("From #{self.to_s} on #{source_line}")
-          Chef::Provider::CookbookFile
-        end
+      def after_created
+        validate_source(@source)
       end
 
       private
 
+      def validate_source(source)
+        raise ArgumentError, "#{resource_name} has an empty source" if source.empty?
+        source.each do |src|
+          unless absolute_uri?(src)
+            raise Exceptions::InvalidRemoteFileURI,
+              "#{src.inspect} is not a valid `source` parameter for #{resource_name}. `source` must be an absolute URI or an array of URIs."
+          end
+        end
+      end
+
       def absolute_uri?(source)
-        URI.parse(source).absolute?
+        source.kind_of?(String) and URI.parse(source).absolute?
       rescue URI::InvalidURIError
         false
       end

data/lib/chef/resource/ruby_block.rb

@@ -26,8 +26,8 @@ class Chef
       def initialize(name, run_context=nil)
         super
         @resource_name = :ruby_block
-        @action = "create"
-        @allowed_actions.push(:create)
+        @action = "run"
+        @allowed_actions << :create << :run
         @block_name = name
       end
 

data/lib/chef/resource/service.rb

@@ -40,6 +40,7 @@ class Chef
         @status_command = nil
         @restart_command = nil
         @reload_command = nil
+        @init_command = nil
         @priority = nil
         @action = "nothing"
         @startup_type = :automatic
@@ -108,6 +109,19 @@ class Chef
         )
       end
 
+      # The path to the init script associated with the service. On many
+      # distributions this is '/etc/init.d/SERVICE_NAME' by default. In
+      # non-standard configurations setting this value will save having to
+      # specify overrides for the start_command, stop_command and
+      # restart_command attributes.
+      def init_command(arg=nil)
+        set_or_return(
+          :init_command,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
       # if the service is enabled or not
       def enabled(arg=nil)
         set_or_return(

data/lib/chef/resource/user.rb

@@ -44,8 +44,6 @@ class Chef
           :manage_home => false,
           :non_unique => false
         }
-        @iterations = 27855
-        @salt = nil
         @allowed_actions.push(:create, :remove, :modify, :manage, :lock, :unlock)
       end
       
@@ -107,22 +105,6 @@ class Chef
         )
       end
 
-      def salt(arg=nil)
-        set_or_return(
-          :salt,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
-
-      def iterations(arg=nil)
-        set_or_return(
-          :iterations,
-          arg,
-          :kind_of => [ Integer ]
-        )
-      end
-
       def system(arg=nil)
         set_or_return(
           :system,

data/lib/chef/resource_collection.rb

@@ -7,9 +7,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.
@@ -23,7 +23,7 @@ require 'chef/resource_collection/stepable_iterator'
 class Chef
   class ResourceCollection
     include Enumerable
-    
+
     attr_reader :iterator
 
     def initialize
@@ -31,18 +31,18 @@ class Chef
       @resources_by_name = Hash.new
       @insert_after_idx = nil
     end
-    
+
     def all_resources
       @resources
     end
-    
+
     def [](index)
       @resources[index]
     end
-    
+
     def []=(index, arg)
       is_chef_resource(arg)
-      @resources[index] = arg 
+      @resources[index] = arg
       @resources_by_name[arg.to_s] = index
     end
 
@@ -50,7 +50,7 @@ class Chef
       args.flatten.each do |a|
         is_chef_resource(a)
         @resources << a
-        @resources_by_name[a.to_s] = @resources.length - 1 
+        @resources_by_name[a.to_s] = @resources.length - 1
       end
     end
 
@@ -67,12 +67,12 @@ class Chef
         end
         @resources_by_name[resource.to_s] = @insert_after_idx + 1
         @insert_after_idx += 1
-      else  
+      else
         @resources << resource
         @resources_by_name[resource.to_s] = @resources.length - 1
       end
     end
-    
+
     def push(*args)
       args.flatten.each do |arg|
         is_chef_resource(arg)
@@ -80,7 +80,7 @@ class Chef
         @resources_by_name[arg.to_s] = @resources.length - 1
       end
     end
-  
+
     def each
       @resources.each do |resource|
         yield resource
@@ -94,13 +94,17 @@ class Chef
         yield resource
       end
     end
-    
+
     def each_index
       @resources.each_index do |i|
         yield i
       end
     end
-    
+
+    def empty?
+      @resources.empty?
+    end
+
     def lookup(resource)
       lookup_by = nil
       if resource.kind_of?(Chef::Resource)
@@ -125,7 +129,7 @@ class Chef
     # find("file[foobar]", "file[baz]")
     # find("file[foobar,baz]")
     #
-    # Returns the matching resource, or an Array of matching resources. 
+    # Returns the matching resource, or an Array of matching resources.
     #
     # Raises an ArgumentError if you feed it bad lookup information
     # Raises a Runtime Error if it can't find the resources you are looking for.
@@ -145,12 +149,12 @@ class Chef
       flat_results = results.flatten
       flat_results.length == 1 ? flat_results[0] : flat_results
     end
-    
+
     # resources is a poorly named, but we have to maintain it for back
     # compat.
     alias_method :resources, :find
-    
-    # Serialize this object as a hash 
+
+    # Serialize this object as a hash
     def to_json(*a)
       instance_vars = Hash.new
       self.instance_variables.each do |iv|
@@ -162,7 +166,7 @@ class Chef
       }
       results.to_json(*a)
     end
-    
+
     def self.json_create(o)
       collection = self.new()
       o["instance_vars"].each do |k,v|
@@ -172,7 +176,7 @@ class Chef
     end
 
     private
-    
+
       def find_resource_by_hash(arg)
         results = Array.new
         arg.each do |resource_name, name_list|
@@ -193,7 +197,7 @@ class Chef
           arg =~ /^.+\[(.+)\]$/
           resource_list = $1
           resource_list.split(",").each do |name|
-            resource_name = "#{resource_type}[#{name}]" 
+            resource_name = "#{resource_type}[#{name}]"
             results << lookup(resource_name)
           end
         when /^(.+)\[(.+)\]$/
@@ -209,7 +213,7 @@ class Chef
 
       def is_chef_resource(arg)
         unless arg.kind_of?(Chef::Resource)
-          raise ArgumentError, "Members must be Chef::Resource's" 
+          raise ArgumentError, "Members must be Chef::Resource's"
         end
         true
       end