chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32

data/lib/chef/resource/gem_package.rb

@@ -22,10 +22,11 @@ class Chef
   class Resource
     class GemPackage < Chef::Resource::Package
 
+      provides :gem_package
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :gem_package
-        @provider = Chef::Provider::Package::Rubygems
       end
 
       def source(arg=nil)

data/lib/chef/resource/git.rb

@@ -22,10 +22,11 @@ class Chef
   class Resource
     class Git < Chef::Resource::Scm
 
+      provides :git
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :git
-        @provider = Chef::Provider::Git
         @additional_remotes = Hash[]
       end
 

data/lib/chef/resource/homebrew_package.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Joshua Timberman (<joshua@getchef.com>)
+# Author:: Graeme Mathieson (<mathie@woss.name>)
+#
+# Copyright 2011-2013, Opscode, Inc.
+# Copyright 2014, Chef Software, Inc <legal@getchef.com>
+#
+# 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/package'
+require 'chef/resource/package'
+
+class Chef
+  class Resource
+    class HomebrewPackage < Chef::Resource::Package
+
+      provides :homebrew_package, os: "mac_os_x"
+
+      def initialize(name, run_context=nil)
+        super
+        @resource_name = :homebrew_package
+        @homebrew_user = nil
+      end
+
+      def homebrew_user(arg=nil)
+        set_or_return(
+            :homebrew_user,
+            arg,
+            :kind_of => [ String, Integer ]
+        )
+      end
+
+    end
+  end
+end

data/lib/chef/resource/http_request.rb

@@ -18,6 +18,7 @@
 #
 
 require 'chef/resource'
+require 'chef/provider/http_request'
 
 class Chef
   class Resource

data/lib/chef/resource/ips_package.rb

@@ -22,10 +22,12 @@ require 'chef/provider/package/ips'
 class Chef
   class Resource
     class IpsPackage < ::Chef::Resource::Package
+
+      provides :ips_package, os: "solaris2"
+
       def initialize(name, run_context = nil)
         super(name, run_context)
         @resource_name = :ips_package
-        @provider      = Chef::Provider::Package::Ips
         @allowed_actions = [ :install, :remove, :upgrade ]
         @accept_license = false
       end

data/lib/chef/resource/link.rb

@@ -25,7 +25,7 @@ class Chef
     class Link < Chef::Resource
       include Chef::Mixin::Securable
 
-      provides :link, :on_platform  => :all
+      provides :link
 
       identity_attr :target_file
 
@@ -40,7 +40,6 @@ class Chef
         @link_type = :symbolic
         @target_file = name
         @allowed_actions.push(:create, :delete)
-        @provider = Chef::Provider::Link
       end
 
       def to(arg=nil)

data/lib/chef/resource/log.rb

@@ -16,6 +16,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+require 'chef/resource'
+require 'chef/provider/log'
+
 class Chef
   class Resource
     class Log < Chef::Resource

data/lib/chef/resource/lwrp_base.rb

@@ -35,26 +35,24 @@ class Chef
 
       # Evaluates the LWRP resource file and instantiates a new Resource class.
       def self.build_from_file(cookbook_name, filename, run_context)
+        resource_class = nil
         rname = filename_to_qualified_string(cookbook_name, filename)
 
-        # Add log entry if we override an existing lightweight 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} lightweight resource already initialized -- overriding!")
-        end
-
-        resource_class = Class.new(self)
+          Chef::Log.info("#{class_name} light-weight resource is already initialized -- Skipping loading #{filename}!")
+          Chef::Log.debug("Overriding already defined LWRPs is not supported anymore starting with Chef 12.")
+          resource_class = Resource.const_get(class_name)
+        else
+          resource_class = Class.new(self)
 
-        resource_class.resource_name = rname
-        resource_class.run_context = run_context
-        resource_class.class_from_file(filename)
+          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}")
+          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}")
+        end
 
         resource_class
       end
@@ -112,10 +110,21 @@ class Chef
         if action_names.empty?
           defined?(@actions) ? @actions : from_superclass(:actions, []).dup
         else
-          @actions = action_names
+          # BC-compat way for checking if actions have already been defined
+          if defined?(@actions)
+            @actions.push(*action_names)
+          else
+            @actions = action_names
+          end
         end
       end
 
+      # @deprecated
+      def self.valid_actions(*args)
+        Chef::Log.warn("`valid_actions' is deprecated, please use actions `instead'!")
+        actions(*args)
+      end
+
       # Set the run context on the class. Used to provide access to the node
       # during class definition.
       def self.run_context=(run_context)

data/lib/chef/resource/macports_package.rb

@@ -19,10 +19,12 @@
 class Chef
   class Resource
     class MacportsPackage < Chef::Resource::Package
+
+      provides :macports_package, os: "mac_os_x"
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :macports_package
-        @provider = Chef::Provider::Package::Macports
       end
     end
   end

data/lib/chef/resource/pacman_package.rb

@@ -22,10 +22,11 @@ class Chef
   class Resource
     class PacmanPackage < Chef::Resource::Package
 
+      provides :pacman_package, os: "linux"
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :pacman_package
-        @provider = Chef::Provider::Package::Pacman
       end
 
     end

data/lib/chef/resource/paludis_package.rb

@@ -22,10 +22,12 @@ require 'chef/provider/package/paludis'
 class Chef
   class Resource
     class PaludisPackage < Chef::Resource::Package
+
+      provides :paludis_package, os: "linux"
+
       def initialize(name, run_context=nil)
         super(name, run_context)
         @resource_name = :paludis_package
-        @provider = Chef::Provider::Package::Paludis
         @allowed_actions = [ :install, :remove, :upgrade ]
         @timeout = 3600
       end

data/lib/chef/resource/perl.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/resource/script'
+require 'chef/provider/script'
 
 class Chef
   class Resource

data/lib/chef/resource/powershell_script.rb

@@ -21,8 +21,6 @@ class Chef
   class Resource
     class PowershellScript < Chef::Resource::WindowsScript
 
-      set_guard_inherited_attributes(:architecture)
-
       def initialize(name, run_context=nil)
         super(name, run_context, :powershell_script, "powershell.exe")
         @convert_boolean_return = false

data/lib/chef/resource/python.rb

@@ -1,4 +1,3 @@
-#
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -17,6 +16,7 @@
 #
 
 require 'chef/resource/script'
+require 'chef/provider/script'
 
 class Chef
   class Resource

data/lib/chef/resource/remote_directory.rb

@@ -26,7 +26,7 @@ class Chef
     class RemoteDirectory < Chef::Resource::Directory
       include Chef::Mixin::Securable
 
-      provides :remote_directory, :on_platforms => :all
+      provides :remote_directory
 
       identity_attr :path
 
@@ -48,7 +48,6 @@ class Chef
         @overwrite = true
         @allowed_actions.push(:create, :create_if_missing, :delete)
         @cookbook = nil
-        @provider = Chef::Provider::RemoteDirectory
       end
 
       if Chef::Platform.windows?

data/lib/chef/resource/remote_file.rb

@@ -26,7 +26,7 @@ class Chef
     class RemoteFile < Chef::Resource::File
       include Chef::Mixin::Securable
 
-      provides :remote_file, :on_platforms => :all
+      provides :remote_file
 
       def initialize(name, run_context=nil)
         super

data/lib/chef/resource/rpm_package.rb

@@ -23,10 +23,11 @@ class Chef
   class Resource
     class RpmPackage < Chef::Resource::Package
 
+      provides :rpm_package, os: [ "linux", "aix" ]
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :rpm_package
-        @provider = Chef::Provider::Package::Rpm
       end
 
     end

data/lib/chef/resource/ruby.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/resource/script'
+require 'chef/provider/script'
 
 class Chef
   class Resource

data/lib/chef/resource/ruby_block.rb

@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+require 'chef/resource'
+require 'chef/provider/ruby_block'
+
 class Chef
   class Resource
     class RubyBlock < Chef::Resource

data/lib/chef/resource/script.rb

@@ -18,6 +18,7 @@
 #
 
 require 'chef/resource/execute'
+require 'chef/provider/script'
 
 class Chef
   class Resource
@@ -32,6 +33,7 @@ class Chef
         @code = nil
         @interpreter = nil
         @flags = nil
+        @default_guard_interpreter = :default
       end
 
       def code(arg=nil)
@@ -58,31 +60,6 @@ class Chef
         )
       end
 
-      def self.set_guard_inherited_attributes(*inherited_attributes)
-        @class_inherited_attributes = inherited_attributes
-      end
-
-      def self.guard_inherited_attributes(*inherited_attributes)
-        # Similar to patterns elsewhere, return attributes from this
-        # class and superclasses as a form of inheritance
-        ancestor_attributes = []
-
-        if superclass.respond_to?(:guard_inherited_attributes)
-          ancestor_attributes = superclass.guard_inherited_attributes
-        end
-
-        ancestor_attributes.concat(@class_inherited_attributes ? @class_inherited_attributes : []).uniq
-      end
-
-      set_guard_inherited_attributes(
-       :cwd,
-       :environment,
-       :group,
-       :path,
-       :user,
-       :umask
-       )
-
     end
   end
 end

data/lib/chef/resource/service.rb

@@ -46,10 +46,6 @@ class Chef
         @action = "nothing"
         @supports = { :restart => false, :reload => false, :status => false }
         @allowed_actions.push(:enable, :disable, :start, :stop, :restart, :reload)
-
-        if(run_context && run_context.node[:init_package] == "systemd")
-          @provider = Chef::Provider::Service::Systemd
-        end
       end
 
       def service_name(arg=nil)

data/lib/chef/resource/smartos_package.rb

@@ -23,16 +23,15 @@ class Chef
   class Resource
     class SmartosPackage < Chef::Resource::Package
 
+      provides :smartos_package
+      provides :package, os: "solaris2", platform_family: "smartos"
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :smartos_package
-        @provider = Chef::Provider::Package::SmartOS
       end
 
     end
   end
 end
 
-# Backwards compatability
-# @todo remove in Chef 12
-Chef::Resource::SmartOSPackage = Chef::Resource::SmartosPackage

data/lib/chef/resource/solaris_package.rb

@@ -24,10 +24,16 @@ class Chef
   class Resource
     class SolarisPackage < Chef::Resource::Package
 
+      provides :solaris_package
+      provides :package, os: "solaris2", platform_family: "nexentacore"
+      provides :package, os: "solaris2", platform_family: "solaris2" do |node|
+        # on >= Solaris 11 we default to IPS packages instead
+        node[:platform_version].to_f <= 5.10
+      end
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :solaris_package
-        @provider = Chef::Provider::Package::Solaris
       end
 
     end

data/lib/chef/resource/subversion.rb

@@ -28,7 +28,6 @@ class Chef
         @svn_arguments = '--no-auth-cache'
         @svn_info_args = '--no-auth-cache'
         @resource_name = :subversion
-        @provider = Chef::Provider::Subversion
         allowed_actions << :force_export
       end
 

data/lib/chef/resource/template.rb

@@ -27,7 +27,7 @@ class Chef
     class Template < Chef::Resource::File
       include Chef::Mixin::Securable
 
-      provides :template, :on_platforms => :all
+      provides :template
 
       attr_reader :inline_helper_blocks
       attr_reader :inline_helper_modules
@@ -40,7 +40,6 @@ class Chef
         @cookbook = nil
         @local = false
         @variables = Hash.new
-        @provider = Chef::Provider::Template
         @inline_helper_blocks = {}
         @inline_helper_modules = []
         @helper_modules = []
@@ -50,7 +49,7 @@ class Chef
         set_or_return(
           :source,
           file,
-          :kind_of => [ String ]
+          :kind_of => [ String, Array ]
         )
       end