chef 12.4.0.rc.0 → 12.4.0.rc.2

data/lib/chef/resource/apt_package.rb

@@ -23,12 +23,10 @@ class Chef
   class Resource
     class AptPackage < Chef::Resource::Package
 
-      provides :apt_package
       provides :package, os: "linux", platform_family: [ "debian" ]
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :apt_package
         @default_release = nil
       end
 

data/lib/chef/resource/bash.rb

@@ -22,11 +22,9 @@ require 'chef/provider/script'
 class Chef
   class Resource
     class Bash < Chef::Resource::Script
-      provides :bash
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :bash
         @interpreter = "bash"
       end
 

data/lib/chef/resource/batch.rb

@@ -25,7 +25,7 @@ class Chef
       provides :batch, os: "windows"
 
       def initialize(name, run_context=nil)
-        super(name, run_context, :batch, "cmd.exe")
+        super(name, run_context, nil, "cmd.exe")
       end
 
     end

data/lib/chef/resource/bff_package.rb

@@ -22,13 +22,6 @@ require 'chef/provider/package/aix'
 class Chef
   class Resource
     class BffPackage < Chef::Resource::Package
-      provides :bff_package
-
-      def initialize(name, run_context=nil)
-        super
-        @resource_name = :bff_package
-      end
-
     end
   end
 end

data/lib/chef/resource/breakpoint.rb

@@ -22,15 +22,12 @@ require 'chef/resource'
 class Chef
   class Resource
     class Breakpoint < Chef::Resource
-      provides :breakpoint
+      default_action :break
 
       def initialize(action="break", *args)
-        @name = caller.first
-        super(@name, *args)
-        @action = "break"
-        @allowed_actions << :break
-        @resource_name = :breakpoint
+        super(caller.first, *args)
       end
+
     end
   end
 end

data/lib/chef/resource/chef_gem.rb

@@ -23,11 +23,8 @@ class Chef
   class Resource
     class ChefGem < Chef::Resource::Package::GemPackage
 
-      provides :chef_gem
-
       def initialize(name, run_context=nil)
         super
-        @resource_name = :chef_gem
         @compile_time = Chef::Config[:chef_gem_compile_time]
         @gem_binary = RbConfig::CONFIG['bindir'] + "/gem"
       end

data/lib/chef/resource/cookbook_file.rb

@@ -27,13 +27,11 @@ class Chef
     class CookbookFile < Chef::Resource::File
       include Chef::Mixin::Securable
 
-      provides :cookbook_file
+      default_action :create
 
       def initialize(name, run_context=nil)
         super
         @provider = Chef::Provider::CookbookFile
-        @resource_name = :cookbook_file
-        @action = "create"
         @source = ::File.basename(name)
         @cookbook = nil
       end

data/lib/chef/resource/cron.rb

@@ -27,13 +27,11 @@ class Chef
 
       state_attrs :minute, :hour, :day, :month, :weekday, :user
 
-      provides :cron
+      default_action :create
+      allowed_actions :create, :delete
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :cron
-        @action = :create
-        @allowed_actions.push(:create, :delete)
         @minute = "*"
         @hour = "*"
         @day = "*"

data/lib/chef/resource/csh.rb

@@ -22,11 +22,9 @@ require 'chef/provider/script'
 class Chef
   class Resource
     class Csh < Chef::Resource::Script
-      provides :csh
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :csh
         @interpreter = "csh"
       end
 

data/lib/chef/resource/deploy.rb

@@ -50,17 +50,16 @@ class Chef
     # release directory. Callback files can contain chef code (resources, etc.)
     #
     class Deploy < Chef::Resource
-      provides :deploy
-
-      provider_base Chef::Provider::Deploy
 
       identity_attr :repository
 
       state_attrs :deploy_to, :revision
 
+      default_action :deploy
+      allowed_actions :force_deploy, :deploy, :rollback
+
       def initialize(name, run_context=nil)
         super
-        @resource_name = :deploy
         @deploy_to = name
         @environment = nil
         @repository_cache = 'cached-copy'
@@ -70,7 +69,6 @@ class Chef
         @symlink_before_migrate = {"config/database.yml" => "config/database.yml"}
         @symlinks = {"system" => "public/system", "pids" => "tmp/pids", "log" => "log"}
         @revision = 'HEAD'
-        @action = :deploy
         @migrate = false
         @rollback_on_error = false
         @remote = "origin"
@@ -78,7 +76,6 @@ class Chef
         @shallow_clone = false
         @scm_provider = Chef::Provider::Git
         @svn_force_export = false
-        @allowed_actions.push(:force_deploy, :deploy, :rollback)
         @additional_remotes = Hash[]
         @keep_releases = 5
         @enable_checkout = true
@@ -282,6 +279,12 @@ class Chef
         )
       end
 
+      # This is to support "provider :revision" without deprecation warnings.
+      # Do NOT copy this.
+      def self.provider_base
+        Chef::Provider::Deploy
+      end
+
       def svn_force_export(arg=nil)
         set_or_return(
           :svn_force_export,

data/lib/chef/resource/deploy_revision.rb

@@ -22,23 +22,9 @@ class Chef
     # Convenience class for using the deploy resource with the revision
     # deployment strategy (provider)
     class DeployRevision < Chef::Resource::Deploy
-
-      provides :deploy_revision
-
-      def initialize(*args, &block)
-        super
-        @resource_name = :deploy_revision
-      end
     end
 
     class DeployBranch < Chef::Resource::DeployRevision
-
-      provides :deploy_branch
-
-      def initialize(*args, &block)
-        super
-        @resource_name = :deploy_branch
-      end
     end
 
   end

data/lib/chef/resource/directory.rb

@@ -32,15 +32,13 @@ class Chef
 
       include Chef::Mixin::Securable
 
-      provides :directory
+      default_action :create
+      allowed_actions :create, :delete
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :directory
         @path = name
-        @action = :create
         @recursive = false
-        @allowed_actions.push(:create, :delete)
       end
 
       def recursive(arg=nil)

data/lib/chef/resource/dpkg_package.rb

@@ -25,11 +25,6 @@ class Chef
 
       provides :dpkg_package, os: "linux"
 
-      def initialize(name, run_context=nil)
-        super
-        @resource_name = :dpkg_package
-      end
-
     end
   end
 end

data/lib/chef/resource/dsc_resource.rb

@@ -25,13 +25,12 @@ class Chef
 
       include Chef::DSL::Powershell
 
+      default_action :run
+
       def initialize(name, run_context)
         super
         @properties = {}
-        @resource_name = :dsc_resource
         @resource = nil
-        @allowed_actions.push(:run)
-        @action = :run
       end
 
       def resource(value=nil)

data/lib/chef/resource/dsc_script.rb

@@ -24,11 +24,10 @@ class Chef
 
       provides :dsc_script, platform: "windows"
 
+      default_action :run
+
       def initialize(name, run_context=nil)
         super
-        @allowed_actions.push(:run)
-        @action = :run
-        @resource_name = :dsc_script
         @imports = {}
       end
 

data/lib/chef/resource/easy_install_package.rb

@@ -22,13 +22,6 @@ class Chef
   class Resource
     class EasyInstallPackage < Chef::Resource::Package
 
-      provides :easy_install_package
-
-      def initialize(name, run_context=nil)
-        super
-        @resource_name = :easy_install_package
-      end
-
       def easy_install_binary(arg=nil)
         set_or_return(
           :easy_install_binary,

data/lib/chef/resource/env.rb

@@ -27,14 +27,14 @@ class Chef
 
       provides :env, os: "windows"
 
+      default_action :create
+      allowed_actions :create, :delete, :modify
+
       def initialize(name, run_context=nil)
         super
-        @resource_name = :env
         @key_name = name
         @value = nil
-        @action = :create
         @delim = nil
-        @allowed_actions.push(:create, :delete, :modify)
       end
 
       def key_name(arg=nil)

data/lib/chef/resource/erl_call.rb

@@ -23,24 +23,21 @@ require 'chef/provider/erl_call'
 class Chef
   class Resource
     class ErlCall < Chef::Resource
-      provides :erl_call
 
       # erl_call : http://erlang.org/doc/man/erl_call.html
 
       identity_attr :code
 
+      default_action :run
+
       def initialize(name, run_context=nil)
         super
-        @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)

data/lib/chef/resource/execute.rb

@@ -23,7 +23,6 @@ require 'chef/provider/execute'
 class Chef
   class Resource
     class Execute < Chef::Resource
-      provides :execute
 
       identity_attr :command
 
@@ -33,12 +32,12 @@ class Chef
       # Only execute resources (and subclasses) can be guard interpreters.
       attr_accessor :is_guard_interpreter
 
+      default_action :run
+
       def initialize(name, run_context=nil)
         super
-        @resource_name = :execute
         @command = name
         @backup = 5
-        @action = "run"
         @creates = nil
         @cwd = nil
         @environment = nil
@@ -47,7 +46,6 @@ class Chef
         @returns = 0
         @timeout = nil
         @user = nil
-        @allowed_actions.push(:run)
         @umask = nil
         @default_guard_interpreter = :execute
         @is_guard_interpreter = false

data/lib/chef/resource/file.rb

@@ -47,15 +47,13 @@ class Chef
       # @returns [String] Checksum of the file we actually rendered
       attr_accessor :final_checksum
 
-      provides :file
+      default_action :create
+      allowed_actions :create, :delete, :touch, :create_if_missing
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :file
         @path = name
         @backup = 5
-        @action = "create"
-        @allowed_actions.push(:create, :delete, :touch, :create_if_missing)
         @atomic_update = Chef::Config[:file_atomic_update]
         @force_unlink = false
         @manage_symlink_source = nil

data/lib/chef/resource/freebsd_package.rb

@@ -31,11 +31,6 @@ class Chef
 
       provides :package, platform: "freebsd"
 
-      def initialize(name, run_context=nil)
-        super
-        @resource_name = :freebsd_package
-      end
-
       def after_created
         assign_provider
       end

data/lib/chef/resource/gem_package.rb

@@ -22,11 +22,8 @@ class Chef
   class Resource
     class GemPackage < Chef::Resource::Package
 
-      provides :gem_package
-
       def initialize(name, run_context=nil)
         super
-        @resource_name = :gem_package
         @clear_sources = false
       end
 

data/lib/chef/resource/git.rb

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

data/lib/chef/resource/group.rb

@@ -25,19 +25,17 @@ class Chef
 
       state_attrs :members
 
-      provides :group
+      allowed_actions :create, :remove, :modify, :manage
+      default_action :create
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :group
         @group_name = name
         @gid = nil
         @members = []
         @excluded_members = []
-        @action = :create
         @append = false
         @non_unique = false
-        @allowed_actions.push(:create, :remove, :modify, :manage)
       end
 
       def group_name(arg=nil)

data/lib/chef/resource/homebrew_package.rb

@@ -25,12 +25,10 @@ class Chef
   class Resource
     class HomebrewPackage < Chef::Resource::Package
 
-      provides :homebrew_package
       provides :package, os: "darwin"
 
       def initialize(name, run_context=nil)
         super
-        @resource_name = :homebrew_package
         @homebrew_user = nil
       end