rspec-core 2.0.0.a2 → 2.0.0.a3

data/lib/rspec/core/kernel_extensions.rb

@@ -2,10 +2,10 @@ module Rspec
   module Core
     module KernelExtensions
 
-      def describe(*args, &behaviour_block)
+      def describe(*args, &example_group_block)
         args << {} unless args.last.is_a?(Hash)
         args.last.update :caller => caller(1)
-        Rspec::Core::ExampleGroup.describe(*args, &behaviour_block)
+        Rspec::Core::ExampleGroup.describe(*args, &example_group_block)
       end
 
       alias :context :describe

data/lib/rspec/core/load_path.rb

@@ -1,4 +1,3 @@
 require 'rspec/core/ruby_project'
 
-Rspec::Core::RubyProject.add_to_load_path('lib')
-Rspec::Core::RubyProject.add_to_load_path('spec')
+Rspec::Core::RubyProject.add_to_load_path('lib', 'spec')

data/lib/rspec/core/metadata.rb

@@ -13,63 +13,101 @@ module Rspec
       def initialize(superclass_metadata=nil)
         @superclass_metadata = superclass_metadata
         update(@superclass_metadata) if @superclass_metadata
-        store(:behaviour, {})
+        store(:example_group, {})
+        store(:behaviour, self[:example_group])
         yield self if block_given?
       end
 
       def process(*args)
         extra_metadata = args.last.is_a?(Hash) ? args.pop : {}
-        extra_metadata.delete(:behaviour) # Remove it when present to prevent it clobbering the one we setup
+        extra_metadata.delete(:example_group) # Remove it when present to prevent it clobbering the one we setup
+        extra_metadata.delete(:behaviour)     # Remove it when present to prevent it clobbering the one we setup
 
-        self[:behaviour][:describes] = args.shift unless args.first.is_a?(String)
-        self[:behaviour][:describes] ||= self.superclass_metadata && self.superclass_metadata[:behaviour][:describes]
-        self[:behaviour][:description] = args.shift || ''
+        self[:example_group][:describes] = args.shift unless args.first.is_a?(String)
+        self[:example_group][:describes] ||= self.superclass_metadata && self.superclass_metadata[:example_group][:describes]
+        self[:example_group][:description] = args.shift || ''
 
-        self[:behaviour][:name] = determine_name
-        self[:behaviour][:block] = extra_metadata.delete(:behaviour_block)
-        self[:behaviour][:caller] = extra_metadata.delete(:caller)
-        self[:behaviour][:file_path] = determine_file_path(extra_metadata.delete(:file_path))
-        self[:behaviour][:line_number] = determine_line_number(extra_metadata.delete(:line_number))
+        self[:example_group][:name] = determine_name
+        self[:example_group][:block] = extra_metadata.delete(:example_group_block)
+        self[:example_group][:caller] = extra_metadata.delete(:caller)
+        self[:example_group][:file_path] = file_path_from(self[:example_group], extra_metadata.delete(:file_path))
+        self[:example_group][:line_number] = line_number_from(self[:example_group], extra_metadata.delete(:line_number))
+        self[:example_group][:location] = location_from(self[:example_group])
 
         update(extra_metadata)
       end
 
-      def for_example(desc, options)
-        dup.configure_for_example(desc,options)
+      def for_example(description, options)
+        dup.configure_for_example(description,options)
       end
 
-      def configure_for_example(desc, options)
-        store(:description, desc.to_s)
+      def configure_for_example(description, options)
+        store(:description, description.to_s)
+        store(:full_description, "#{self[:example_group][:name]} #{self[:description]}")
         store(:execution_result, {})
         store(:caller, options.delete(:caller))
         if self[:caller]
-          store(:file_path, determine_file_path)
-          store(:line_number, determine_line_number)
+          store(:file_path, file_path_from(self))
+          store(:line_number, line_number_from(self))
         end
+        self[:location] = location_from(self)
         update(options)
+        self
+      end
+
+      def apply_condition(filter_on, filter, metadata=nil)
+        metadata ||= self
+        case filter
+        when Hash
+          filter.all? { |k, v| apply_condition(k, v, metadata[filter_on]) }
+        when Regexp
+          metadata[filter_on] =~ filter
+        when Proc
+          filter.call(metadata[filter_on]) rescue false
+        when Fixnum
+          if filter_on == :line_number
+            [metadata[:line_number],metadata[:example_group][:line_number]].include?(filter)
+          else
+            metadata[filter_on] == filter
+          end
+        else
+          metadata[filter_on] == filter
+        end
+      end
+
+      def all_apply?(filters)
+        filters.all? do |filter_on, filter|
+          apply_condition(filter_on, filter)
+        end
       end
 
     private
 
-      def possible_files
-        self[:behaviour][:caller].grep(/\_spec\.rb:/i)
+      def file_path_from(metadata, given_file_path=nil)
+        given_file_path || file_and_line_number(metadata)[0].strip
+      end
+
+      def line_number_from(metadata, given_line_number=nil)
+        given_line_number || file_and_line_number(metadata)[1].to_i
+      end
+
+      def location_from(metadata)
+        "#{metadata[:file_path]}:#{metadata[:line_number]}"
       end
 
-      def determine_file_path(given_file_path=nil)
-        return given_file_path if given_file_path
-        possible_files.first.split(':').first.strip
+      def file_and_line_number(metadata)
+        candidate_entries_from_caller(metadata).first.split(':')
       end
 
-      def determine_line_number(given_line_number=nil)
-        return given_line_number if given_line_number
-        possible_files.first.split(':')[1].to_i
+      def candidate_entries_from_caller(metadata)
+        metadata[:caller].grep(/\_spec\.rb:/i)
       end
 
       def determine_name
-        if superclass_metadata && superclass_metadata[:behaviour][:name]
-          self[:behaviour][:name] = "#{superclass_metadata[:behaviour][:name]} #{self[:behaviour][:description]}".strip 
+        if superclass_metadata && superclass_metadata[:example_group][:name]
+          self[:example_group][:name] = "#{superclass_metadata[:example_group][:name]} #{self[:example_group][:description]}".strip 
         else
-          self[:behaviour][:name] = "#{self[:behaviour][:describes]} #{self[:behaviour][:description]}".strip
+          self[:example_group][:name] = "#{self[:example_group][:describes]} #{self[:example_group][:description]}".strip
         end
       end
 

data/lib/rspec/core/ruby_project.rb

@@ -1,30 +1,44 @@
+# This is borrowed (slightly modified) from Scott Taylor's
+# project_path project:
+#   http://github.com/smtlaissezfaire/project_path
+
+require 'pathname'
+
 module Rspec
   module Core
     module RubyProject
-      def add_to_load_path(dir)
-        dir = File.join(root, dir)
+      def add_to_load_path(*dirs)
+        dirs.map {|dir| add_dir_to_load_path(File.join(root, dir))}
+      end
+
+      def add_dir_to_load_path(dir) # :nodoc:
         $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
       end
 
       def root # :nodoc:
-        require 'pathname'
         @project_root ||= determine_root
       end
 
       def determine_root # :nodoc:
-        # This is borrowed (slightly modified) from Scott Taylor's
-        # project_path project:
-        #   http://github.com/smtlaissezfaire/project_path
+        find_first_parent_containing('spec') || '.'
+      end
+
+      def find_first_parent_containing(dir) # :nodoc:
+        ascend_until {|path| File.exists?(File.join(path, dir))}
+      end
+
+      def ascend_until(&block) # :nodoc:
         Pathname(File.expand_path('.')).ascend do |path|
-          if File.exists?(File.join(path, "spec"))
-            return path
-          end
+          return path if block.call(path)
         end
       end
       
       module_function :add_to_load_path
+      module_function :add_dir_to_load_path
       module_function :root
       module_function :determine_root
+      module_function :find_first_parent_containing
+      module_function :ascend_until
     end
   end
-end
+end

data/lib/rspec/core/runner.rb

@@ -22,7 +22,7 @@ module Rspec
       end
 
       def require_all_files(configuration)
-        configuration.files_to_run.map {|f| require f.sub(/^spec\//,'') }
+        configuration.files_to_run.map {|f| require f }
       end
       
       def run(args = [])
@@ -42,8 +42,8 @@ module Rspec
         formatter.start(total_examples_to_run) # start the clock
         start = Time.now
 
-        Rspec::Core.world.behaviours_to_run.each do |behaviour|
-          suite_success &= behaviour.run(formatter)
+        Rspec::Core.world.example_groups_to_run.each do |example_group|
+          suite_success &= example_group.run(formatter)
         end
 
         formatter.start_dump(Time.now - start)

data/lib/rspec/core/{shared_behaviour.rb → shared_example_group.rb}

@@ -1,10 +1,10 @@
 module Rspec
   module Core
-    module SharedBehaviour
+    module SharedExampleGroup
       
       def share_examples_for(name, &block)
         ensure_shared_example_group_name_not_taken(name)
-        Rspec::Core.world.shared_behaviours[name] = block
+        Rspec::Core.world.shared_example_groups[name] = block
       end
 
       def share_as(name, &block)
@@ -21,7 +21,7 @@ module Rspec
         end
 
         shared_const = Object.const_set(name, mod)
-        Rspec::Core.world.shared_behaviours[shared_const] = block
+        Rspec::Core.world.shared_example_groups[shared_const] = block
       end
 
       alias :shared_examples_for :share_examples_for
@@ -29,7 +29,7 @@ module Rspec
       private
 
       def ensure_shared_example_group_name_not_taken(name)
-        if Rspec::Core.world.shared_behaviours.has_key?(name)
+        if Rspec::Core.world.shared_example_groups.has_key?(name)
           raise ArgumentError.new("Shared example group '#{name}' already exists")
         end
       end
@@ -38,4 +38,4 @@ module Rspec
   end
 end
 
-include Rspec::Core::SharedBehaviour
+include Rspec::Core::SharedExampleGroup

data/lib/rspec/core/{shared_behaviour_kernel_extensions.rb → shared_example_group_kernel_extensions.rb}

@@ -1,9 +1,9 @@
 module Rspec
   module Core
-    module SharedBehaviourKernelExtensions
+    module SharedExampleGroupKernelExtensions
 
       def share_examples_for(name, &block)
-        Rspec::Core.world.shared_behaviours[name] = block
+        Rspec::Core.world.shared_example_groups[name] = block
       end
 
       def share_as(name, &block)
@@ -21,7 +21,7 @@ module Rspec
         end
 
         shared_const = Object.const_set(name, mod)
-        Rspec::Core.world.shared_behaviours[shared_const] = block
+        Rspec::Core.world.shared_example_groups[shared_const] = block
       end
 
       alias :shared_examples_for :share_examples_for

data/lib/rspec/core/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a2'
+        PRE    = 'a3'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/lib/rspec/core/world.rb

@@ -2,10 +2,10 @@ module Rspec
   module Core
     class World
 
-      attr_reader :behaviours
+      attr_reader :example_groups
 
       def initialize
-        @behaviours = []
+        @example_groups = []
       end
 
       def filter
@@ -16,63 +16,51 @@ module Rspec
         Rspec::Core.configuration.exclusion_filter
       end
 
-      def shared_behaviours
-        @shared_behaviours ||= {}
+      def shared_example_groups
+        @shared_example_groups ||= {}
       end
 
-      def behaviours_to_run
-        return @behaviours_to_run if @behaviours_to_run
+      def example_groups_to_run
+        return @example_groups_to_run if @example_groups_to_run
 
         if filter || exclusion_filter
-          @behaviours_to_run = filter_behaviours
+          @example_groups_to_run = filter_example_groups
 
-          if @behaviours_to_run.size == 0 && Rspec::Core.configuration.run_all_when_everything_filtered?
+          if @example_groups_to_run.size == 0 && Rspec::Core.configuration.run_all_when_everything_filtered?
             Rspec::Core.configuration.puts "No examples were matched by #{filter.inspect}, running all"
-            # reset the behaviour list to all behaviours, and add back all examples
-            @behaviours_to_run = @behaviours
-            @behaviours.each { |b| b.examples_to_run.replace(b.examples) }
+            # reset the behaviour list to all example groups, and add back all examples
+            @example_groups_to_run = @example_groups
+            @example_groups.each { |b| b.examples_to_run.replace(b.examples) }
           else
             Rspec::Core.configuration.puts "Run filtered using #{filter.inspect}"          
           end
         else
-          @behaviours_to_run = @behaviours
-          @behaviours.each { |b| b.examples_to_run.replace(b.examples) }
+          @example_groups_to_run = @example_groups
+          @example_groups.each { |b| b.examples_to_run.replace(b.examples) }
         end      
 
-        @behaviours_to_run
+        @example_groups_to_run
       end
 
       def total_examples_to_run
-        @total_examples_to_run ||= behaviours_to_run.inject(0) { |sum, b| sum += b.examples_to_run.size }
+        @total_examples_to_run ||= example_groups_to_run.inject(0) { |sum, b| sum += b.examples_to_run.size }
       end
 
-      def filter_behaviours
-        behaviours.inject([]) do |list_of_behaviors, _behavior|
-          examples = _behavior.examples
+      def filter_example_groups
+        example_groups.inject([]) do |list_of_example_groups, example_group|
+          examples = example_group.examples
           examples = apply_exclusion_filters(examples, exclusion_filter) if exclusion_filter
           examples = apply_inclusion_filters(examples, filter) if filter
           examples.uniq!
-          _behavior.examples_to_run.replace(examples)
+          example_group.examples_to_run.replace(examples)
           if examples.empty?
-            list_of_behaviors << nil
+            list_of_example_groups << nil
           else
-            list_of_behaviors << _behavior
+            list_of_example_groups << example_group
           end
         end.compact
       end
 
-      def find(collection, type_of_filter=:positive, conditions={})
-        negative = type_of_filter != :positive
-
-        collection.select do |item|
-          # negative conditions.any?, positive conditions.all? ?????
-          result = conditions.all? do |filter_on, filter| 
-            apply_condition(filter_on, filter, item.metadata)
-          end
-          negative ? !result : result
-        end
-      end
-
       def apply_inclusion_filters(collection, conditions={})
         find(collection, :positive, conditions)
       end
@@ -81,24 +69,15 @@ module Rspec
         find(collection, :negative, conditions)
       end
 
-      def apply_condition(filter_on, filter, metadata)
-        return false if metadata.nil?
-
-        case filter
-        when Hash
-          filter.all? { |k, v| apply_condition(k, v, metadata[filter_on]) }
-        when Regexp
-          metadata[filter_on] =~ filter
-        when Proc
-          filter.call(metadata[filter_on]) rescue false
-        else
-          metadata[filter_on] == filter
-        end
-      end
+      def find(collection, type_of_filter=:positive, conditions={})
+        negative = type_of_filter != :positive
 
-      def all_apply?(group, filters)
-        filters.all? do |filter_on, filter|
-          Rspec::Core.world.apply_condition(filter_on, filter, group.metadata)
+        collection.select do |item|
+          # negative conditions.any?, positive conditions.all? ?????
+          result = conditions.all? do |filter_on, filter| 
+            item.metadata.apply_condition(filter_on, filter)
+          end
+          negative ? !result : result
         end
       end
 

data/rspec-core.gemspec

@@ -5,12 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.a2"
+  s.version = "2.0.0.a3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-03}
   s.default_executable = %q{rspec}
+  s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec"]
   s.extra_rdoc_files = [
@@ -73,8 +74,6 @@ Gem::Specification.new do |s|
      "example_specs/passing/stubbing_example.rb",
      "example_specs/passing/yielding_example.rb",
      "example_specs/ruby1.9.compatibility/access_to_constants_spec.rb",
-     "features-pending/command_line/line_number_option.feature",
-     "features-pending/command_line/line_number_option_with_example_with_no_name.feature",
      "features-pending/example_groups/example_group_with_should_methods.feature",
      "features-pending/example_groups/implicit_docstrings.feature",
      "features-pending/expectations/expect_change.feature",
@@ -93,6 +92,9 @@ Gem::Specification.new do |s|
      "features-pending/runner/specify_line_number.feature",
      "features/before_and_after_blocks/around.feature",
      "features/before_and_after_blocks/before_and_after_blocks.feature",
+     "features/command_line/example_name_option.feature",
+     "features/command_line/line_number_appended_to_path.feature",
+     "features/command_line/line_number_option.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
      "features/expectations/customized_message.feature",
@@ -119,7 +121,6 @@ Gem::Specification.new do |s|
      "lib/rspec/core/example.rb",
      "lib/rspec/core/example_group.rb",
      "lib/rspec/core/example_group_subject.rb",
-     "lib/rspec/core/extensions/instance_exec.rb",
      "lib/rspec/core/formatters.rb",
      "lib/rspec/core/formatters/base_formatter.rb",
      "lib/rspec/core/formatters/base_text_formatter.rb",
@@ -136,13 +137,12 @@ Gem::Specification.new do |s|
      "lib/rspec/core/rake_task.rb",
      "lib/rspec/core/ruby_project.rb",
      "lib/rspec/core/runner.rb",
-     "lib/rspec/core/shared_behaviour.rb",
-     "lib/rspec/core/shared_behaviour_kernel_extensions.rb",
+     "lib/rspec/core/shared_example_group.rb",
+     "lib/rspec/core/shared_example_group_kernel_extensions.rb",
      "lib/rspec/core/version.rb",
      "lib/rspec/core/world.rb",
      "rspec-core.gemspec",
      "script/console",
-     "spec/resources/example_classes.rb",
      "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
@@ -154,14 +154,15 @@ Gem::Specification.new do |s|
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
      "spec/rspec/core/mocha_spec.rb",
+     "spec/rspec/core/pending_example_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
      "spec/rspec/core/resources/a_spec.rb",
      "spec/rspec/core/resources/custom_example_group_runner.rb",
-     "spec/rspec/core/resources/example_classes.rb",
      "spec/rspec/core/resources/utf8_encoded.rb",
+     "spec/rspec/core/ruby_project_spec.rb",
      "spec/rspec/core/runner_spec.rb",
-     "spec/rspec/core/shared_behaviour_spec.rb",
+     "spec/rspec/core/shared_example_group_spec.rb",
      "spec/rspec/core/world_spec.rb",
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
@@ -173,10 +174,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Rspec runner and example group classes}
+  s.summary = %q{rspec-core 2.0.0.a3}
   s.test_files = [
-    "spec/resources/example_classes.rb",
-     "spec/rspec/core/command_line_options_spec.rb",
+    "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
      "spec/rspec/core/example_group_subject_spec.rb",
@@ -187,14 +187,15 @@ Gem::Specification.new do |s|
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
      "spec/rspec/core/mocha_spec.rb",
+     "spec/rspec/core/pending_example_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
      "spec/rspec/core/resources/a_spec.rb",
      "spec/rspec/core/resources/custom_example_group_runner.rb",
-     "spec/rspec/core/resources/example_classes.rb",
      "spec/rspec/core/resources/utf8_encoded.rb",
+     "spec/rspec/core/ruby_project_spec.rb",
      "spec/rspec/core/runner_spec.rb",
-     "spec/rspec/core/shared_behaviour_spec.rb",
+     "spec/rspec/core/shared_example_group_spec.rb",
      "spec/rspec/core/world_spec.rb",
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
@@ -206,17 +207,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a2"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a3"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a2"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a3"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a2"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a3"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
   end
 end