chefspec 0.8.0 → 0.9.0

data/lib/chefspec.rb

@@ -10,7 +10,11 @@ if defined?(RSpec)
   require 'chefspec/matchers/package'
   require 'chefspec/matchers/service'
   require 'chefspec/matchers/shared'
+  require 'chefspec/matchers/notifications'
   require 'chefspec/matchers/file_content'
+  require 'chefspec/matchers/user'
+  require 'chefspec/matchers/env'
+  require 'chefspec/matchers/include_recipe'
 end
 require 'chefspec/minitest'
 require 'chefspec/monkey_patches/hash'

data/lib/chefspec/chef_runner.rb

@@ -111,52 +111,15 @@ module ChefSpec
       self
     end
 
-    # Find any directory declared with the given path
-    #
-    # @param [String] path The directory path
-    # @return [Chef::Resource::Directory] The matching directory, or Nil
-    def directory(path)
-      find_resource('directory', path)
-    end
-
-    # Find any cookbook_file declared with the given path
-    #
-    # @param [String] path The cookbook_file path
-    # @return [Chef::Resource::Directory] The matching cookbook_file, or Nil
-    def cookbook_file(path)
-      find_resource('cookbook_file', path)
-    end
-
-    # Find any file declared with the given path
-    #
-    # @param [String] path The file path
-    # @return [Chef::Resource::Directory] The matching file, or Nil
-    def file(path)
-      find_resource('file', path)
-    end
-
-    # Find any template declared with the given path
-    #
-    # @param [String] path The template path
-    # @return [Chef::Resource::Directory] The matching template, or Nil
-    def template(path)
-      find_resource('template', path)
-    end
-
-    # Find any link declared with the given target_file
-    #
-    # @param [String] target_file The link's target_file
-    # @return [Chef::Resource::Directory] The matching link, or Nil
-    def link(target_file)
-      find_resource('link', target_file)
-    end
-
-    # Find a crontab entry declared with the given name
-    #
-    # @param  [String] name of a crontab
-    # @return [Chef::Resource::Cron] The matching cron resource, or Nil
-    def cron(name)
-      find_resource('cron', name)
+    FILE_RESOURCES    = %w(directory cookbook_file file template link remote_directory remote_file)
+    PACKAGE_RESOURCES = %w(package apt_package dpkg_package easy_install_package freebsd_package macports_package portage_package rpm_package chef_gem solaris_package yum_package zypper_package)
+    SCRIPT_RESOURCES  = %w(script powershell bash csh perl python ruby)
+    MISC_RESOURCES    = %w(cron env user execute service log route ruby_block git subversion group mount ohai ifconfig deploy http_request)
+
+    (FILE_RESOURCES + PACKAGE_RESOURCES + SCRIPT_RESOURCES + MISC_RESOURCES).sort.uniq.each do |type|
+      define_method(type) do |name|
+        find_resource(type, name)
+      end
     end
 
     # This runner as a string.
@@ -178,8 +141,8 @@ module ChefSpec
       {:os => 'chefspec', :os_version => ChefSpec::VERSION, :fqdn => 'chefspec.local', :domain => 'local',
        :ipaddress => '127.0.0.1', :hostname => 'chefspec', :languages => Mash.new({"ruby" => "/usr/somewhere"}),
        :kernel => Mash.new({:machine => 'i386'})}.each_pair do |attribute,value|
-        ohai[attribute] = value
-      end
+         ohai[attribute] = value
+       end
     end
 
     # Infer the default cookbook path from the location of the calling spec.

data/lib/chefspec/matchers/env.rb

@@ -0,0 +1,8 @@
+
+require 'chefspec/matchers/shared'
+
+module ChefSpec
+  module Matchers
+    define_resource_matchers([:create, :delete,:modify], [:env], :key_name)
+  end
+end

data/lib/chefspec/matchers/include_recipe.rb

@@ -0,0 +1,17 @@
+require 'chefspec/matchers/shared'
+
+module ChefSpec
+  module Matchers
+    RSpec::Matchers.define :include_recipe do |expected_recipe|
+      match do |chef_run|
+        actual_recipes = chef_run.node.run_state[:seen_recipes]
+        actual_recipes.include?(expected_recipe)
+      end
+
+      failure_message_for_should do |chef_run|
+        "expected: ['#{expected_recipe}']\n" +
+        "     got: #{chef_run.node.run_state.recipes}"
+      end
+    end
+  end
+end

data/lib/chefspec/matchers/notifications.rb

@@ -0,0 +1,43 @@
+require 'chefspec/matchers/shared'
+
+module ChefSpec
+  module Matchers
+
+
+    RSpec::Matchers.define :notify do |expected_resource,expected_resource_action|
+
+      expected_resource.match(/^([^\[]*)\[(.*)\]$/)
+      expected_resource_name = $2
+      expected_resource_type = $1
+      match do |actual_resource|
+        notifications = actual_resource.delayed_notifications
+        notifications+= actual_resource.immediate_notifications
+        notifications.any? do |rs|
+
+          actual_resource_name = rs.resource.name.to_s
+          actual_resource_type = rs.resource.resource_name.to_s
+          actual_resource_action = rs.action
+
+          (actual_resource_name == expected_resource_name) and
+          (actual_resource_type == expected_resource_type) and
+          (actual_resource_action.to_s == expected_resource_action.to_s)
+        end
+      end
+
+      failure_message_for_should do |actual_resource|
+        "expected: ['#{expected_resource_action}, #{expected_resource}']\n" +
+        "     got: #{format_notifications(actual_resource)}  "
+      end
+
+      def format_notifications(resource)
+        notifications = resource.delayed_notifications
+        notifications += resource.immediate_notifications
+        msg="["
+        notifications.each do |res|
+          msg+= "'#{res.action}, #{res.resource.resource_name}[#{res.resource.name}]'"
+        end
+        msg+="]"
+      end
+    end
+  end
+end

data/lib/chefspec/matchers/package.rb

@@ -3,7 +3,10 @@ require 'chefspec/matchers/shared'
 module ChefSpec
   module Matchers
 
-    define_resource_matchers([:install, :remove, :upgrade, :purge], [:package, :gem_package], :package_name)
+    CHEF_GEM_SUPPORTED = defined?(::Chef::Resource::ChefGem)
+    PACKAGE_TYPES = [:package, :gem_package, :chef_gem]
+    PACKAGE_TYPES << :chef_gem if CHEF_GEM_SUPPORTED
+    define_resource_matchers([:install, :remove, :upgrade, :purge], PACKAGE_TYPES, :package_name)
 
     RSpec::Matchers.define :install_package_at_version do |package_name, version|
       match do |chef_run|
@@ -19,5 +22,12 @@ module ChefSpec
         end
       end
     end
+    RSpec::Matchers.define :install_chef_gem_at_version do |package_name, version|
+      match do |chef_run|
+       chef_run.resources.any? do |resource|
+          resource_type(resource) == 'chef_gem' and resource.package_name == package_name and resource.action.to_s.include? 'install' and resource.version == version
+        end
+      end
+    end if CHEF_GEM_SUPPORTED
   end
 end

data/lib/chefspec/matchers/service.rb

@@ -3,7 +3,7 @@ require 'chefspec/matchers/shared'
 module ChefSpec
   module Matchers
 
-    define_resource_matchers([:start, :stop, :restart, :reload, :nothing, :enable], [:service], :service_name)
+    define_resource_matchers([:start, :stop, :restart, :reload, :nothing, :enable, :disable], [:service], :service_name)
 
     RSpec::Matchers.define :set_service_to_start_on_boot do |service|
       match do |chef_run|
@@ -12,5 +12,14 @@ module ChefSpec
         end
       end
     end
+
+    RSpec::Matchers.define :set_service_to_not_start_on_boot do |service|
+      match do |chef_run|
+        chef_run.resources.any? do |resource|
+          resource_type(resource) == 'service' and resource.service_name == service and resource.action.include? :disable
+        end
+      end
+    end
+
   end
 end

data/lib/chefspec/matchers/shared.rb

@@ -51,5 +51,5 @@ end
 def template_path(template, node)
   cookbook_name = template.cookbook || template.cookbook_name
   cookbook = node.cookbook_collection[cookbook_name]
-  cookbook.preferred_filename_on_disk_location(node, :templates, template.source, template.path)
+  cookbook.preferred_filename_on_disk_location(node, :templates, template.source)
 end

data/lib/chefspec/matchers/user.rb

@@ -0,0 +1,8 @@
+
+require 'chefspec/matchers/shared'
+
+module ChefSpec
+  module Matchers
+    define_resource_matchers([:create, :remove], [:user], :username)
+  end
+end

data/lib/chefspec/minitest.rb

@@ -122,6 +122,7 @@ module ChefSpec
         override_assertion :installed, :package_name, [:remove, :purge]
         override_assertion :enabled, :enabled, [:disable]
         override_assertion :running, :running, [:stop]
+        override_assertion :user_exists, :username, [:remove]
 
         def file_resources
           resources.select{|r| r.resource_name.to_s.end_with?('file')} +

data/lib/chefspec/version.rb

@@ -1,4 +1,4 @@
 module ChefSpec
   # The gem version
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -84,14 +84,18 @@ files:
 - lib/chef/knife/cookbook_create_specs.rb
 - lib/chefspec/chef_runner.rb
 - lib/chefspec/matchers/cron.rb
+- lib/chefspec/matchers/env.rb
 - lib/chefspec/matchers/execute.rb
 - lib/chefspec/matchers/file.rb
 - lib/chefspec/matchers/file_content.rb
+- lib/chefspec/matchers/include_recipe.rb
 - lib/chefspec/matchers/link.rb
 - lib/chefspec/matchers/log.rb
+- lib/chefspec/matchers/notifications.rb
 - lib/chefspec/matchers/package.rb
 - lib/chefspec/matchers/service.rb
 - lib/chefspec/matchers/shared.rb
+- lib/chefspec/matchers/user.rb
 - lib/chefspec/minitest.rb
 - lib/chefspec/monkey_patches/hash.rb
 - lib/chefspec/monkey_patches/provider.rb
@@ -112,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1887236234485155709
+      hash: -3567781514066476826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,12 +125,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1887236234485155709
+      hash: -3567781514066476826
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: chefspec-0.8.0
+summary: chefspec-0.9.0
 test_files: []
 has_rdoc: