chefspec 4.0.2 → 4.1.0

data/lib/chefspec/api.rb

@@ -1,5 +1,3 @@
-require_relative 'runner'
-
 module ChefSpec
   module API
     extend self

data/lib/chefspec/api/apt_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module AptPackageMatchers
-    ChefSpec::Runner.define_runner_method :apt_package
+    ChefSpec.define_matcher :apt_package
 
     #
     # Assert that an +apt_package+ resource exists in the Chef run with the

data/lib/chefspec/api/batch.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module BatchMatchers
-    ChefSpec::Runner.define_runner_method :batch
+    ChefSpec.define_matcher :batch
 
     #
     # Assert that a +batch+ resource exists in the Chef run with the

data/lib/chefspec/api/chef_gem.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.8.0
   module ChefGemMatchers
-    ChefSpec::Runner.define_runner_method :chef_gem
+    ChefSpec.define_matcher :chef_gem
 
     #
     # Assert that a +chef_gem+ resource exists in the Chef run with the

data/lib/chefspec/api/cookbook_file.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.0.1
   module CookbookFileMatchers
-    ChefSpec::Runner.define_runner_method :cookbook_file
+    ChefSpec.define_matcher :cookbook_file
 
     #
     # Assert that a +cookbook_file+ resource exists in the Chef run with the

data/lib/chefspec/api/cron.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.7.0
   module CronMatchers
-    ChefSpec::Runner.define_runner_method :cron
+    ChefSpec.define_matcher :cron
 
     #
     # Assert that a +cron+ resource exists in the Chef run with the

data/lib/chefspec/api/deploy.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module DeployMatchers
-    ChefSpec::Runner.define_runner_method :deploy
+    ChefSpec.define_matcher :deploy
 
     #
     # Assert that a +deploy+ resource exists in the Chef run with the

data/lib/chefspec/api/directory.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.0.1
   module DirectoryMatchers
-    ChefSpec::Runner.define_runner_method :directory
+    ChefSpec.define_matcher :directory
 
     #
     # Assert that a +directory+ resource exists in the Chef run with the

data/lib/chefspec/api/dpkg_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module DpkgPackageMatchers
-    ChefSpec::Runner.define_runner_method :dpkg_package
+    ChefSpec.define_matcher :dpkg_package
 
     #
     # Assert that a +dpkg_package+ resource exists in the Chef run with the

data/lib/chefspec/api/easy_install_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module EasyInstallPackageMatchers
-    ChefSpec::Runner.define_runner_method :easy_install_package
+    ChefSpec.define_matcher :easy_install_package
 
     #
     # Assert that an +easy_install_package+ resource exists in the Chef run

data/lib/chefspec/api/env.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.9.0
   module EnvMatchers
-    ChefSpec::Runner.define_runner_method :env
+    ChefSpec.define_matcher :env
 
     #
     # Assert that an +env+ resource exists in the Chef run with the

data/lib/chefspec/api/erl_call.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module ErlCallMatchers
-    ChefSpec::Runner.define_runner_method :erl_call
+    ChefSpec.define_matcher :erl_call
 
     #
     # Assert that an +erl_call+ resource exists in the Chef run with the

data/lib/chefspec/api/execute.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.0.1
   module ExecuteMatchers
-    ChefSpec::Runner.define_runner_method :execute
+    ChefSpec.define_matcher :execute
 
     #
     # Assert that an +execute+ resource exists in the Chef run with the

data/lib/chefspec/api/file.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.0.1
   module FileMatchers
-    ChefSpec::Runner.define_runner_method :file
+    ChefSpec.define_matcher :file
 
     #
     # Assert that a +file+ resource exists in the Chef run with the

data/lib/chefspec/api/freebsd_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module FreebsdPackageMatchers
-    ChefSpec::Runner.define_runner_method :freebsd_package
+    ChefSpec.define_matcher :freebsd_package
 
     #
     # Assert that a +freebsd_package+ resource exists in the Chef run with the

data/lib/chefspec/api/gem_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.5.0
   module GemPackageMatchers
-    ChefSpec::Runner.define_runner_method :gem_package
+    ChefSpec.define_matcher :gem_package
 
     #
     # Assert that a +gem_package+ resource exists in the Chef run with the

data/lib/chefspec/api/git.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module GitMatchers
-    ChefSpec::Runner.define_runner_method :git
+    ChefSpec.define_matcher :git
 
     #
     # Assert that a +git+ resource exists in the Chef run with the

data/lib/chefspec/api/group.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 1.0.0
   module GroupMatchers
-    ChefSpec::Runner.define_runner_method :group
+    ChefSpec.define_matcher :group
 
     #
     # Assert that a +group+ resource exists in the Chef run with the

data/lib/chefspec/api/http_request.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module HttpRequestMatchers
-    ChefSpec::Runner.define_runner_method :http_request
+    ChefSpec.define_matcher :http_request
 
     #
     # Assert that an +http_request+ resource exists in the Chef run with the

data/lib/chefspec/api/ifconfig.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module IfconfigMatchers
-    ChefSpec::Runner.define_runner_method :ifconfig
+    ChefSpec.define_matcher :ifconfig
 
     #
     # Assert that an +ifconfig+ resource exists in the Chef run with the

data/lib/chefspec/api/ips_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module IpsPackageMatchers
-    ChefSpec::Runner.define_runner_method :ips_package
+    ChefSpec.define_matcher :ips_package
 
     #
     # Assert that an +ips_package+ resource exists in the Chef run with the

data/lib/chefspec/api/link.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 1.1.0
   module LinkMatchers
-    ChefSpec::Runner.define_runner_method :link
+    ChefSpec.define_matcher :link
 
     #
     # Assert that a +link+ resource exists in the Chef run with the

data/lib/chefspec/api/log.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module LogMatchers
-    ChefSpec::Runner.define_runner_method :log
+    ChefSpec.define_matcher :log
 
     #
     # Assert that a +log+ resource exists in the Chef run with the

data/lib/chefspec/api/macports_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module MacportsPackageMatchers
-    ChefSpec::Runner.define_runner_method :macports_package
+    ChefSpec.define_matcher :macports_package
 
     #
     # Assert that a +macports_package+ resource exists in the Chef run with the

data/lib/chefspec/api/mdadm.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module MdadmMatchers
-    ChefSpec::Runner.define_runner_method :mdadm
+    ChefSpec.define_matcher :mdadm
 
     #
     # Assert that a +mdadm+ resource exists in the Chef run with the

data/lib/chefspec/api/mount.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module MountMatchers
-    ChefSpec::Runner.define_runner_method :mount
+    ChefSpec.define_matcher :mount
 
     #
     # Assert that a +mount+ resource exists in the Chef run with the

data/lib/chefspec/api/ohai.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module OhaiMatchers
-    ChefSpec::Runner.define_runner_method :ohai
+    ChefSpec.define_matcher :ohai
 
     #
     # Assert that an +ohai+ resource exists in the Chef run with the
@@ -25,7 +25,7 @@ module ChefSpec::API
     #   expect(chef_run).to reload_ohai('reload').with(system: true)
     #
     # @example Assert that an +ohai+ was reloaded using a regex
-    #   expect(chef_run).to reload_ohai('reload').with(system: Boolean)
+    #   expect(chef_run).to reload_ohai('reload').with(system: /true/)
     #
     # @example Assert that an +ohai+ was _not_ reloaded
     #   expect(chef_run).to_not reload_ohai('reload')

data/lib/chefspec/api/package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.0.1
   module PackageMatchers
-    ChefSpec::Runner.define_runner_method :package
+    ChefSpec.define_matcher :package
 
     #
     # Assert that an +package+ resource exists in the Chef run with the

data/lib/chefspec/api/pacman_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module PacmanPackageMatchers
-    ChefSpec::Runner.define_runner_method :pacman_package
+    ChefSpec.define_matcher :pacman_package
 
     #
     # Assert that an +pacman_package+ resource exists in the Chef run with the

data/lib/chefspec/api/portage_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module PortagePackageMatchers
-    ChefSpec::Runner.define_runner_method :portage_package
+    ChefSpec.define_matcher :portage_package
 
     #
     # Assert that an +portage_package+ resource exists in the Chef run with the

data/lib/chefspec/api/powershell_script.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module PowershellScriptMatchers
-    ChefSpec::Runner.define_runner_method :powershell_script
+    ChefSpec.define_matcher :powershell_script
 
     #
     # Assert that a +powershell_script+ resource exists in the Chef run with the

data/lib/chefspec/api/registry_key.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module RegistryKeyMatchers
-    ChefSpec::Runner.define_runner_method :registry_key
+    ChefSpec.define_matcher :registry_key
 
     #
     # Assert that a +registry_key+ resource exists in the Chef run with the

data/lib/chefspec/api/remote_directory.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module RemoteDirectoryMatchers
-    ChefSpec::Runner.define_runner_method :remote_directory
+    ChefSpec.define_matcher :remote_directory
 
     #
     # Assert that a +remote_directory+ resource exists in the Chef run with the
@@ -25,7 +25,7 @@ module ChefSpec::API
     #   expect(chef_run).to create_remote_directory('/tmp').with(overwrite: true)
     #
     # @example Assert that a +remote_directory+ was createed using a regex
-    #   expect(chef_run).to create_remote_directory('/tmp').with(overwrite: Boolean)
+    #   expect(chef_run).to create_remote_directory('/tmp').with(overwrite: /true/)
     #
     # @example Assert that a +remote_directory+ was _not_ createed
     #   expect(chef_run).to_not create_remote_directory('/tmp')
@@ -65,7 +65,7 @@ module ChefSpec::API
     #   expect(chef_run).to create_remote_directory_if_missing('/tmp/config').with(overwrite: true)
     #
     # @example Assert that a +remote_directory+ was created if missing using a regex
-    #   expect(chef_run).to create_remote_directory_if_missing('/tmp/config').with(overwrite: Boolean)
+    #   expect(chef_run).to create_remote_directory_if_missing('/tmp/config').with(overwrite: /true/)
     #
     # @example Assert that a +remote_directory+ was _not_ created if missing
     #   expect(chef_run).to_not create_remote_directory('/tmp/config')
@@ -102,7 +102,7 @@ module ChefSpec::API
     #   expect(chef_run).to delete_remote_directory('/tmp').with(overwrite: true)
     #
     # @example Assert that a +remote_directory+ was deleteed using a regex
-    #   expect(chef_run).to delete_remote_directory('/tmp').with(overwrite: Boolean)
+    #   expect(chef_run).to delete_remote_directory('/tmp').with(overwrite: /true/)
     #
     # @example Assert that a +remote_directory+ was _not_ deleteed
     #   expect(chef_run).to_not delete_remote_directory('/tmp')

data/lib/chefspec/api/remote_file.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 1.0.0
   module RemoteFileMatchers
-    ChefSpec::Runner.define_runner_method :remote_file
+    ChefSpec.define_matcher :remote_file
 
     #
     # Assert that a +remote_file+ resource exists in the Chef run with the

data/lib/chefspec/api/route.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module RouteMatchers
-    ChefSpec::Runner.define_runner_method :route
+    ChefSpec.define_matcher :route
 
     #
     # Assert that a +route+ resource exists in the Chef run with the

data/lib/chefspec/api/rpm_package.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 3.0.0
   module RpmPackageMatchers
-    ChefSpec::Runner.define_runner_method :rpm_package
+    ChefSpec.define_matcher :rpm_package
 
     #
     # Assert that a +rpm_package+ resource exists in the Chef run with the

data/lib/chefspec/api/ruby_block.rb

@@ -1,7 +1,7 @@
 module ChefSpec::API
   # @since 0.5.0
   module RubyBlockMatchers
-    ChefSpec::Runner.define_runner_method :ruby_block
+    ChefSpec.define_matcher :ruby_block
 
     #
     # Assert that a +ruby_block+ resource exists in the Chef run with the

data/lib/chefspec/api/script.rb

@@ -38,7 +38,7 @@ module ChefSpec::API
       ChefSpec::Matchers::ResourceMatcher.new(:bash, :run, resource_name)
     end
 
-    ChefSpec::Runner.define_runner_method :bash
+    ChefSpec.define_matcher :bash
 
     #
     # Assert that a +csh+ resource exists in the Chef run with the
@@ -77,7 +77,7 @@ module ChefSpec::API
       ChefSpec::Matchers::ResourceMatcher.new(:csh, :run, resource_name)
     end
 
-    ChefSpec::Runner.define_runner_method :csh
+    ChefSpec.define_matcher :csh
 
     #
     # Assert that a +perl+ resource exists in the Chef run with the
@@ -116,7 +116,7 @@ module ChefSpec::API
       ChefSpec::Matchers::ResourceMatcher.new(:perl, :run, resource_name)
     end
 
-    ChefSpec::Runner.define_runner_method :perl
+    ChefSpec.define_matcher :perl
 
     #
     # Assert that a +python+ resource exists in the Chef run with the
@@ -155,7 +155,7 @@ module ChefSpec::API
       ChefSpec::Matchers::ResourceMatcher.new(:python, :run, resource_name)
     end
 
-    ChefSpec::Runner.define_runner_method :python
+    ChefSpec.define_matcher :python
 
     #
     # Assert that a +ruby+ resource exists in the Chef run with the
@@ -194,7 +194,7 @@ module ChefSpec::API
       ChefSpec::Matchers::ResourceMatcher.new(:ruby, :run, resource_name)
     end
 
-    ChefSpec::Runner.define_runner_method :ruby
+    ChefSpec.define_matcher :ruby
 
     #
     # Assert that a +script+ resource exists in the Chef run with the
@@ -234,6 +234,6 @@ module ChefSpec::API
     end
 
 
-    ChefSpec::Runner.define_runner_method :script
+    ChefSpec.define_matcher :script
   end
 end