chefspec 7.0.0 → 7.1.0

data/examples/dnf_package/spec/upgrade_spec.rb

@@ -1,22 +1,24 @@
 require 'chefspec'
 
-describe 'dnf_package::upgrade' do
-  let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'fedora', version: '25')
-                          .converge(described_recipe)
-  end
+if defined?(Chef::Resource::DnfPackage)
+  describe 'dnf_package::upgrade' do
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new(platform: 'fedora', version: '25')
+        .converge(described_recipe)
+    end
 
-  it 'upgrades a dnf_package with an explicit action' do
-    expect(chef_run).to upgrade_dnf_package('explicit_action')
-    expect(chef_run).to_not upgrade_dnf_package('not_explicit_action')
-  end
+    it 'upgrades a dnf_package with an explicit action' do
+      expect(chef_run).to upgrade_dnf_package('explicit_action')
+      expect(chef_run).to_not upgrade_dnf_package('not_explicit_action')
+    end
 
-  it 'upgrades a dnf_package with attributes' do
-    expect(chef_run).to upgrade_dnf_package('with_attributes').with(version: '1.0.0')
-    expect(chef_run).to_not upgrade_dnf_package('with_attributes').with(version: '1.2.3')
-  end
+    it 'upgrades a dnf_package with attributes' do
+      expect(chef_run).to upgrade_dnf_package('with_attributes').with(version: '1.0.0')
+      expect(chef_run).to_not upgrade_dnf_package('with_attributes').with(version: '1.2.3')
+    end
 
-  it 'upgrades a dnf_package when specifying the identity attribute' do
-    expect(chef_run).to upgrade_dnf_package('identity_attribute')
+    it 'upgrades a dnf_package when specifying the identity attribute' do
+      expect(chef_run).to upgrade_dnf_package('identity_attribute')
+    end
   end
 end

data/examples/heavy_provider_light_resource/spec/provider_service_spec.rb

@@ -1,3 +1,4 @@
+require 'chefspec'
 require_relative '../libraries/resource_service'
 
 describe 'heavy_provider_light_resource::default' do

data/examples/msu_package/spec/install_spec.rb

@@ -1,26 +1,28 @@
 require 'chefspec'
 
-describe 'msu_package::install' do
-  let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                          .converge(described_recipe)
-  end
+if defined?(Chef::Resource::MsuPackage)
+  describe 'msu_package::install' do
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+        .converge(described_recipe)
+    end
 
-  it 'installs a msu_package with the default action' do
-    expect(chef_run).to install_msu_package('default_action')
-    expect(chef_run).to_not install_msu_package('not_default_action')
-  end
+    it 'installs a msu_package with the default action' do
+      expect(chef_run).to install_msu_package('default_action')
+      expect(chef_run).to_not install_msu_package('not_default_action')
+    end
 
-  it 'installs a msu_package with an explicit action' do
-    expect(chef_run).to install_msu_package('explicit_action')
-  end
+    it 'installs a msu_package with an explicit action' do
+      expect(chef_run).to install_msu_package('explicit_action')
+    end
 
-  it 'installs a msu_package with attributes' do
-    expect(chef_run).to install_msu_package('with_attributes').with(version: '1.0.0')
-    expect(chef_run).to_not install_msu_package('with_attributes').with(version: '1.2.3')
-  end
+    it 'installs a msu_package with attributes' do
+      expect(chef_run).to install_msu_package('with_attributes').with(version: '1.0.0')
+      expect(chef_run).to_not install_msu_package('with_attributes').with(version: '1.2.3')
+    end
 
-  it 'installs a msu_package when specifying the identity attribute' do
-    expect(chef_run).to install_msu_package('identity_attribute')
+    it 'installs a msu_package when specifying the identity attribute' do
+      expect(chef_run).to install_msu_package('identity_attribute')
+    end
   end
 end

data/examples/msu_package/spec/remove_spec.rb

@@ -1,22 +1,24 @@
 require 'chefspec'
 
-describe 'msu_package::remove' do
-  let(:chef_run) do
-    ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
-                          .converge(described_recipe)
-  end
+if defined?(Chef::Resource::MsuPackage)
+  describe 'msu_package::remove' do
+    let(:chef_run) do
+      ChefSpec::ServerRunner.new(platform: 'windows', version: '2012R2')
+        .converge(described_recipe)
+    end
 
-  it 'removes a msu_package with an explicit action' do
-    expect(chef_run).to remove_msu_package('explicit_action')
-    expect(chef_run).to_not remove_msu_package('not_explicit_action')
-  end
+    it 'removes a msu_package with an explicit action' do
+      expect(chef_run).to remove_msu_package('explicit_action')
+      expect(chef_run).to_not remove_msu_package('not_explicit_action')
+    end
 
-  it 'removes a msu_package with attributes' do
-    expect(chef_run).to remove_msu_package('with_attributes').with(version: '1.0.0')
-    expect(chef_run).to_not remove_msu_package('with_attributes').with(version: '1.2.3')
-  end
+    it 'removes a msu_package with attributes' do
+      expect(chef_run).to remove_msu_package('with_attributes').with(version: '1.0.0')
+      expect(chef_run).to_not remove_msu_package('with_attributes').with(version: '1.2.3')
+    end
 
-  it 'removes a msu_package when specifying the identity attribute' do
-    expect(chef_run).to remove_msu_package('identity_attribute')
+    it 'removes a msu_package when specifying the identity attribute' do
+      expect(chef_run).to remove_msu_package('identity_attribute')
+    end
   end
 end

data/examples/server/spec/exotic_port_spec.rb

@@ -1,6 +1,19 @@
 require 'chefspec'
 
 describe 'server::port' do
+  before(:all) do
+    @oldsetting = RSpec.configuration.server_runner_port
+    RSpec.configuration.server_runner_port = (8900..8910)
+    ChefSpec::ZeroServer.nuke!
+    ChefSpec::ZeroServer.setup!
+  end
+
+  after(:all) do
+    RSpec.configuration.server_runner_port = @oldsetting
+    ChefSpec::ZeroServer.nuke!
+    ChefSpec::ZeroServer.setup!
+  end
+
   let(:chef_run) do
     ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
   end
@@ -10,8 +23,8 @@ describe 'server::port' do
   end
 
   it 'creates a chef-zero listening on the right port' do
-    expect(ChefSpec::ZeroServer.server).to be_running?
+    expect(ChefSpec::ZeroServer.server).to be_running
     expect(ChefSpec::ZeroServer.server.port).to be_a(Integer)
-    expect(8900..9010).to include(ChefSpec::ZeroServer.server.port)
+    expect(8890..9010).to include(ChefSpec::ZeroServer.server.port)
   end
 end

data/lib/chefspec.rb

@@ -42,14 +42,7 @@ module ChefSpec
   module_function :matchers
 end
 
-require_relative 'chefspec/extensions/chef/securable'
-require_relative 'chefspec/extensions/chef/client'
-require_relative 'chefspec/extensions/chef/conditional'
-require_relative 'chefspec/extensions/chef/cookbook_uploader'
-require_relative 'chefspec/extensions/chef/data_query'
-require_relative 'chefspec/extensions/chef/lwrp_base'
-require_relative 'chefspec/extensions/chef/resource'
-require_relative 'chefspec/extensions/chef/resource/freebsd_package'
+require_relative 'chefspec/extensions'
 
 require_relative 'chefspec/mixins/normalize'
 

data/lib/chefspec/api.rb

@@ -1,96 +1,18 @@
 module ChefSpec
   module API
-    extend self
-
-    def self.included(base)
-      submodules.each do |child|
-        base.send(:include, child)
-      end
-    end
-
-    private
-
-    #
-    # WARNING: This is metaprogramming madness. Find all modules who are
-    # nested beneath this module.
-    #
-    # @return [Array<Module>]
-    #
-    def submodules
-      self.constants
-        .map { |name| const_get(name) }
-        .select { |const| const.class == Module }
-    end
+    # empty container
   end
 end
 
-require_relative 'api/apt_package'
-require_relative 'api/apt_update'
-require_relative 'api/apt_repository'
-require_relative 'api/bff_package'
-require_relative 'api/batch'
-require_relative 'api/cab_package'
-require_relative 'api/chef_gem'
-require_relative 'api/chocolatey_package'
-require_relative 'api/cookbook_file'
-require_relative 'api/cron'
-require_relative 'api/deploy'
-require_relative 'api/directory'
-require_relative 'api/dnf_package'
-require_relative 'api/dpkg_package'
+# non-resources
 require_relative 'api/do_nothing'
-require_relative 'api/dsc_resource'
-require_relative 'api/dsc_script'
-require_relative 'api/easy_install_package'
-require_relative 'api/env'
-require_relative 'api/erl_call'
-require_relative 'api/execute'
-require_relative 'api/file'
-require_relative 'api/freebsd_package'
-require_relative 'api/gem_package'
-require_relative 'api/git'
-require_relative 'api/group'
-require_relative 'api/homebrew_package'
-require_relative 'api/http_request'
-require_relative 'api/ifconfig'
 require_relative 'api/include_recipe'
-require_relative 'api/ips_package'
-require_relative 'api/launchd'
-require_relative 'api/link'
-require_relative 'api/log'
-require_relative 'api/macports_package'
-require_relative 'api/mdadm'
-require_relative 'api/mount'
-require_relative 'api/msu_package'
 require_relative 'api/notifications'
-require_relative 'api/ohai'
-require_relative 'api/openbsd_package'
-require_relative 'api/osx_profile'
-require_relative 'api/package'
-require_relative 'api/pacman_package'
-require_relative 'api/paludis_package'
-require_relative 'api/portage_package'
-require_relative 'api/powershell_script'
-require_relative 'api/reboot'
-require_relative 'api/registry_key'
-require_relative 'api/remote_directory'
-require_relative 'api/remote_file'
 require_relative 'api/render_file'
-require_relative 'api/route'
-require_relative 'api/rpm_package'
-require_relative 'api/ruby_block'
-require_relative 'api/script'
-require_relative 'api/service'
-require_relative 'api/smartos_package'
-require_relative 'api/solaris_package'
 require_relative 'api/state_attrs'
 require_relative 'api/subscriptions'
-require_relative 'api/subversion'
-require_relative 'api/systemd_unit'
-require_relative 'api/template'
+
+# hacks and sugar for resources that don't follow the normal pattern
 require_relative 'api/user'
-require_relative 'api/windows_package'
-require_relative 'api/windows_service'
-require_relative 'api/yum_package'
-require_relative 'api/yum_repository'
-require_relative 'api/zypper_package'
+require_relative 'api/link'
+require_relative 'api/reboot'

data/lib/chefspec/api/do_nothing.rb

@@ -1,24 +1,21 @@
 module ChefSpec::API
-  # @since 3.4.0
-  module DoNothingMatchers
-    #
-    # Assert that a resource in the Chef run does not perform any actions. Given
-    # a resource with +action :nothing+:
-    #
-    #     package 'apache2' do
-    #       action :nothing
-    #     end
-    #
-    # The Examples section demonstrates the different ways to test that no
-    # actions were performed on a resource in a Chef run.
-    #
-    # @example Assert the +package+ does not perform any actions
-    #
-    #
-    # @return [ChefSpec::Matchers::DoNothingMatcher]
-    #
-    def do_nothing
-      ChefSpec::Matchers::DoNothingMatcher.new
-    end
+  #
+  # Assert that a resource in the Chef run does not perform any actions. Given
+  # a resource with +action :nothing+:
+  #
+  #     package 'apache2' do
+  #       action :nothing
+  #     end
+  #
+  # The Examples section demonstrates the different ways to test that no
+  # actions were performed on a resource in a Chef run.
+  #
+  # @example Assert the +package+ does not perform any actions
+  #
+  #
+  # @return [ChefSpec::Matchers::DoNothingMatcher]
+  #
+  def do_nothing
+    ChefSpec::Matchers::DoNothingMatcher.new
   end
 end

data/lib/chefspec/api/include_recipe.rb

@@ -1,26 +1,23 @@
 module ChefSpec::API
-  # @since 0.2.1
-  module IncludeRecipeMatchers
-    #
-    # Assert that a Chef run includes a certain recipe. Given a Chef Recipe
-    # that calls +include_recipe+:
-    #
-    #     include_recipe 'apache2::default'
-    #
-    # The Examples section demonstrates the different ways to test an
-    # +include_recipe+ directive with ChefSpec.
-    #
-    # @example Assert the +apache2::default+ recipe is included in the Chef run
-    #   expect(chef_run).to include_recipe('apache2::default')
-    #
-    #
-    # @param [String] recipe_name
-    #   the name of the recipe to be included
-    #
-    # @return [ChefSpec::Matchers::IncludeRecipeMatcher]
-    #
-    def include_recipe(recipe_name)
-      ChefSpec::Matchers::IncludeRecipeMatcher.new(recipe_name)
-    end
+  #
+  # Assert that a Chef run includes a certain recipe. Given a Chef Recipe
+  # that calls +include_recipe+:
+  #
+  #     include_recipe 'apache2::default'
+  #
+  # The Examples section demonstrates the different ways to test an
+  # +include_recipe+ directive with ChefSpec.
+  #
+  # @example Assert the +apache2::default+ recipe is included in the Chef run
+  #   expect(chef_run).to include_recipe('apache2::default')
+  #
+  #
+  # @param [String] recipe_name
+  #   the name of the recipe to be included
+  #
+  # @return [ChefSpec::Matchers::IncludeRecipeMatcher]
+  #
+  def include_recipe(recipe_name)
+    ChefSpec::Matchers::IncludeRecipeMatcher.new(recipe_name)
   end
 end

data/lib/chefspec/api/link.rb

@@ -1,102 +1,23 @@
 module ChefSpec::API
-  # @since 1.1.0
-  module LinkMatchers
-    ChefSpec.define_matcher :link
-
-    #
-    # Assert that a +link+ resource exists in the Chef run with the
-    # action +:create+. Given a Chef Recipe that creates "/tmp" as a
-    # +link+:
-    #
-    #     link '/tmp' do
-    #       action :create
-    #     end
-    #
-    # The Examples section demonstrates the different ways to test a
-    # +link+ resource with ChefSpec.
-    #
-    # @example Assert that a +link+ was created
-    #   expect(chef_run).to create_link('/tmp')
-    #
-    # @example Assert that a +link+ was created with predicate matchers
-    #   expect(chef_run).to create_link('/tmp').with_link_type(:hard)
-    #
-    # @example Assert that a +link+ was created with attributes
-    #   expect(chef_run).to create_link('/tmp').with(link_type: :hard)
-    #
-    # @example Assert that a +link+ was created using a regex
-    #   expect(chef_run).to create_link('/tmp').with(link_type: Symbol)
-    #
-    # @example Assert that a +link+ was _not_ created
-    #   expect(chef_run).to_not create_link('/tmp')
-    #
-    #
-    # @param [String, Regex] resource_name
-    #   the name of the resource to match
-    #
-    # @return [ChefSpec::Matchers::ResourceMatcher]
-    #
-    def create_link(resource_name)
-      ChefSpec::Matchers::ResourceMatcher.new(:link, :create, resource_name)
-    end
-
-    #
-    # Assert that a +link+ resource exists in the Chef run with the
-    # action +:delete+. Given a Chef Recipe that deletes "/tmp" as a
-    # +link+:
-    #
-    #     link '/tmp' do
-    #       action :delete
-    #     end
-    #
-    # The Examples section demonstrates the different ways to test a
-    # +link+ resource with ChefSpec.
-    #
-    # @example Assert that a +link+ was deleted
-    #   expect(chef_run).to delete_link('/tmp')
-    #
-    # @example Assert that a +link+ was deleted with predicate matchers
-    #   expect(chef_run).to delete_link('/tmp').with_link_type(:hard)
-    #
-    # @example Assert that a +link+ was deleted with attributes
-    #   expect(chef_run).to delete_link('/tmp').with(link_type: :hard)
-    #
-    # @example Assert that a +link+ was deleted using a regex
-    #   expect(chef_run).to delete_link('/tmp').with(link_type: Symbol)
-    #
-    # @example Assert that a +link+ was _not_ deleted
-    #   expect(chef_run).to_not delete_link('/tmp')
-    #
-    #
-    # @param [String, Regex] resource_name
-    #   the name of the resource to match
-    #
-    # @return [ChefSpec::Matchers::ResourceMatcher]
-    #
-    def delete_link(resource_name)
-      ChefSpec::Matchers::ResourceMatcher.new(:link, :delete, resource_name)
-    end
-
-    #
-    # Assert that a symlink links to a specific path. This is really
-    # syntactic sugar for the following:
-    #
-    #       expect(chef_run).to create_link('/tmp/thing').with(to: '/tmp/other_thing')
-    #
-    # @example Using +link_to+ with a String path
-    #   link = chef_run.link('/tmp/thing')
-    #   expect(link).to link_to('/tmp/other_thing')
-    #
-    # @example Using +link_to+ with a regular expression
-    #   expect(link).to link_to(/\/tmp/(.+)/)
-    #
-    # @param [String, Regex] path
-    #   the path to link to
-    #
-    # @return [ChefSpec::Matchers::LinkToMatcher]
-    #
-    def link_to(path)
-      ChefSpec::Matchers::LinkToMatcher.new(path)
-    end
+  #
+  # Assert that a symlink links to a specific path. This is really
+  # syntactic sugar for the following:
+  #
+  #       expect(chef_run).to create_link('/tmp/thing').with(to: '/tmp/other_thing')
+  #
+  # @example Using +link_to+ with a String path
+  #   link = chef_run.link('/tmp/thing')
+  #   expect(link).to link_to('/tmp/other_thing')
+  #
+  # @example Using +link_to+ with a regular expression
+  #   expect(link).to link_to(/\/tmp/(.+)/)
+  #
+  # @param [String, Regex] path
+  #   the path to link to
+  #
+  # @return [ChefSpec::Matchers::LinkToMatcher]
+  #
+  def link_to(path)
+    ChefSpec::Matchers::LinkToMatcher.new(path)
   end
 end