chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/lib/chef/resource/{whyrun_safe_ruby_block.rb → batch.rb}

@@ -1,14 +1,14 @@
 #
-# Author:: Phil Dibowitz (<phild@fb.com>)
-# Copyright:: Copyright (c) 2013 Facebook
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 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.
@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
+require 'chef/resource/windows_script'
+
 class Chef
   class Resource
-    class WhyrunSafeRubyBlock < Chef::Resource::RubyBlock
-
+    class Batch < Chef::Resource::WindowsScript
+      
       def initialize(name, run_context=nil)
-        super
-        @resource_name = :whyrun_safe_ruby_block
-        @provider = Chef::Provider::WhyrunSafeRubyBlock
+        super(name, run_context, :batch, "cmd.exe")
       end
-
+      
     end
   end
 end

data/lib/chef/resource/conditional.rb

@@ -83,6 +83,10 @@ class Chef
         @block.call
       end
 
+      def short_description
+        @positivity
+      end
+
       def description
         cmd_or_block = @command ? "command `#{@command}`" : "ruby block"
         "#{@positivity} #{cmd_or_block}"

data/lib/chef/resource/conditional_action_not_nothing.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Xabier de Zuazo (<xabier@onddo.com>)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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
+    class ConditionalActionNotNothing
+
+      attr_reader :current_action
+
+      def initialize(current_action)
+        @current_action = current_action
+      end
+
+      def continue?
+        # @positivity == not_if
+        @current_action != :nothing
+      end
+
+      def short_description
+        description
+      end
+
+      def description
+        "action :nothing"
+      end
+
+      def to_text
+        "not_if { action == :nothing }"
+      end
+
+    end
+  end
+end

data/lib/chef/resource/file.rb

@@ -18,7 +18,7 @@
 #
 
 require 'chef/resource'
-require 'chef/platform'
+require 'chef/platform/query_helpers'
 require 'chef/provider/file'
 require 'chef/mixin/securable'
 
@@ -36,6 +36,8 @@ class Chef
         state_attrs :checksum, :owner, :group, :mode
       end
 
+      attr_writer :checksum
+
       provides :file, :on_platforms => :all
 
       def initialize(name, run_context=nil)
@@ -46,13 +48,16 @@ class Chef
         @action = "create"
         @allowed_actions.push(:create, :delete, :touch, :create_if_missing)
         @provider = Chef::Provider::File
+        @atomic_update = Chef::Config[:file_atomic_update]
+        @force_unlink = false
+        @manage_symlink_source = nil
         @diff = nil
       end
 
 
       def content(arg=nil)
         set_or_return(
-                      :content,
+          :content,
           arg,
           :kind_of => String
         )
@@ -81,7 +86,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
       def diff(arg=nil)
         set_or_return(
           :diff,
@@ -90,6 +95,29 @@ class Chef
         )
       end
 
+      def atomic_update(arg=nil)
+        set_or_return(
+          :atomic_update,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def force_unlink(arg=nil)
+        set_or_return(
+          :force_unlink,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def manage_symlink_source(arg=nil)
+        set_or_return(
+          :manage_symlink_source,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
 
     end
   end

data/lib/chef/resource/group.rb

@@ -31,7 +31,6 @@ class Chef
         @group_name = name
         @gid = nil
         @members = []
-        @excluded_members = []
         @action = :create
         @append = false
         @allowed_actions.push(:create, :remove, :modify, :manage)
@@ -63,16 +62,7 @@ class Chef
       end
 
       alias_method :users, :members
-
-      def excluded_members(arg=nil)
-        converted_members = arg.is_a?(String) ? [].push(arg) : arg
-        set_or_return(
-          :excluded_members,
-          converted_members,
-          :kind_of => [ Array ]
-        )
-      end
-
+ 
       def append(arg=nil)
         set_or_return(
           :append,

data/lib/chef/resource/http_request.rb

@@ -43,7 +43,8 @@ class Chef
         )
       end
       
-      def message(args=nil)
+      def message(args=nil, &block)
+        args = block if block_given?
         set_or_return(
           :message,
           args,

data/lib/chef/resource/link.rb

@@ -32,6 +32,7 @@ class Chef
       state_attrs :to, :owner, :group
 
       def initialize(name, run_context=nil)
+        verify_links_supported!
         super
         @resource_name = :link
         @to = nil
@@ -87,6 +88,22 @@ class Chef
       def path
         @target_file
       end
+
+      private
+      def verify_links_supported!
+        # On certain versions of windows links are not supported. Make
+        # sure we are not on such a platform.
+
+        if Chef::Platform.windows?
+          require 'chef/win32/file'
+          begin
+            Chef::ReservedNames::Win32::File.verify_links_supported!
+          rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e
+            Chef::Log.fatal("Link resource is not supported on this version of Windows")
+            raise e
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/resource/lwrp_base.rb

@@ -0,0 +1,132 @@
+#
+# 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)
+        if Resource.strict_const_defined?(class_name)
+          old_class = Resource.send(:remove_const, class_name)
+          # CHEF-3432 -- Chef::Resource keeps a list of subclasses; need to
+          # remove old ones from the list when replacing.
+          resource_classes.delete(old_class)
+          Chef::Log.info("#{class_name} light-weight resource already initialized -- overriding!")
+        end
+
+        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

@@ -25,7 +25,7 @@ class Chef
       
       identity_attr :device
 
-      state_attrs :mount_point, :device_type, :fstype
+      state_attrs :mount_point, :device_type, :fstype, :username, :password, :domain
 
       def initialize(name, run_context=nil)
         super
@@ -42,6 +42,9 @@ class Chef
         @action = :mount
         @supports = { :remount => false }
         @allowed_actions.push(:mount, :umount, :remount, :enable, :disable)
+        @username = nil
+        @password = nil
+        @domain = nil
       end
       
       def mount_point(arg=nil)
@@ -76,21 +79,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,
@@ -132,7 +134,31 @@ class Chef
           @supports
         end
       end
-      
+
+      def username(arg=nil)
+        set_or_return(
+          :username,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def password(arg=nil)
+        set_or_return(
+          :password,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def domain(arg=nil)
+        set_or_return(
+          :domain,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
     end
   end
 end