chefspec 7.0.0 → 7.1.0

data/lib/chefspec/extensions.rb

@@ -0,0 +1,16 @@
+require 'rspec'
+
+module ChefSpec::Extensions
+  module Chef
+  end
+end
+
+# STOP! DO NOT ALPHABETIZE!
+require_relative 'extensions/chef/resource'  # must come before client extensions or anything that winds up loading resources
+require_relative 'extensions/chef/securable'
+require_relative 'extensions/chef/client'
+require_relative 'extensions/chef/conditional'
+require_relative 'extensions/chef/cookbook_uploader'
+require_relative 'extensions/chef/data_query'
+require_relative 'extensions/chef/lwrp_base'
+require_relative 'extensions/chef/resource/freebsd_package'

data/lib/chefspec/extensions/chef/resource.rb

@@ -1,13 +1,16 @@
 require 'chef/resource'
+require 'chefspec/api'
 
-class Chef::Resource
-  alias_method :old_initialize, :initialize
-  def initialize(*args)
-    @performed_actions = {}
-    old_initialize(*args)
-  end
+#
+# Three concerns:
+#   - no-op'ing so that the action does not run the provider
+#   - tracking the actions that were performed
+#   - auto registering helper methods
+#
 
-  alias_method :old_run_action, :run_action
+module ChefSpec::Extensions::Chef::Resource
+
+  # mix of no-op and tracking concerns
   def run_action(action, notification_type = nil, notifying_resource = nil)
     resolve_notification_references
     validate_action(action)
@@ -19,7 +22,7 @@ class Chef::Resource
     unless should_skip?(action)
       if node.runner.step_into?(self)
         instance_eval { @not_if = []; @only_if = [] }
-        old_run_action(action, notification_type, notifying_resource)
+        super
       end
 
       if node.runner.compiling?
@@ -30,6 +33,15 @@ class Chef::Resource
     end
   end
 
+  #
+  # tracking
+  #
+
+  def initialize(*args)
+    @performed_actions = {}
+    super
+  end
+
   def perform_action(action, options = {})
     @performed_actions[action.to_sym] ||= {}
     @performed_actions[action.to_sym].merge!(options)
@@ -46,4 +58,74 @@ class Chef::Resource
   def performed_actions
     @performed_actions.keys
   end
+
+  #
+  # auto-registration
+  #
+
+  def self.prepended(base)
+    class << base
+      prepend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    # XXX: kind of a crappy way to find all the names of a resource
+    def provides_names
+      @provides_names ||= []
+    end
+
+    def resource_name(name = ::Chef::NOT_PASSED)
+      unless name == ::Chef::NOT_PASSED
+        provides_names << name unless provides_names.include?(name)
+        inject_actions(*allowed_actions)
+      end
+      super
+    end
+
+    def provides(name, *args, &block)
+      provides_names << name unless provides_names.include?(name)
+      inject_actions(*allowed_actions)
+      super
+    end
+
+    def action(sym, &block)
+      inject_actions(sym)
+      super
+    end
+
+    def allowed_actions(*actions)
+      inject_actions(*actions) unless actions.empty?
+      super
+    end
+
+    def allowed_actions=(value)
+      inject_actions(*Array(value))
+      super
+    end
+
+    private
+
+    def inject_method(method, resource_name, action)
+      unless ChefSpec::API.respond_to?(method)
+        ChefSpec::API.send(:define_method, method) do |name|
+          ChefSpec::Matchers::ResourceMatcher.new(resource_name, action, name)
+        end
+      end
+    end
+
+    def inject_actions(*actions)
+      provides_names.each do |resource_name|
+        ChefSpec.define_matcher(resource_name)
+        actions.each do |action|
+          inject_method(:"#{action}_#{resource_name}", resource_name, action)
+          if action == :create_if_missing
+            inject_method(:"create_#{resource_name}_if_missing", resource_name, action)
+          end
+        end
+      end
+    end
+  end
 end
+
+Chef::Resource.prepend(ChefSpec::Extensions::Chef::Resource)

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '7.0.0'
+  VERSION = '7.1.0'
 end

data/lib/chefspec/zero_server.rb

@@ -6,23 +6,16 @@ module ChefSpec
   class ZeroServer
     class << self
       extend Forwardable
-      def_delegators :instance, :setup!, :teardown!, :reset!, :upload_cookbooks!, :server, :load_data
+      def_delegators :instance, :setup!, :teardown!, :reset!, :upload_cookbooks!, :server, :load_data, :nuke!
     end
 
     include Singleton
 
+    attr_reader :server
+
     # Create the ChefZero Server
     def initialize
-      @server ||= ChefZero::Server.new(
-        # Set the log level from RSpec, defaulting to warn
-        log_level:  RSpec.configuration.log_level || :warn,
-        port: RSpec.configuration.server_runner_port,
-
-        # Set the data store
-        data_store: data_store(RSpec.configuration.server_runner_data_store),
-      )
-      @cookbooks_uploaded = false
-      @data_loaded = {}
+      nuke!
     end
 
     #
@@ -53,6 +46,22 @@ module ChefSpec
       @data_loaded = {}
     end
 
+    #
+    # Really reset everything and reload the configuration
+    #
+    def nuke!
+      @server = ChefZero::Server.new(
+        # Set the log level from RSpec, defaulting to warn
+        log_level:  RSpec.configuration.log_level || :warn,
+        port: RSpec.configuration.server_runner_port,
+
+        # Set the data store
+        data_store: data_store(RSpec.configuration.server_runner_data_store),
+      )
+      @cookbooks_uploaded = false
+      @data_loaded = {}
+    end
+
     #
     # Teardown the ChefZero Server
     #
@@ -71,13 +80,6 @@ module ChefSpec
       @cookbooks_uploaded = true
     end
 
-    #
-    # The URL for the ChefZero Server
-    #
-    def server
-      @server
-    end
-
     #
     # Load (and track) data sent to the server
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -59,62 +59,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 description: ChefSpec is a unit testing and resource coverage (code coverage) framework
   for testing Chef cookbooks ChefSpec makes it easy to write examples and get fast
   feedback on cookbook changes without the need for virtual machines or cloud servers.
@@ -209,7 +153,6 @@ files:
 - examples/custom_matcher/resources/thing.rb
 - examples/custom_matcher/spec/install_spec.rb
 - examples/custom_matcher/spec/remove_spec.rb
-- examples/custom_resource/libraries/matchers.rb
 - examples/custom_resource/recipes/default.rb
 - examples/custom_resource/resources/custom_resource.rb
 - examples/custom_resource/spec/default_spec.rb
@@ -634,7 +577,6 @@ files:
 - examples/template/spec/create_spec.rb
 - examples/template/spec/delete_spec.rb
 - examples/template/spec/touch_spec.rb
-- examples/use_inline_resources/libraries/matchers.rb
 - examples/use_inline_resources/providers/lwrp.rb
 - examples/use_inline_resources/recipes/default.rb
 - examples/use_inline_resources/resources/lwrp.rb
@@ -695,173 +637,17 @@ files:
 - examples/zypper_package/spec/purge_spec.rb
 - examples/zypper_package/spec/remove_spec.rb
 - examples/zypper_package/spec/upgrade_spec.rb
-- features/apt_package.feature
-- features/apt_repository.feature
-- features/apt_update.feature
-- features/attributes.feature
-- features/batch.feature
-- features/bff_package.feature
-- features/cab_package.feature
-- features/cached.feature
-- features/chef_gem.feature
-- features/chocolatey_package.feature
-- features/compile_time.feature
-- features/cookbook_file.feature
-- features/cron.feature
-- features/custom_matcher.feature
-- features/custom_resource.feature
-- features/deploy.feature
-- features/directory.feature
-- features/dnf_package.feature
-- features/do_nothing.feature
-- features/dpkg_package.feature
-- features/dsc_resource.feature
-- features/dsc_script.feature
-- features/env.feature
-- features/erl_call.feature
-- features/execute.feature
-- features/exotic_zero_port.feature
-- features/expect_exception.feature
-- features/file.feature
-- features/freebsd_package.feature
-- features/gem_package.feature
-- features/git.feature
-- features/group.feature
-- features/guards.feature
-- features/heavy_provider_light_resource.feature
-- features/homebrew_package.feature
-- features/http_request.feature
-- features/ifconfig.feature
-- features/include_recipe.feature
-- features/ips_package.feature
-- features/launchd.feature
-- features/link.feature
-- features/log.feature
-- features/macports_package.feature
-- features/mdadm.feature
-- features/mount.feature
-- features/msu_package.feature
-- features/multiple_actions.feature
-- features/multiple_run_action.feature
-- features/notifications.feature
-- features/ohai.feature
-- features/openbsd_package.feature
-- features/osx_profile.feature
-- features/package.feature
-- features/pacman_package.feature
-- features/paludis_package.feature
-- features/portage_package.feature
-- features/powershell_script.feature
-- features/reboot.feature
-- features/registry_key.feature
-- features/remote_directory.feature
-- features/remote_file.feature
-- features/render_file.feature
-- features/roles.feature
-- features/route.feature
-- features/rpm_package.feature
-- features/ruby_block.feature
-- features/script.feature
-- features/server.feature
-- features/server_on_disk.feature
-- features/service.feature
-- features/smartos_package.feature
-- features/solaris_package.feature
-- features/state_attrs.feature
-- features/step_definitions/background_steps.rb
-- features/step_into.feature
-- features/stub_command.feature
-- features/stub_data_bag.feature
-- features/stub_data_bag_item.feature
-- features/stub_node.feature
-- features/stub_search.feature
-- features/subscribes.feature
-- features/subversion.feature
-- features/support/env.rb
-- features/support/executor.rb
-- features/support/exotic_zero_port.rb
-- features/support/on_disk.rb
-- features/systemd_unit.feature
-- features/template.feature
-- features/use_inline_resources.feature
-- features/user.feature
-- features/windows_package.feature
-- features/windows_service.feature
-- features/yum_package.feature
-- features/yum_repository.feature
-- features/zypper_package.feature
 - lib/chefspec.rb
 - lib/chefspec/api.rb
-- lib/chefspec/api/apt_package.rb
-- lib/chefspec/api/apt_repository.rb
-- lib/chefspec/api/apt_update.rb
-- lib/chefspec/api/batch.rb
-- lib/chefspec/api/bff_package.rb
-- lib/chefspec/api/cab_package.rb
-- lib/chefspec/api/chef_gem.rb
-- lib/chefspec/api/chocolatey_package.rb
-- lib/chefspec/api/cookbook_file.rb
-- lib/chefspec/api/cron.rb
-- lib/chefspec/api/deploy.rb
-- lib/chefspec/api/directory.rb
-- lib/chefspec/api/dnf_package.rb
 - lib/chefspec/api/do_nothing.rb
-- lib/chefspec/api/dpkg_package.rb
-- lib/chefspec/api/dsc_resource.rb
-- lib/chefspec/api/dsc_script.rb
-- lib/chefspec/api/easy_install_package.rb
-- lib/chefspec/api/env.rb
-- lib/chefspec/api/erl_call.rb
-- lib/chefspec/api/execute.rb
-- lib/chefspec/api/file.rb
-- lib/chefspec/api/freebsd_package.rb
-- lib/chefspec/api/gem_package.rb
-- lib/chefspec/api/git.rb
-- lib/chefspec/api/group.rb
-- lib/chefspec/api/homebrew_package.rb
-- lib/chefspec/api/http_request.rb
-- lib/chefspec/api/ifconfig.rb
 - lib/chefspec/api/include_recipe.rb
-- lib/chefspec/api/ips_package.rb
-- lib/chefspec/api/launchd.rb
 - lib/chefspec/api/link.rb
-- lib/chefspec/api/log.rb
-- lib/chefspec/api/macports_package.rb
-- lib/chefspec/api/mdadm.rb
-- lib/chefspec/api/mount.rb
-- lib/chefspec/api/msu_package.rb
 - lib/chefspec/api/notifications.rb
-- lib/chefspec/api/ohai.rb
-- lib/chefspec/api/openbsd_package.rb
-- lib/chefspec/api/osx_profile.rb
-- lib/chefspec/api/package.rb
-- lib/chefspec/api/pacman_package.rb
-- lib/chefspec/api/paludis_package.rb
-- lib/chefspec/api/portage_package.rb
-- lib/chefspec/api/powershell_script.rb
 - lib/chefspec/api/reboot.rb
-- lib/chefspec/api/registry_key.rb
-- lib/chefspec/api/remote_directory.rb
-- lib/chefspec/api/remote_file.rb
 - lib/chefspec/api/render_file.rb
-- lib/chefspec/api/route.rb
-- lib/chefspec/api/rpm_package.rb
-- lib/chefspec/api/ruby_block.rb
-- lib/chefspec/api/script.rb
-- lib/chefspec/api/service.rb
-- lib/chefspec/api/smartos_package.rb
-- lib/chefspec/api/solaris_package.rb
 - lib/chefspec/api/state_attrs.rb
 - lib/chefspec/api/subscriptions.rb
-- lib/chefspec/api/subversion.rb
-- lib/chefspec/api/systemd_unit.rb
-- lib/chefspec/api/template.rb
 - lib/chefspec/api/user.rb
-- lib/chefspec/api/windows_package.rb
-- lib/chefspec/api/windows_service.rb
-- lib/chefspec/api/yum_package.rb
-- lib/chefspec/api/yum_repository.rb
-- lib/chefspec/api/zypper_package.rb
 - lib/chefspec/berkshelf.rb
 - lib/chefspec/cacher.rb
 - lib/chefspec/coverage.rb
@@ -869,6 +655,7 @@ files:
 - lib/chefspec/deprecations.rb
 - lib/chefspec/errors.rb
 - lib/chefspec/expect_exception.rb
+- lib/chefspec/extensions.rb
 - lib/chefspec/extensions/chef/client.rb
 - lib/chefspec/extensions/chef/conditional.rb
 - lib/chefspec/extensions/chef/cookbook_uploader.rb
@@ -913,7 +700,6 @@ files:
 - lib/chefspec/zero_server.rb
 - spec/spec_helper.rb
 - spec/support/hash.rb
-- spec/unit/api_spec.rb
 - spec/unit/cacher_spec.rb
 - spec/unit/coverage/filters_spec.rb
 - spec/unit/deprecations_spec.rb
@@ -977,104 +763,8 @@ signing_key:
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!
 test_files:
-- features/apt_package.feature
-- features/apt_repository.feature
-- features/apt_update.feature
-- features/attributes.feature
-- features/batch.feature
-- features/bff_package.feature
-- features/cab_package.feature
-- features/cached.feature
-- features/chef_gem.feature
-- features/chocolatey_package.feature
-- features/compile_time.feature
-- features/cookbook_file.feature
-- features/cron.feature
-- features/custom_matcher.feature
-- features/custom_resource.feature
-- features/deploy.feature
-- features/directory.feature
-- features/dnf_package.feature
-- features/do_nothing.feature
-- features/dpkg_package.feature
-- features/dsc_resource.feature
-- features/dsc_script.feature
-- features/env.feature
-- features/erl_call.feature
-- features/execute.feature
-- features/exotic_zero_port.feature
-- features/expect_exception.feature
-- features/file.feature
-- features/freebsd_package.feature
-- features/gem_package.feature
-- features/git.feature
-- features/group.feature
-- features/guards.feature
-- features/heavy_provider_light_resource.feature
-- features/homebrew_package.feature
-- features/http_request.feature
-- features/ifconfig.feature
-- features/include_recipe.feature
-- features/ips_package.feature
-- features/launchd.feature
-- features/link.feature
-- features/log.feature
-- features/macports_package.feature
-- features/mdadm.feature
-- features/mount.feature
-- features/msu_package.feature
-- features/multiple_actions.feature
-- features/multiple_run_action.feature
-- features/notifications.feature
-- features/ohai.feature
-- features/openbsd_package.feature
-- features/osx_profile.feature
-- features/package.feature
-- features/pacman_package.feature
-- features/paludis_package.feature
-- features/portage_package.feature
-- features/powershell_script.feature
-- features/reboot.feature
-- features/registry_key.feature
-- features/remote_directory.feature
-- features/remote_file.feature
-- features/render_file.feature
-- features/roles.feature
-- features/route.feature
-- features/rpm_package.feature
-- features/ruby_block.feature
-- features/script.feature
-- features/server.feature
-- features/server_on_disk.feature
-- features/service.feature
-- features/smartos_package.feature
-- features/solaris_package.feature
-- features/state_attrs.feature
-- features/step_definitions/background_steps.rb
-- features/step_into.feature
-- features/stub_command.feature
-- features/stub_data_bag.feature
-- features/stub_data_bag_item.feature
-- features/stub_node.feature
-- features/stub_search.feature
-- features/subscribes.feature
-- features/subversion.feature
-- features/support/env.rb
-- features/support/executor.rb
-- features/support/exotic_zero_port.rb
-- features/support/on_disk.rb
-- features/systemd_unit.feature
-- features/template.feature
-- features/use_inline_resources.feature
-- features/user.feature
-- features/windows_package.feature
-- features/windows_service.feature
-- features/yum_package.feature
-- features/yum_repository.feature
-- features/zypper_package.feature
 - spec/spec_helper.rb
 - spec/support/hash.rb
-- spec/unit/api_spec.rb
 - spec/unit/cacher_spec.rb
 - spec/unit/coverage/filters_spec.rb
 - spec/unit/deprecations_spec.rb