rspec 1.2.6 → 1.2.7

data/lib/spec/example/args_and_options.rb

@@ -12,7 +12,7 @@ module Spec
         args.options.merge!(options)
         args.options
       end
-      
+
       def set_location(options, location) # :nodoc:
         options[:location] ||= location
       end

data/lib/spec/example/before_and_after_hooks.rb

@@ -5,12 +5,12 @@ module Spec
         def before_suite_parts # :nodoc:
           @before_suite_parts ||= []
         end
-        
+
         def after_suite_parts # :nodoc:
           @after_suite_parts ||= []
         end
       end
-      
+
       # Registers a block to be executed before examples. <tt>scope</tt> can be
       # <tt>:each</tt> (default), <tt>:all</tt>, or <tt>:suite</tt>. When
       # <tt>:each</tt>, the block is executed before each example. When
@@ -23,7 +23,7 @@ module Spec
 
       # Registers a block to be executed before each example.
       # This method prepends +block+ to existing before blocks.
-      # 
+      #
       # See <tt>append_before</tt> for scoping semantics.
       def prepend_before(scope = :each, &block)
         before_parts(scope).unshift(block)
@@ -31,7 +31,7 @@ module Spec
 
       # Registers a block to be executed after each example.
       # This method prepends +block+ to existing after blocks.
-      # 
+      #
       # See <tt>append_before</tt> for scoping semantics.
       def prepend_after(scope = :each, &block)
         after_parts(scope).unshift(block)
@@ -40,7 +40,7 @@ module Spec
 
       # Registers a block to be executed after each example.
       # This method appends +block+ to existing after blocks.
-      # 
+      #
       # See <tt>append_before</tt> for scoping semantics.
       def append_after(scope = :each, &block)
         after_parts(scope) << block
@@ -53,7 +53,7 @@ module Spec
       def after_each_parts # :nodoc:
         @after_each_parts ||= []
       end
-      
+
       def before_all_parts # :nodoc:
         @before_all_parts ||= []
       end
@@ -65,13 +65,13 @@ module Spec
       def before_suite_parts # :nodoc:
         BeforeAndAfterHooks.before_suite_parts
       end
-      
+
       def after_suite_parts # :nodoc:
         BeforeAndAfterHooks.after_suite_parts
       end
-      
+
     private
-      
+
       def before_parts(scope)
         case scope
         when :each; before_each_parts
@@ -90,4 +90,4 @@ module Spec
 
     end
   end
-end
+end

data/lib/spec/example/errors.rb

@@ -1,7 +1,7 @@
 module Spec
   module Example
     class ExamplePendingError < StandardError; end
-    
+
     class NotYetImplementedError < ExamplePendingError
       MESSAGE = "Not Yet Implemented"
       def initialize
@@ -10,10 +10,15 @@ module Spec
     end
 
     class PendingExampleFixedError < StandardError; end
-    
+
     class NoDescriptionError < ArgumentError
+      class << self
+        def message(kind, location)
+          "No description supplied for #{kind} declared on #{location}"
+        end
+      end
       def initialize(kind, location)
-        super("No description supplied for #{kind} declared on #{location}")
+        super(self.class.message(kind, location))
       end
     end
   end

data/lib/spec/example/example_group.rb

@@ -8,4 +8,3 @@ module Spec
     end
   end
 end
-

data/lib/spec/example/example_group_factory.rb

@@ -1,10 +1,10 @@
 module Spec
   module Example
-    
+
     class ExampleGroupFactory
       module ClassMethods
         include Spec::Example::ArgsAndOptions
-        
+
         def reset
           @example_group_types = nil
           default(ExampleGroup)
@@ -23,7 +23,7 @@ module Spec
         def create_shared_example_group(*args, &example_group_block) # :nodoc:
           ::Spec::Example::SharedExampleGroup.register(*args, &example_group_block)
         end
-        
+
         def create_example_group(*args, &block)
           raise ArgumentError if args.empty? || block.nil?
           add_options(args)

data/lib/spec/example/example_group_hierarchy.rb

@@ -8,43 +8,43 @@ module Spec
           flatten!
         end
       end
-      
+
       def run_before_all(example)
         example.eval_each_fail_fast(before_all_parts)
       end
-      
+
       def run_before_each(example)
         example.eval_each_fail_fast(before_each_parts)
       end
-      
+
       def run_after_each(example)
         example.eval_each_fail_slow(after_each_parts)
       end
-      
+
       def run_after_all(example)
         example.eval_each_fail_slow(after_all_parts)
       end
-      
+
       def before_all_parts
         @before_all_parts ||= collect {|klass| klass.before_all_parts}.flatten
       end
-      
+
       def before_each_parts
         @before_each_parts ||= collect {|klass| klass.before_each_parts}.flatten
       end
-      
+
       def after_each_parts
         @after_each_parts ||= reverse.collect {|klass| klass.after_each_parts}.flatten
       end
-      
+
       def after_all_parts
         @after_all_parts ||= reverse.collect {|klass| klass.after_all_parts}.flatten
       end
-      
+
       def nested_descriptions
         @nested_descriptions ||= collect {|eg| nested_description_from(eg) == "" ? nil : nested_description_from(eg) }.compact
       end
-      
+
       def nested_description_from(example_group)
         example_group.description_args.join
       end

data/lib/spec/example/example_group_methods.rb

@@ -1,7 +1,7 @@
 module Spec
   module Example
 
-    module ExampleGroupMethods      
+    module ExampleGroupMethods
       class << self
         attr_accessor :matcher_class
 
@@ -20,16 +20,16 @@ module Spec
       include Spec::Example::ArgsAndOptions
 
       attr_reader :location
-      
+
       def options # :nodoc:
         @options ||= {}
       end
-      
+
       def inherited(klass) # :nodoc:
         super
         ExampleGroupFactory.register_example_group(klass)
       end
-      
+
       # Makes the describe/it syntax available from a class. For example:
       #
       #   class StackSpec < Spec::ExampleGroup
@@ -59,14 +59,14 @@ module Spec
         end
       end
       alias :context :describe
-      
+
       # Use this to pull in examples from shared example groups.
       def it_should_behave_like(*shared_example_groups)
         shared_example_groups.each do |group|
           include_shared_example_group(group)
         end
       end
-      
+
       # Creates an instance of the current example group class and adds it to
       # a collection of examples of the current example group.
       def example(description=nil, options={}, backtrace=nil, &implementation)
@@ -75,7 +75,7 @@ module Spec
         example_implementations[example_proxy] = implementation || pending_implementation
         example_proxy
       end
-      
+
       def pending_implementation
         lambda { raise(Spec::Example::NotYetImplementedError) }
       end
@@ -87,10 +87,10 @@ module Spec
       def xexample(description=nil, opts={}, &block)
         Kernel.warn("Example disabled: #{description}")
       end
-      
+
       alias_method :xit, :xexample
       alias_method :xspecify, :xexample
-      
+
       def run(run_options)
         examples = examples_to_run(run_options)
         notify(run_options.reporter) unless examples.empty?
@@ -110,7 +110,7 @@ module Spec
         @location = File.expand_path(options[:location]) if options[:location]
         self
       end
-      
+
       def notify(reporter) # :nodoc:
         reporter.example_group_started(ExampleGroupProxy.new(self))
       end
@@ -118,33 +118,33 @@ module Spec
       def description
         @description ||= ExampleGroupMethods.build_description_from(*description_parts) || to_s
       end
-      
+
       def described_type
         @described_type ||= description_parts.reverse.find {|part| part.is_a?(Module)}
       end
-      
+
       def described_class
         @described_class ||= Class === described_type ? described_type : nil
       end
-      
+
       def description_args
         @description_args ||= []
       end
-      
+
       def description_parts #:nodoc:
         @description_parts ||= example_group_hierarchy.inject([]) do |parts, example_group_class|
           [parts << example_group_class.description_args].flatten
         end
       end
-      
+
       def example_proxies # :nodoc:
         @example_proxies ||= []
       end
-      
+
       def example_implementations # :nodoc:
         @example_implementations ||= {}
       end
-            
+
       def examples(run_options=nil) #:nodoc:
         (run_options && run_options.reverse) ? example_proxies.reverse : example_proxies
       end
@@ -156,15 +156,15 @@ module Spec
       def example_group_hierarchy
         @example_group_hierarchy ||= ExampleGroupHierarchy.new(self)
       end
-      
+
       def nested_descriptions
         example_group_hierarchy.nested_descriptions
       end
-      
+
       def include_constants_in(mod)
         include mod if (Spec::Ruby.version.to_f >= 1.9) & (Module === mod) & !(Class === mod)
       end
-      
+
     private
 
       def subclass(*args, &example_group_block)
@@ -201,16 +201,16 @@ module Spec
         return [success, instance_variables] unless success
 
         after_all_instance_variables = instance_variables
-        
+
         examples.each do |example|
           example_group_instance = new(example, &example_implementations[example])
           success &= example_group_instance.execute(run_options, instance_variables)
           after_all_instance_variables = example_group_instance.instance_variable_hash
         end
-        
+
         return [success, after_all_instance_variables]
       end
-      
+
       def run_after_all(success, instance_variables, run_options)
         return success if example_group_hierarchy.after_all_parts.empty?
         example_proxy = ExampleProxy.new("after(:all)")
@@ -222,13 +222,21 @@ module Spec
         run_options.reporter.example_failed(example_proxy, e)
         false
       end
-      
+
       def examples_to_run(run_options)
         return example_proxies unless examples_were_specified?(run_options)
-        example_proxies.reject do |proxy|
-          matcher = ExampleGroupMethods.matcher_class.
-            new(description.to_s, proxy.description)
-          !matcher.matches?(run_options.examples)
+        if run_options.line_number_requested?
+          if location =~ /:#{run_options.example_line}$/
+            example_proxies
+          else
+            example_proxies.select {|proxy| proxy.location =~ /:#{run_options.example_line}$/}
+          end
+        else
+          example_proxies.reject do |proxy|
+            matcher = ExampleGroupMethods.matcher_class.
+              new(description.to_s, proxy.description)
+            !matcher.matches?(run_options.examples)
+          end
         end
       end
 
@@ -239,7 +247,7 @@ module Spec
       def method_added(name) # :nodoc:
         example(name.to_s, {}, caller(0)[1]) {__send__ name.to_s} if example_method?(name.to_s)
       end
-      
+
       def example_method?(method_name)
         should_method?(method_name)
       end

data/lib/spec/example/example_group_proxy.rb

@@ -3,7 +3,7 @@ module Spec
     # Lightweight proxy for an example group. This is the object that is passed
     # to Spec::Runner::Formatter::BaseFormatter#example_group_started
     class ExampleGroupProxy
-      
+
       def initialize(example_group) # :nodoc:
         @description         = example_group.description
         @nested_descriptions = example_group.nested_descriptions
@@ -14,35 +14,35 @@ module Spec
         @options.delete(:location)
         @options.delete(:scope)
       end
-      
+
       # Optional hash passed to the example group declaration. Note that RSpec uses
       # this hash internally and reserves the keys :location and :scope for its own
       # use (and removes them from this hash)
       attr_reader :options
-      
+
       # This is the description passed to the <tt>describe()</tt> method or any
       # of its aliases
       attr_reader :description
-      
+
       # Used by Spec::Runner::Formatter::NestedTextFormatter to access the
       # description of each example group in a nested group separately.
       attr_reader :nested_descriptions
-      
+
       # A collection of ExampleGroupProxy objects, one for each example
       # declared in this group.
       attr_reader :examples
-      
+
       # The file and line number at which the proxied example group
       # was declared. This is extracted from <tt>caller</tt>, and is therefore
       # formatted as an individual line in a backtrace.
       attr_reader :location
-      
+
       # Deprecated - use location() instead
       def backtrace
         Spec::deprecate("ExampleGroupProxy#backtrace","ExampleGroupProxy#location")
         @backtrace
       end
-  
+
       # Deprecated - just use gsub on the description instead.
       def filtered_description(regexp)
         Spec::deprecate("ExampleGroupProxy#filtered_description","gsub (or similar) to modify ExampleGroupProxy#description")
@@ -52,11 +52,10 @@ module Spec
           end
         )
       end
-      
+
       def ==(other) # :nodoc:
         other.description == description
       end
     end
   end
 end
-

data/lib/spec/example/example_matcher.rb

@@ -5,13 +5,13 @@ module Spec
         @example_group_description = example_group_description
         @example_name = example_name
       end
-      
+
       def matches?(specified_examples)
         specified_examples.any? do |specified_example|
           matches_literal_example?(specified_example) || matches_example_not_considering_modules?(specified_example)
         end
       end
-      
+
       protected
       def matches_literal_example?(specified_example)
         specified_example =~ /(^#{example_group_regex} #{example_regexp}$|^#{example_group_regex}$|^#{example_group_with_before_all_regexp}$|^#{example_regexp}$)/
@@ -34,7 +34,7 @@ module Spec
       end
 
       def example_regexp
-        Regexp.escape(@example_name)
+        Regexp.escape(@example_name) if @example_name
       end
     end