rspec-core 2.0.0.a2 → 2.0.0.a3

data/lib/rspec/core.rb

@@ -8,7 +8,7 @@ require 'rspec/core/runner'
 require 'rspec/core/example'
 require 'rspec/core/metadata'
 require 'rspec/core/kernel_extensions'
-require 'rspec/core/shared_behaviour'
+require 'rspec/core/shared_example_group'
 require 'rspec/core/example_group_subject'
 require 'rspec/core/example_group'
 require 'rspec/core/formatters'

data/lib/rspec/core/command_line_options.rb

@@ -29,6 +29,15 @@ module Rspec
             options[:formatter] = o
           end
 
+          opts.on('-l', '--line_number [LINE]', 'Specify the line number of a single example to run') do |o|
+            options[:line_number] = o
+          end
+
+          opts.on('-e', '--example [PATTERN]', "Run examples whose full descriptions match this pattern",
+                  "(PATTERN is compiled into a Ruby regular expression)") do |o|
+            options[:full_description] = /#{o}/
+          end
+
           opts.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
             options[:profile_examples] = o
           end

data/lib/rspec/core/configuration.rb

@@ -22,7 +22,7 @@ module Rspec
       attr_reader :options
 
       def initialize
-        @run_all_when_everything_filtered = true
+        @run_all_when_everything_filtered = false
         @advice = { 
           :before => { :each => [], :all => [], :suite => [] }, 
           :after => { :each => [], :all => [], :suite => [] } 
@@ -98,6 +98,14 @@ module Rspec
       def color_enabled?
         options[:color_enabled]
       end
+
+      def line_number=(line_number)
+        filter_run :line_number => line_number.to_i
+      end
+
+      def full_description=(description)
+        filter_run :full_description => /#{description}/
+      end
       
       # Enable profiling of example run - defaults to false
       def profile_examples
@@ -139,7 +147,9 @@ module Rspec
               result += Dir[File.expand_path("#{file}/#{pattern.strip}")]
             end
           else
-            result << file
+            path, line_number = file.split(':')
+            self.line_number = line_number if line_number
+            result << path
           end
           result
         end
@@ -156,7 +166,7 @@ module Rspec
       end
 
       def filter_run(options={})
-        @filter = options
+        @filter = options unless @filter and @filter[:line_number] || @filter[:full_description]
       end
 
       def run_all_when_everything_filtered?
@@ -185,8 +195,8 @@ module Rspec
       end
 
       def find_modules(group)
-        include_or_extend_modules.select do |include_or_extend, mod, options|
-          Rspec::Core.world.all_apply?(group, options)
+        include_or_extend_modules.select do |include_or_extend, mod, filters|
+          group.all_apply?(filters)
         end
       end
 
@@ -199,9 +209,9 @@ module Rspec
       end
 
       def find_advice(desired_advice_type, desired_each_or_all, group)
-        advice[desired_advice_type][desired_each_or_all].select do |options, block|
-          Rspec::Core.world.all_apply?(group, options)
-        end.map { |options, block| block }
+        advice[desired_advice_type][desired_each_or_all].select do |filters, block|
+          group.all_apply?(filters)
+        end.map { |filters, block| block }
       end
 
     end

data/lib/rspec/core/example.rb

@@ -2,25 +2,18 @@ module Rspec
   module Core
     class Example
 
-      attr_reader :behaviour, :metadata, :example_block
-
-      def initialize(behaviour, desc, options, example_block=nil)
-        @behaviour, @options, @example_block = behaviour, options, example_block
-        @metadata = @behaviour.metadata.dup
-        @metadata[:description] = desc.to_s
-        @metadata[:execution_result] = {}
-        @metadata[:caller] = options.delete(:caller)
-        if @metadata[:caller]
-          @metadata[:file_path] = @metadata[:caller].split(":")[0].strip 
-          @metadata[:line_number] = @metadata[:caller].split(":")[1].to_i
-        end
-        @metadata.update(options)
+      attr_reader :example_group, :metadata, :example_block
+      alias_method :behaviour, :example_group
+
+      def initialize(example_group, desc, options, example_block=nil)
+        @example_group, @options, @example_block = example_group, options, example_block
+        @metadata = @example_group.metadata.for_example(desc, options)
       end
 
       def description
         @metadata[:description]
       end
-      
+
       def record_results(results={})
         @metadata[:execution_result].update(results)
       end
@@ -30,7 +23,7 @@ module Rspec
       end
 
       def file_path
-        @metadata[:file_path] || behaviour.file_path
+        @metadata[:file_path] || example_group.file_path
       end
 
       def run_started
@@ -58,11 +51,11 @@ module Rspec
 
       def run_before_each
         @example_group_instance._setup_mocks if @example_group_instance.respond_to?(:_setup_mocks)
-        @behaviour.eval_before_eachs(@example_group_instance)
+        @example_group.eval_before_eachs(@example_group_instance)
       end
 
       def run_after_each
-        @behaviour.eval_after_eachs(@example_group_instance)
+        @example_group.eval_after_eachs(@example_group_instance)
         @example_group_instance._verify_mocks if @example_group_instance.respond_to?(:_verify_mocks)
       ensure
         @example_group_instance._teardown_mocks if @example_group_instance.respond_to?(:_teardown_mocks)
@@ -86,9 +79,7 @@ module Rspec
       end
 
       def runnable?
-        ![example_block.nil?,
-          metadata[:disabled] == true,
-          metadata[:pending] == true ].any?
+        !metadata[:pending]
       end
 
       def run(example_group_instance)
@@ -102,10 +93,10 @@ module Rspec
 
         begin
           run_before_each
-          if @behaviour.around_eachs.empty?
+          if @example_group.around_eachs.empty?
             @example_group_instance.instance_eval(&example_block) if runnable?
           else
-            @behaviour.around_eachs.first.call(AroundProxy.new(self, &example_block))
+            @example_group.around_eachs.first.call(AroundProxy.new(self, &example_block))
           end
         rescue Exception => e
           exception_encountered = e
@@ -133,7 +124,7 @@ module Rspec
       end
 
       def inspect
-        "#{@metadata[:behaviour][:name]} - #{@metadata[:description]}"
+        @metadata[:full_description]
       end
 
       def to_s

data/lib/rspec/core/example_group.rb

@@ -13,7 +13,7 @@ module Rspec
       def self.inherited(klass)
         super
         Rspec::Core.configuration.autorun!
-        Rspec::Core.world.behaviours << klass
+        Rspec::Core.world.example_groups << klass
       end
 
       def self.extended_modules #:nodoc:
@@ -22,13 +22,16 @@ module Rspec
       end
 
       def self.example(desc=nil, options={}, &block)
-        examples << Rspec::Core::Example.new(self, desc, options.update(:caller => caller[0]), block)
+        options.update(:pending => true) unless block
+        options.update(:caller => caller)
+        examples << Rspec::Core::Example.new(self, desc, options, block)
       end
 
       def self.alias_example_to(new_alias, extra_options={})
         new_alias = <<-END_RUBY
                       def self.#{new_alias}(desc=nil, options={}, &block)
-                        updated_options = options.update(:caller => caller[0])
+                        updated_options = options.update(:caller => caller)
+                        updated_options.update(:pending => true) unless block
                         updated_options.update(#{extra_options.inspect})
                         examples << Rspec::Core::Example.new(self, desc, updated_options, block)
                       end
@@ -39,11 +42,10 @@ module Rspec
       alias_example_to :it
       alias_example_to :specify
       alias_example_to :focused, :focused => true
-      alias_example_to :disabled, :disabled => true
       alias_example_to :pending, :pending => true
 
       def self.it_should_behave_like(*names)
-        Rspec::Core.world.shared_behaviours.each do |name, block|
+        Rspec::Core.world.shared_example_groups.each do |name, block|
           module_eval(&block) if names.include?(name)
         end
       end
@@ -73,11 +75,11 @@ module Rspec
       end
 
       def self.name(friendly=true)
-        friendly ? metadata[:behaviour][:name] : super
+        friendly ? metadata[:example_group][:name] : super
       end
 
       def self.describes
-        metadata[:behaviour][:describes]
+        metadata[:example_group][:describes]
       end
 
       def self.described_class
@@ -85,24 +87,24 @@ module Rspec
       end
 
       def self.description
-        metadata[:behaviour][:description]
+        metadata[:example_group][:description]
       end
 
       def self.file_path
-        metadata[:behaviour][:file_path]
+        metadata[:example_group][:file_path]
       end
 
-      def self.describe(*args, &behaviour_block)
+      def self.describe(*args, &example_group_block)
         raise(ArgumentError, "No arguments given.  You must a least supply a type or description") if args.empty? 
-        raise(ArgumentError, "You must supply a block when calling describe") if behaviour_block.nil?
+        raise(ArgumentError, "You must supply a block when calling describe") if example_group_block.nil?
 
         # TODO: Pull out the below into a metadata object, that we can defer the subclassing if necessary
         # describe 'foo', :shared => true will need this to be completed first
         subclass('NestedLevel') do
           args << {} unless args.last.is_a?(Hash)
-          args.last.update(:behaviour_block => behaviour_block, :caller => caller(2))
+          args.last.update(:example_group_block => example_group_block, :caller => caller)
           set_it_up(*args)
-          module_eval(&behaviour_block)
+          module_eval(&example_group_block)
         end
       end
 
@@ -134,33 +136,33 @@ module Rspec
         @before_all_ivars ||= {}
       end
 
-      def self.eval_before_alls(running_behaviour)
-        superclass.before_all_ivars.each { |ivar, val| running_behaviour.instance_variable_set(ivar, val) }
-        Rspec::Core.configuration.find_advice(:before, :all, self).each { |blk| running_behaviour.instance_eval(&blk) }
+      def self.eval_before_alls(running_example_group)
+        superclass.before_all_ivars.each { |ivar, val| running_example_group.instance_variable_set(ivar, val) }
+        Rspec::Core.configuration.find_advice(:before, :all, self).each { |blk| running_example_group.instance_eval(&blk) }
 
-        before_alls.each { |blk| running_behaviour.instance_eval(&blk) }
-        running_behaviour.instance_variables.each { |ivar| before_all_ivars[ivar] = running_behaviour.instance_variable_get(ivar) }
+        before_alls.each { |blk| running_example_group.instance_eval(&blk) }
+        running_example_group.instance_variables.each { |ivar| before_all_ivars[ivar] = running_example_group.instance_variable_get(ivar) }
       end
 
-      def self.eval_before_eachs(running_behaviour)
-        Rspec::Core.configuration.find_advice(:before, :each, self).each { |blk| running_behaviour.instance_eval(&blk) }
-        before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_behaviour.instance_eval(&blk) } }
+      def self.eval_before_eachs(running_example_group)
+        Rspec::Core.configuration.find_advice(:before, :each, self).each { |blk| running_example_group.instance_eval(&blk) }
+        before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_example_group.instance_eval(&blk) } }
       end
 
-      def self.eval_after_alls(running_behaviour)
-        after_alls.each { |blk| running_behaviour.instance_eval(&blk) }
-        Rspec::Core.configuration.find_advice(:after, :all, self).each { |blk| running_behaviour.instance_eval(&blk) }
-        before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_behaviour.instance_variable_get(ivar) }
+      def self.eval_after_alls(running_example_group)
+        after_alls.each { |blk| running_example_group.instance_eval(&blk) }
+        Rspec::Core.configuration.find_advice(:after, :all, self).each { |blk| running_example_group.instance_eval(&blk) }
+        before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_example_group.instance_variable_get(ivar) }
       end
 
-      def self.eval_after_eachs(running_behaviour)
-        after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_behaviour.instance_eval(&blk) } }
-        Rspec::Core.configuration.find_advice(:after, :each, self).each { |blk| running_behaviour.instance_eval(&blk) }
+      def self.eval_after_eachs(running_example_group)
+        after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_example_group.instance_eval(&blk) } }
+        Rspec::Core.configuration.find_advice(:after, :each, self).each { |blk| running_example_group.instance_eval(&blk) }
       end
 
       def self.run(reporter)
         example_world = new
-        reporter.add_behaviour(self)
+        reporter.add_example_group(self)
         eval_before_alls(example_world)
         success = run_examples(example_world, reporter)
         eval_after_alls(example_world)
@@ -178,7 +180,6 @@ module Rspec
         end.all?
       end
 
-
       def self.subclass(base_name, &body) # :nodoc:
         @_subclass_count ||= 0
         @_subclass_count += 1
@@ -200,10 +201,18 @@ module Rspec
         end
       end
 
+      def self.all_apply?(filters)
+        metadata.all_apply?(filters)
+      end
+
       def assignments
         @assignments ||= {}
       end
 
+      def described_class
+        running_example.metadata[:example_group][:describes]
+      end
+
       def __reset__
         instance_variables.each { |ivar| remove_instance_variable(ivar) }
         assignments.clear

data/lib/rspec/core/formatters/base_formatter.rb

@@ -5,13 +5,13 @@ module Rspec
     module Formatters
 
       class BaseFormatter
-        attr_accessor :behaviour
+        attr_accessor :example_group
         attr_reader :example_count, :duration, :examples
 
         def initialize
           @example_count = 0
           @examples = []
-          @behaviour = nil
+          @example_group = nil
         end
 
         def configuration
@@ -43,7 +43,7 @@ module Rspec
         # formatters that need to provide progress on feedback (graphical ones)
         #
         # This method will only be invoked once, and the next one to be invoked
-        # is #add_behaviour
+        # is #add_example_group
         def start(example_count)
           @example_count = example_count
         end
@@ -52,13 +52,15 @@ module Rspec
           examples << example
         end
 
-        # This method is invoked at the beginning of the execution of each behaviour.
-        # +behaviour+ is the behaviour.
+        # This method is invoked at the beginning of the execution of each example group.
+        # +example_group+ is the example_group.
         #
         # The next method to be invoked after this is #example_failed or #example_finished
-        def add_behaviour(behaviour)
-          @behaviour = behaviour
+        def add_example_group(example_group)
+          @example_group = example_group
         end
+        
+        alias_method :add_example_group, :add_example_group
 
         # This method is invoked after all of the examples have executed. The next method
         # to be invoked after this one is #dump_failure (once for each failed example),

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -79,7 +79,7 @@ module Rspec
             output.puts "Pending:"
             pending_examples.each do |pending_example, message|
               output.puts "  #{pending_example}"
-              output.puts grey("   # #{format_caller(pending_example.metadata[:caller])}")
+              output.puts grey("   # #{format_caller(pending_example.metadata[:location])}")
             end
           end
           output.flush
@@ -136,4 +136,4 @@ module Rspec
 
   end
 
-end
+end

data/lib/rspec/core/formatters/documentation_formatter.rb

@@ -6,28 +6,26 @@ module Rspec
 
       class DocumentationFormatter < BaseTextFormatter
 
-        attr_reader :previous_nested_behaviours
-
         def initialize
           super
-          @previous_nested_behaviours = []
+          @previous_nested_example_groups = []
         end
 
-        def add_behaviour(behaviour)
+        def add_example_group(example_group)
           super
 
-          described_behaviour_chain.each_with_index do |nested_behaviour, i|
-            unless nested_behaviour == previous_nested_behaviours[i]
+          described_example_group_chain.each_with_index do |nested_example_group, i|
+            unless nested_example_group == @previous_nested_example_groups[i]
               at_root_level = (i == 0)
-              desc_or_name = at_root_level ? nested_behaviour.name : nested_behaviour.description
+              desc_or_name = at_root_level ? nested_example_group.name : nested_example_group.description
               output.puts if at_root_level
               output.puts "#{'  ' * i}#{desc_or_name}"
             end
           end
 
-          @previous_nested_behaviours = described_behaviour_chain
+          @previous_nested_example_groups = described_example_group_chain
         end
-
+        
         def output_for(example)
           case example.execution_result[:status]
           when 'failed'
@@ -68,11 +66,11 @@ module Rspec
         end
 
         def current_indentation
-          '  ' * previous_nested_behaviours.size
+          '  ' * @previous_nested_example_groups.size
         end
 
-        def described_behaviour_chain
-          behaviour.ancestors
+        def described_example_group_chain
+          example_group.ancestors
         end
 
       end