chefspec 2.0.1 → 3.0.0.beta.1

data/lib/chefspec/stubs/search_registry.rb

@@ -0,0 +1,13 @@
+require_relative 'registry'
+
+module ChefSpec
+  module Stubs
+    class SearchRegistry < Registry
+      def stub_for(type, query = '*:*')
+        @stubs.find do |stub|
+          stub.type.to_s == type.to_s && stub.query === query
+        end
+      end
+    end
+  end
+end

data/lib/chefspec/stubs/search_stub.rb

@@ -0,0 +1,25 @@
+require_relative 'stub'
+
+module ChefSpec
+  module Stubs
+    class SearchStub < Stub
+      attr_reader :block
+      attr_reader :query
+      attr_reader :type
+
+      def initialize(type, query = '*:*', &block)
+        @type  = type.to_s
+        @query = query
+        @block = block
+      end
+
+      def signature
+        if @block
+          "stub_search(#{@type.inspect}, #{@query.inspect}) { # Ruby code }"
+        else
+          "stub_search(#{@type.inspect}, #{@query.inspect}).and_return(#{@value})"
+        end
+      end
+    end
+  end
+end

data/lib/chefspec/stubs/stub.rb

@@ -0,0 +1,37 @@
+module ChefSpec
+  module Stubs
+    class Stub
+      attr_reader :value
+
+      def and_return(value)
+        @value = value
+        self
+      end
+
+      def and_raise(exception)
+        @block = Proc.new { raise exception }
+        self
+      end
+
+      def result
+        if @block
+          recursively_mashify(@block.call)
+        else
+          recursively_mashify(@value)
+        end
+      end
+
+      private
+        def recursively_mashify(thing)
+          case thing
+          when Array
+            thing.collect { |item| recursively_mashify(item) }
+          when Hash
+            Mash.from_hash(thing)
+          else
+            thing
+          end
+        end
+    end
+  end
+end

data/lib/chefspec/version.rb

@@ -1,4 +1,3 @@
 module ChefSpec
-  # The gem version
-  VERSION = '2.0.1'
+  VERSION = '3.0.0.beta.1'
 end

metadata

@@ -1,43 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Andrew Crump
+- Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +39,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: minitest-chef-handler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,108 +68,132 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: i18n
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.5'
 description: Write RSpec examples for Opscode Chef recipes
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/chef/expect_exception.rb
-- lib/chef/formatters/chefspec.rb
-- lib/chef/knife/cookbook_create_specs.rb
-- lib/chefspec/chef_runner.rb
-- lib/chefspec/helpers/describe.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/group.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/python.rb
-- lib/chefspec/matchers/ruby_block.rb
-- lib/chefspec/matchers/script.rb
-- lib/chefspec/matchers/service.rb
-- lib/chefspec/matchers/shared.rb
-- lib/chefspec/matchers/user.rb
-- lib/chefspec/minitest.rb
-- lib/chefspec/monkey_patches/conditional.rb
-- lib/chefspec/monkey_patches/hash.rb
-- lib/chefspec/monkey_patches/lwrp_base.rb
-- lib/chefspec/monkey_patches/provider.rb
+- lib/chefspec/api/apt_package.rb
+- lib/chefspec/api/batch.rb
+- lib/chefspec/api/chef_gem.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/dpkg_package.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/http_request.rb
+- lib/chefspec/api/ifconfig.rb
+- lib/chefspec/api/include_recipe.rb
+- lib/chefspec/api/ips_package.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/notifications.rb
+- lib/chefspec/api/ohai.rb
+- lib/chefspec/api/package.rb
+- lib/chefspec/api/pacman_package.rb
+- lib/chefspec/api/portage_package.rb
+- lib/chefspec/api/powershell_script.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/subversion.rb
+- lib/chefspec/api/template.rb
+- lib/chefspec/api/user.rb
+- lib/chefspec/api/yum_package.rb
+- lib/chefspec/api.rb
+- lib/chefspec/berkshelf.rb
+- lib/chefspec/deprecations.rb
+- lib/chefspec/errors.rb
+- lib/chefspec/expect_exception.rb
+- lib/chefspec/extensions/chef/client.rb
+- lib/chefspec/extensions/chef/conditional.rb
+- lib/chefspec/extensions/chef/data_query.rb
+- lib/chefspec/extensions/chef/lwrp_base.rb
+- lib/chefspec/extensions/chef/resource.rb
+- lib/chefspec/extensions/chef/securable.rb
+- lib/chefspec/formatter.rb
+- lib/chefspec/macros.rb
+- lib/chefspec/matchers/include_recipe_matcher.rb
+- lib/chefspec/matchers/link_to_matcher.rb
+- lib/chefspec/matchers/notifications_matcher.rb
+- lib/chefspec/matchers/render_file_matcher.rb
+- lib/chefspec/matchers/resource_matcher.rb
+- lib/chefspec/matchers.rb
+- lib/chefspec/renderer.rb
+- lib/chefspec/rspec.rb
+- lib/chefspec/runner.rb
+- lib/chefspec/stubs/command_registry.rb
+- lib/chefspec/stubs/command_stub.rb
+- lib/chefspec/stubs/data_bag_item_registry.rb
+- lib/chefspec/stubs/data_bag_item_stub.rb
+- lib/chefspec/stubs/data_bag_registry.rb
+- lib/chefspec/stubs/data_bag_stub.rb
+- lib/chefspec/stubs/registry.rb
+- lib/chefspec/stubs/search_registry.rb
+- lib/chefspec/stubs/search_stub.rb
+- lib/chefspec/stubs/stub.rb
 - lib/chefspec/version.rb
 - lib/chefspec.rb
 homepage: http://acrmp.github.com/chefspec
@@ -214,14 +211,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: chefspec-2.0.1
+summary: chefspec-3.0.0.beta.1
 test_files: []
 has_rdoc: 

data/lib/chef/expect_exception.rb

@@ -1,34 +0,0 @@
-class Chef
-  module ExpectException
-    class << self
-      def expected?(chef_message, exception, *args)
-        @b.call(chef_message, exception)
-      end
-
-      def expect(klass, message)
-        expect_block do |chef_message, exception|
-          match?(exception, klass, message)
-        end
-      end
-
-      def expect_block(&block)
-        @b = block
-      end
-
-      def clear
-        @b = lambda{|cm, e| false}
-        clear_seen
-      end
-
-      def clear_seen
-        @seen = []
-      end
-
-      def match?(exception, klass, message)
-        exception.class == klass and exception.message == message
-      end
-    end
-
-    clear
-  end
-end

data/lib/chef/formatters/chefspec.rb

@@ -1,233 +0,0 @@
-if defined?(Chef::Formatters::Base)
-  class Chef
-    module Formatters
-      class ChefSpec < Base
-        cli_name(:chefspec)
-
-        attr_reader :updated_resources, :updates_by_resource
-
-        def initialize(out, err)
-          super
-          @updated_resources = []
-          @updates_by_resource = Hash.new {|h, k| h[k] = []}
-        end
-
-        def error_expected?(message, exception, *args)
-          ExpectException.expected?(message, exception, *args)
-        end
-
-        # Called at the very start of a Chef Run
-        def run_start(version)
-          puts "Starting Chef Client, version #{version}"
-        end
-
-        # Called at the end of the Chef run.
-        def run_completed(node)
-        end
-
-        # called at the end of a failed run
-        def run_failed(exception)
-          return if error_expected?(:run_failed, exception)
-          puts "chef client failed. #{@updated_resources.size} resources updated"
-        end
-
-        # Called right after ohai runs.
-        def ohai_completed(node)
-        end
-
-        # Already have a client key, assuming this node has registered.
-        def skipping_registration(node_name, config)
-        end
-
-        # About to attempt to register as +node_name+
-        def registration_start(node_name, config)
-        end
-
-        def registration_completed
-        end
-
-        # Failed to register this client with the server.
-        def registration_failed(node_name, exception, config)
-          super unless error_expected?(:registration_failed, exception, config, node_name)
-        end
-
-        def node_load_start(node_name, config)
-        end
-
-        # Failed to load node data from the server
-        def node_load_failed(node_name, exception, config)
-          super unless error_expected?(:node_load_failed, exception)
-        end
-
-        def run_list_expand_failed(expanded_run_list, exception)
-          super unless error_expected?(:run_list_expand_failed, exception, expanded_run_list)
-        end
-
-        # Default and override attrs from roles have been computed, but not yet applied.
-        # Normal attrs from JSON have been added to the node.
-        def node_load_completed(node, expanded_run_list, config)
-        end
-
-        # Called before the cookbook collection is fetched from the server.
-        def cookbook_resolution_start(expanded_run_list)
-        end
-
-        # Called when there is an error getting the cookbook collection from the
-        # server.
-        def cookbook_resolution_failed(expanded_run_list, exception)
-          super unless error_expected?(:cookbook_resolution_failed, exception, expanded_run_list)
-        end
-
-        def cookbook_sync_failed(cookbooks, exception)
-          super unless error_expected?(:cookbook_sync_failed, exception, cookbooks)
-        end
-
-        # Called when the cookbook collection is returned from the server.
-        def cookbook_resolution_complete(cookbook_collection)
-        end
-
-        # Called before unneeded cookbooks are removed
-        #--
-        # TODO: Should be called in CookbookVersion.sync_cookbooks
-        def cookbook_clean_start
-        end
-
-        # Called after the file at +path+ is removed. It may be removed if the
-        # cookbook containing it was removed from the run list, or if the file was
-        # removed from the cookbook.
-        def removed_cookbook_file(path)
-        end
-
-        # Called when cookbook cleaning is finished.
-        def cookbook_clean_complete
-        end
-
-        # Called before cookbook sync starts
-        def cookbook_sync_start(cookbook_count)
-        end
-
-        # Called when cookbook +cookbook_name+ has been sync'd
-        def synchronized_cookbook(cookbook_name)
-        end
-
-        # Called when an individual file in a cookbook has been updated
-        def updated_cookbook_file(cookbook_name, path)
-        end
-
-        # Called after all cookbooks have been sync'd.
-        def cookbook_sync_complete
-        end
-
-        # Called when cookbook loading starts.
-        def library_load_start(file_count)
-        end
-
-        # Called after a file in a cookbook is loaded.
-        def file_loaded(path)
-        end
-
-        def file_load_failed(path, exception, message = :file_load_failed, &block)
-          super(path, exception, &block) unless error_expected?(message, exception, path)
-        end
-
-        def library_file_load_failed(path, exception)
-          file_load_failed(path, exception, :library_file_load_failed)
-        end
-
-        def lwrp_file_load_failed(path, exception)
-          file_load_failed(path, exception, :lwrp_file_load_failed)
-        end
-
-        def attribute_file_load_failed(path, exception)
-          file_load_failed(path, exception, :attribute_file_load_failed)
-        end
-
-        def definition_file_load_failed(path, exception)
-          file_load_failed(path, exception, :definition_file_load_failed)
-        end
-
-        def recipe_file_load_failed(path, exception)
-          file_load_failed(path, exception, :recipe_file_load_failed)
-        end
-
-        # Called when recipes have been loaded.
-        def recipe_load_complete
-        end
-
-        # Called before convergence starts
-        def converge_start(run_context)
-        end
-
-        # Called when the converge phase is finished.
-        def converge_complete
-        end
-
-        # Called before action is executed on a resource.
-        def resource_action_start(resource, action, notification_type=nil, notifier=nil)
-        end
-
-        # Called when a resource fails, but will retry.
-        def resource_failed_retriable(resource, action, retry_count, exception)
-          super unless error_expected?(:resource_failed_retriable, exception, retry_count, action, resource)
-        end
-
-        # Called when a resource fails and will not be retried.
-        def resource_failed(resource, action, exception)
-          super unless error_expected?(:resource, exception, exception, resource)
-        end
-
-        # Called when a resource action has been skipped b/c of a conditional
-        def resource_skipped(resource, action, conditional)
-        end
-
-        # Called after #load_current_resource has run.
-        def resource_current_state_loaded(resource, action, current_resource)
-        end
-
-        # Called when a resource has no converge actions, e.g., it was already correct.
-        def resource_up_to_date(resource, action)
-        end
-
-        ## TODO: callback for assertion failures
-
-        ## TODO: callback for assertion fallback in why run
-
-        def recipe_not_found(exception)
-          super unless error_expected?(:recipe_not_found, exception)
-        end
-
-        # Called when a change has been made to a resource. May be called multiple
-        # times per resource, e.g., a file may have its content updated, and then
-        # its permissions updated.
-        def resource_update_applied(resource, action, update)
-          @updates_by_resource[resource.name] << Array(update)[0]
-        end
-
-        # Called after a resource has been completely converged.
-        def resource_updated(resource, action)
-          updated_resources << resource
-        end
-
-        # Called before handlers run
-        def handlers_start(handler_count)
-        end
-
-        # Called after an individual handler has run
-        def handler_executed(handler)
-        end
-
-        # Called after all handlers have executed
-        def handlers_completed
-        end
-
-        # An uncategorized message. This supports the case that a user needs to
-        # pass output that doesn't fit into one of the callbacks above. Note that
-        # there's no semantic information about the content or importance of the
-        # message. That means that if you're using this too often, you should add a
-        # callback for it.
-        def msg(message)
-        end
-      end
-    end
-  end
-end