Merge remote-tracking branch 'origin/master' into HEADjdm/merge-into-12-stable

* origin/master: (642 commits)
  Remove Chef 12 release notes
  Update Changelog for Chef 12.1.0
  Chef 12.1.0.rc.0
  Group spec needs to respond to shell_out
  fix dpkg regression
  fix Lint/BlockAlignment
  whitespaces fixes
  fix Lint/AmbiguousRegexpLiteral
  fix Lint/LiteralInCondition
  fix Lint/Loop style
  Make tests pass on Windows
  remove unreachable code
  Fix unit specs for PR #2934
  dont raise exceptions in load_current_resource when checking current status
  update changelog
  fix typo in msi provider
  Added spec for #2914
  fix virtual package logic in check_package_state
  use scalar pkg not array package
  convert is_virtual_package to hash
  ...

Conflicts:
	.travis.yml
	CHANGELOG.md
	DOC_CHANGES.md
	RELEASE_NOTES.md
	appveyor.yml
	lib/chef/application.rb
	lib/chef/dsl/recipe.rb
	lib/chef/knife/bootstrap.rb
	lib/chef/knife/core/bootstrap_context.rb
	lib/chef/node/attribute.rb
	lib/chef/node/attribute_collections.rb
	lib/chef/node/immutable_collections.rb
	lib/chef/resource.rb
	lib/chef/run_context.rb
	lib/chef/version.rb
	spec/functional/dsl/reboot_pending_spec.rb
	spec/functional/event_loggers/windows_eventlog_spec.rb
	spec/functional/resource/link_spec.rb
	spec/support/platform_helpers.rb
	spec/unit/knife_spec.rb
	spec/unit/mixin/deep_merge_spec.rb
	spec/unit/mixin/shell_out_spec.rb
	spec/unit/node/attribute_spec.rb
	spec/unit/node_spec.rb
	spec/unit/provider/package/apt_spec.rb
	spec/unit/provider/service/systemd_service_spec.rb
	spec/unit/provider_resolver_spec.rb
	spec/unit/recipe_spec.rb
	spec/unit/resource/resource_notification_spec.rb
	spec/unit/run_context_spec.rb

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb
index 16491f9bc8..53a6a160af 100644
--- a/lib/chef/resource/file.rb
+++ b/lib/chef/resource/file.rb
@@ -20,6 +20,7 @@
 require 'chef/resource'
 require 'chef/platform/query_helpers'
 require 'chef/mixin/securable'
+require 'chef/resource/file/verification'
 
 class Chef
   class Resource
@@ -50,6 +51,7 @@ class Chef
         @force_unlink = false
         @manage_symlink_source = nil
         @diff = nil
+        @verifications = []
       end
 
       def content(arg=nil)
@@ -115,6 +117,18 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
+
+      def verify(command=nil, opts={}, &block)
+        if ! (command.nil? || [String, Symbol].include?(command.class))
+          raise ArgumentError, "verify requires either a string, symbol, or a block"
+        end
+
+        if command || block_given?
+          @verifications << Verification.new(self, command, opts, &block)
+        else
+          @verifications
+        end
+      end
     end
   end
 end