dchelimsky-rspec 1.1.10 → 1.1.11

data/History.txt

@@ -1,3 +1,20 @@
+=== Maintenance
+
+* 2 major enhancements
+
+  * it { should matcher } - syntax support from Joe Ferris
+  * wrap_expectation (for wrapping multiple expectations and/or t/u assertions)
+
+* 1 minor enhancement
+
+  * should throw_symbol accepts an optional argument: should throw_symbol(:sym, arg)
+
+=== Version 1.1.11 / 2008-10-24
+
+* 1 major enhancement
+
+  * eliminate ALL gem dependencies (as they were causing trouble for people on different platforms/environments)
+
 === Version 1.1.10 / 2008-10-24
 
 * 1 minor enhancement

data/Manifest.txt

@@ -1,3 +1,4 @@
+.autotest
 History.txt
 License.txt
 Manifest.txt
@@ -6,77 +7,50 @@ Rakefile
 TODO.txt
 bin/autospec
 bin/spec
-examples/pure/autogenerated_docstrings_example.rb
-examples/pure/before_and_after_example.rb
-examples/pure/behave_as_example.rb
-examples/pure/custom_expectation_matchers.rb
-examples/pure/custom_formatter.rb
-examples/pure/dynamic_spec.rb
-examples/pure/file_accessor.rb
-examples/pure/file_accessor_spec.rb
-examples/pure/greeter_spec.rb
-examples/pure/helper_method_example.rb
-examples/pure/io_processor.rb
-examples/pure/io_processor_spec.rb
-examples/pure/legacy_spec.rb
-examples/pure/mocking_example.rb
-examples/pure/multi_threaded_behaviour_runner.rb
-examples/pure/nested_classes_example.rb
-examples/pure/partial_mock_example.rb
-examples/pure/pending_example.rb
-examples/pure/predicate_example.rb
-examples/pure/priority.txt
-examples/pure/shared_example_group_example.rb
-examples/pure/shared_stack_examples.rb
-examples/pure/spec_helper.rb
-examples/pure/stack.rb
-examples/pure/stack_spec.rb
-examples/pure/stack_spec_with_nested_example_groups.rb
-examples/pure/stubbing_example.rb
-examples/pure/yielding_example.rb
-examples/stories/adder.rb
-examples/stories/addition
-examples/stories/addition.rb
-examples/stories/calculator.rb
-examples/stories/game-of-life/.loadpath
-examples/stories/game-of-life/README.txt
-examples/stories/game-of-life/behaviour/everything.rb
-examples/stories/game-of-life/behaviour/examples/examples.rb
-examples/stories/game-of-life/behaviour/examples/game_behaviour.rb
-examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb
-examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story
-examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story
-examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story
-examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story
-examples/stories/game-of-life/behaviour/stories/ICanKillACell.story
-examples/stories/game-of-life/behaviour/stories/TheGridWraps.story
-examples/stories/game-of-life/behaviour/stories/create_a_cell.rb
-examples/stories/game-of-life/behaviour/stories/helper.rb
-examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb
-examples/stories/game-of-life/behaviour/stories/steps.rb
-examples/stories/game-of-life/behaviour/stories/stories.rb
-examples/stories/game-of-life/behaviour/stories/stories.txt
-examples/stories/game-of-life/life.rb
-examples/stories/game-of-life/life/game.rb
-examples/stories/game-of-life/life/grid.rb
-examples/stories/helper.rb
-examples/stories/steps/addition_steps.rb
-failing_examples/README.txt
-failing_examples/diffing_spec.rb
-failing_examples/failing_autogenerated_docstrings_example.rb
-failing_examples/failure_in_setup.rb
-failing_examples/failure_in_teardown.rb
-failing_examples/mocking_example.rb
-failing_examples/mocking_with_flexmock.rb
-failing_examples/mocking_with_mocha.rb
-failing_examples/mocking_with_rr.rb
-failing_examples/partial_mock_example.rb
-failing_examples/predicate_example.rb
-failing_examples/raising_example.rb
-failing_examples/spec_helper.rb
-failing_examples/syntax_error_example.rb
-failing_examples/team_spec.rb
-failing_examples/timeout_behaviour.rb
+examples/failing/README.txt
+examples/failing/diffing_spec.rb
+examples/failing/failing_autogenerated_docstrings_example.rb
+examples/failing/failure_in_setup.rb
+examples/failing/failure_in_teardown.rb
+examples/failing/mocking_example.rb
+examples/failing/mocking_with_flexmock.rb
+examples/failing/mocking_with_mocha.rb
+examples/failing/mocking_with_rr.rb
+examples/failing/partial_mock_example.rb
+examples/failing/predicate_example.rb
+examples/failing/raising_example.rb
+examples/failing/spec_helper.rb
+examples/failing/syntax_error_example.rb
+examples/failing/team_spec.rb
+examples/failing/timeout_behaviour.rb
+examples/passing/autogenerated_docstrings_example.rb
+examples/passing/before_and_after_example.rb
+examples/passing/behave_as_example.rb
+examples/passing/custom_expectation_matchers.rb
+examples/passing/custom_formatter.rb
+examples/passing/dynamic_spec.rb
+examples/passing/file_accessor.rb
+examples/passing/file_accessor_spec.rb
+examples/passing/greeter_spec.rb
+examples/passing/helper_method_example.rb
+examples/passing/io_processor.rb
+examples/passing/io_processor_spec.rb
+examples/passing/legacy_spec.rb
+examples/passing/mocking_example.rb
+examples/passing/multi_threaded_behaviour_runner.rb
+examples/passing/nested_classes_example.rb
+examples/passing/partial_mock_example.rb
+examples/passing/pending_example.rb
+examples/passing/predicate_example.rb
+examples/passing/priority.txt
+examples/passing/shared_example_group_example.rb
+examples/passing/shared_stack_examples.rb
+examples/passing/spec_helper.rb
+examples/passing/stack.rb
+examples/passing/stack_spec.rb
+examples/passing/stack_spec_with_nested_example_groups.rb
+examples/passing/stubbing_example.rb
+examples/passing/yielding_example.rb
 init.rb
 lib/autotest/discover.rb
 lib/autotest/rspec.rb
@@ -85,6 +59,8 @@ lib/spec/adapters.rb
 lib/spec/adapters/ruby_engine.rb
 lib/spec/adapters/ruby_engine/mri.rb
 lib/spec/adapters/ruby_engine/rubinius.rb
+lib/spec/dsl.rb
+lib/spec/dsl/main.rb
 lib/spec/example.rb
 lib/spec/example/before_and_after_hooks.rb
 lib/spec/example/configuration.rb
@@ -104,11 +80,10 @@ lib/spec/expectations/extensions.rb
 lib/spec/expectations/extensions/object.rb
 lib/spec/expectations/extensions/string_and_symbol.rb
 lib/spec/expectations/handler.rb
+lib/spec/expectations/wrap_expectation.rb
 lib/spec/extensions.rb
 lib/spec/extensions/class.rb
-lib/spec/extensions/main.rb
 lib/spec/extensions/metaclass.rb
-lib/spec/extensions/object.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
 lib/spec/interop/test/unit/testcase.rb
@@ -121,11 +96,14 @@ lib/spec/matchers/be_close.rb
 lib/spec/matchers/change.rb
 lib/spec/matchers/eql.rb
 lib/spec/matchers/equal.rb
+lib/spec/matchers/errors.rb
 lib/spec/matchers/exist.rb
+lib/spec/matchers/generated_descriptions.rb
 lib/spec/matchers/has.rb
 lib/spec/matchers/have.rb
 lib/spec/matchers/include.rb
 lib/spec/matchers/match.rb
+lib/spec/matchers/method_missing.rb
 lib/spec/matchers/operator_matcher.rb
 lib/spec/matchers/raise_error.rb
 lib/spec/matchers/respond_to.rb
@@ -213,6 +191,7 @@ spec/rspec_suite.rb
 spec/ruby_forker.rb
 spec/spec.opts
 spec/spec/adapters/ruby_engine_spec.rb
+spec/spec/dsl/main_spec.rb
 spec/spec/example/configuration_spec.rb
 spec/spec/example/example_group_class_definition_spec.rb
 spec/spec/example/example_group_factory_spec.rb
@@ -229,7 +208,7 @@ spec/spec/example/subclassing_example_group_spec.rb
 spec/spec/expectations/differs/default_spec.rb
 spec/spec/expectations/extensions/object_spec.rb
 spec/spec/expectations/fail_with_spec.rb
-spec/spec/extensions/main_spec.rb
+spec/spec/expectations/wrap_expectation_spec.rb
 spec/spec/interop/test/unit/resources/spec_that_fails.rb
 spec/spec/interop/test/unit/resources/spec_that_passes.rb
 spec/spec/interop/test/unit/resources/spec_with_errors.rb

data/Rakefile

@@ -18,7 +18,6 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.url = 'http://rspec.info/'
   p.description = "Behaviour Driven Development for Ruby."
   p.rubyforge_name = 'rspec'
-  p.extra_dev_deps = ['diff-lcs','syntax']
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
   p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
 end

data/examples/{pure → passing}/autogenerated_docstrings_example.rb

@@ -17,3 +17,9 @@ describe "Examples with no descriptions" do
   specify { [1,2,3].should respond_to(:size) }
   
 end
+
+describe "the number 1" do
+  subject { 1 }
+  it { should == 1 }
+  it { should be < 2}
+end

data/examples/{pure → passing}/custom_formatter.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 require 'spec/runner/formatter/progress_bar_formatter'
 
 # Example of a formatter with custom bactrace printing. Run me with:
-# ruby bin/spec failing_examples -r examples/custom_formatter.rb -f CustomFormatter
+# ruby bin/spec examples/failing -r examples/custom_formatter.rb -f CustomFormatter
 class CustomFormatter < Spec::Runner::Formatter::ProgressBarFormatter
   def backtrace_line(line)
     line.gsub(/([^:]*\.rb):(\d*)/) do

data/examples/{pure → passing}/dynamic_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "Some integers" do
+describe "The square root" do
   (1..10).each do |n|
-    it "The root of #{n} square should be #{n}" do
+    it "of #{n*n} should be #{n}" do
       Math.sqrt(n*n).should == n
     end
   end

data/examples/{pure → passing}/shared_stack_examples.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
-
 shared_examples_for "non-empty Stack" do
 
   it { @stack.should_not be_empty }
@@ -7,7 +5,7 @@ shared_examples_for "non-empty Stack" do
   it "should return the top item when sent #peek" do
     @stack.peek.should == @last_item_added
   end
-
+  
   it "should NOT remove the top item when sent #peek" do
     @stack.peek.should == @last_item_added
     @stack.peek.should == @last_item_added

data/examples/{pure → passing}/stack_spec.rb

@@ -7,8 +7,9 @@ describe Stack, " (empty)" do
     @stack = Stack.new
   end
   
-  # NOTE that this one auto-generates the description "should be empty"
-  it { @stack.should be_empty }
+  # This uses @stack (because the described class is Stack) auto-generates the
+  # description "should be empty"
+  it { should be_empty }
   
   it_should_behave_like "non-full Stack"
   

data/lib/spec/example/before_and_after_hooks.rb

@@ -4,35 +4,27 @@ module Spec
       # Registers a block to be executed before each example.
       # This method prepends +block+ to existing before blocks.
       def prepend_before(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = before_parts_from_scope(scope)
-        parts.unshift(block)
+        before_parts(*args).unshift(block)
       end
 
       # Registers a block to be executed before each example.
       # This method appends +block+ to existing before blocks.
       def append_before(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = before_parts_from_scope(scope)
-        parts << block
+        before_parts(*args) << block
       end
       alias_method :before, :append_before
 
       # Registers a block to be executed after each example.
       # This method prepends +block+ to existing after blocks.
       def prepend_after(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = after_parts_from_scope(scope)
-        parts.unshift(block)
+        after_parts(*args).unshift(block)
       end
       alias_method :after, :prepend_after
 
       # Registers a block to be executed after each example.
       # This method appends +block+ to existing after blocks.
       def append_after(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = after_parts_from_scope(scope)
-        parts << block
+        after_parts(*args) << block
       end
 
       def remove_after(scope, &block)
@@ -67,21 +59,16 @@ module Spec
       
     private  
       
-      def scope_and_options(*args)
-        args, options = args_and_options(*args)
-        scope = (args[0] || :each), options
-      end
-
-      def before_parts_from_scope(scope)
-        case scope
+      def before_parts(*args)
+        case Spec::Example.scope_from(*args)
         when :each; before_each_parts
         when :all; before_all_parts
         when :suite; Spec::Runner.options.before_suite_parts
         end
       end
 
-      def after_parts_from_scope(scope)
-        case scope
+      def after_parts(*args)
+        case Spec::Example.scope_from(*args)
         when :each; after_each_parts
         when :all; after_all_parts
         when :suite; Spec::Runner.options.after_suite_parts

data/lib/spec/example/configuration.rb

@@ -47,44 +47,48 @@ module Spec
       #   include(My::Helpers, :type => :key)
       #
       # Declares modules to be included in multiple example groups
-      # (<tt>describe</tt> blocks). With no :type, the modules listed will be
-      # included in all example groups. Use :type to restrict the inclusion to
-      # a subset of example groups. The value assigned to :type should be a
-      # key that maps to a class that is either a subclass of
-      # Spec::Example::ExampleGroup or extends Spec::Example::ExampleGroupMethods
-      # and includes Spec::Example::ExampleMethods
+      # (<tt>describe</tt> blocks). With no <tt>:type</tt>, the modules listed
+      # will be included in all example groups.
       #
-      #   config.include(My::Pony, My::Horse, :type => :farm)
+      # Use <tt>:type</tt> to restrict
+      # the inclusion to a subset of example groups. The value assigned to
+      # <tt>:type</tt> should be a key that maps to a class that is either a
+      # subclass of Spec::Example::ExampleGroup or extends
+      # Spec::Example::ExampleGroupMethods and includes
+      # Spec::Example::ExampleMethods.
+      #
+      # For example, the rspec-rails gem/plugin extends Test::Unit::TestCase
+      # with Spec::Example::ExampleGroupMethods and includes
+      # Spec::Example::ExampleMethods in it. So if you have a module of helper
+      # methods for controller examples, you could do this:
+      #
+      #   config.include(ControllerExampleHelpers, :type => :controller)
       #
       # Only example groups that have that type will get the modules included:
       #
-      #   describe "Downtown", :type => :city do
-      #     # Will *not* get My::Pony and My::Horse included
+      #   describe Account, :type => :model do
+      #     # Will *not* include ControllerExampleHelpers
       #   end
       #
-      #   describe "Old Mac Donald", :type => :farm do
-      #     # *Will* get My::Pony and My::Horse included
+      #   describe AccountsController, :type => :controller do
+      #     # *Will* include ControllerExampleHelpers
       #   end
       #
       def include(*args)
         include_or_extend(:include, *args)
       end
       
+      # :call-seq:
+      #   extend(Some::Helpers)
+      #   extend(Some::Helpers, More::Helpers)
+      #   extend(My::Helpers, :type => :key)
+      #
+      # Works just like #include, but extends the example groups
+      # with the modules rather than including them.
       def extend(*args)
         include_or_extend(:extend, *args)
       end
       
-      def include_or_extend(*args)
-        action = args.shift
-        args << {} unless Hash === args.last
-        modules, options = args_and_options(*args)
-        required_example_group = get_type_from_options(options)
-        required_example_group = required_example_group.to_sym if required_example_group
-        modules.each do |mod|
-          ExampleGroupFactory.get(required_example_group).send(action, mod)
-        end
-      end
-
       # Defines global predicate matchers. Example:
       #
       #   config.predicate_matchers[:swim] = :can_swim?
@@ -100,11 +104,7 @@ module Spec
       # Prepends a global <tt>before</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def prepend_before(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.prepend_before(scope, &proc)
+        add_callback(:prepend_before, *args, &proc)
       end
       
       # Appends a global <tt>before</tt> block to all example groups.
@@ -119,40 +119,40 @@ module Spec
       #   config.prepend_before(:type => :farm)
       #
       def append_before(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.append_before(scope, &proc)
+        add_callback(:append_before, *args, &proc)
       end
       alias_method :before, :append_before
 
       # Prepends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def prepend_after(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.prepend_after(scope, &proc)
+        add_callback(:prepend_after, *args, &proc)
       end
       alias_method :after, :prepend_after
       
       # Appends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def append_after(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.append_after(scope, &proc)
+        add_callback(:append_after, *args, &proc)
       end
 
     private
+    
+      def include_or_extend(*args)
+        action = args.shift
+        args << {} unless Hash === args.last
+        modules, options = Spec::Example.args_and_options(*args)
+        required_example_group = get_type_from_options(options)
+        required_example_group = required_example_group.to_sym if required_example_group
+        modules.each do |mod|
+          ExampleGroupFactory.get(required_example_group).send(action, mod)
+        end
+      end
 
-      def scope_and_options(*args)
-        args, options = args_and_options(*args)
-        scope = (args[0] || :each), options
+      def add_callback(sym, *args, &proc)
+        scope, options = Spec::Example.scope_and_options(*args)
+        example_group = ExampleGroupFactory.get(get_type_from_options(options))
+        example_group.__send__(sym, scope, &proc)
       end
 
       def get_type_from_options(options)

data/lib/spec/example/example_group_factory.rb

@@ -7,9 +7,11 @@ module Spec
           default(ExampleGroup)
         end
 
-        def all_registered?(example_group_classes)
+        def registered_or_ancestor_of_registered?(example_group_classes) # :nodoc:
           example_group_classes.each do |example_group_class|
-            return false unless registered_or_ancestor_of_registered? example_group_class
+            return false unless registered_types.any? do |registered_type|
+              registered_type.ancestors.include? example_group_class
+            end
           end
           return true
         end
@@ -48,11 +50,14 @@ module Spec
         end
         
         def create_example_group(*args, &block)
-          opts = Hash === args.last ? args.last : {}
-          superclass = determine_superclass(opts)
+          raise ArgumentError if args.empty?
+          raise ArgumentError unless block
+          args << {} unless Hash === args.last
+          args.last[:spec_path] ||= File.expand_path(caller(0)[2])
+          superclass = determine_superclass(args.last)
           superclass.describe(*args, &block)
         end
-
+        
       protected
 
         def determine_superclass(opts)
@@ -66,10 +71,6 @@ module Spec
         
       private
         
-        def registered_or_ancestor_of_registered? example_group_class
-          registered_types.any? {|registered_type| registered_type.ancestors.include? example_group_class}
-        end
-        
         def registered_types
           @example_group_types.values
         end