rspec-core 2.0.0.a1 → 2.0.0.a2

data/lib/rspec/core/extensions/instance_exec.rb

@@ -0,0 +1,31 @@
+module Rspec
+  module Core
+    module InstanceExec
+      unless respond_to?(:instance_exec)
+        # based on Bounded Spec InstanceExec (Mauricio Fernandez)
+        # http://eigenclass.org/hiki/bounded+space+instance_exec
+        # - uses singleton_class of matcher instead of global
+        #   InstanceExecHelper module
+        # - this keeps it scoped to this class only, which is the
+        #   only place we need it
+        # - only necessary for ruby 1.8.6
+        def instance_exec(*args, &block)
+          singleton_class = (class << self; self; end)
+          begin
+            orig_critical, Thread.critical = Thread.critical, true
+            n = 0
+            n += 1 while respond_to?(method_name="__instance_exec#{n}")
+            singleton_class.module_eval{ define_method(:__instance_exec, &block) }
+          ensure
+            Thread.critical = orig_critical
+          end
+          begin
+            return send(:__instance_exec, *args)
+          ensure
+            singleton_class.module_eval{ remove_method(:__instance_exec) } rescue nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/core/kernel_extensions.rb

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

data/lib/rspec/core/load_path.rb

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

data/lib/rspec/core/metadata.rb

@@ -0,0 +1,78 @@
+module Rspec
+  module Core
+    class Metadata < Hash
+
+      def self.process(superclass_metadata, *args)
+        new(superclass_metadata) do |metadata|
+          metadata.process(*args)
+        end
+      end
+      
+      attr_reader :superclass_metadata
+
+      def initialize(superclass_metadata=nil)
+        @superclass_metadata = superclass_metadata
+        update(@superclass_metadata) if @superclass_metadata
+        store(:behaviour, {})
+        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
+
+        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[: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))
+
+        update(extra_metadata)
+      end
+
+      def for_example(desc, options)
+        dup.configure_for_example(desc,options)
+      end
+
+      def configure_for_example(desc, options)
+        store(:description, desc.to_s)
+        store(:execution_result, {})
+        store(:caller, options.delete(:caller))
+        if self[:caller]
+          store(:file_path, determine_file_path)
+          store(:line_number, determine_line_number)
+        end
+        update(options)
+      end
+
+    private
+
+      def possible_files
+        self[:behaviour][:caller].grep(/\_spec\.rb:/i)
+      end
+
+      def determine_file_path(given_file_path=nil)
+        return given_file_path if given_file_path
+        possible_files.first.split(':').first.strip
+      end
+
+      def determine_line_number(given_line_number=nil)
+        return given_line_number if given_line_number
+        possible_files.first.split(':')[1].to_i
+      end
+
+      def determine_name
+        if superclass_metadata && superclass_metadata[:behaviour][:name]
+          self[:behaviour][:name] = "#{superclass_metadata[:behaviour][:name]} #{self[:behaviour][:description]}".strip 
+        else
+          self[:behaviour][:name] = "#{self[:behaviour][:describes]} #{self[:behaviour][:description]}".strip
+        end
+      end
+
+    end
+  end
+end

data/lib/rspec/core/rake_task.rb

@@ -18,7 +18,7 @@ module Rspec
       # Glob pattern to match files. (default is 'spec/**/*_spec.rb')
       attr_accessor :pattern
 
-      # Array of commandline options to pass to ruby. Defaults to [].
+      # The options to pass to ruby.  Defaults to blank
       attr_accessor :ruby_opts
 
       # Whether or not to fail Rake when an error occurs (typically when examples fail).
@@ -38,9 +38,6 @@ module Rspec
       # The options to pass to rcov.  Defaults to blank
       attr_accessor :rcov_opts
 
-      # The options to pass to ruby.  Defaults to blank
-      attr_accessor :ruby_opts
-      
       def initialize(*args)
         @name = args.shift || :spec
         @pattern, @rcov_opts, @ruby_opts = nil, nil, nil
@@ -63,6 +60,8 @@ module Rspec
             else
               cmd_parts = [rcov ? 'rcov' : RUBY]
               cmd_parts += rcov ? [rcov_opts] : [ruby_opts]
+              cmd_parts << '-Ilib'
+              cmd_parts << '-Ispec'
               cmd_parts << "-w" if warning
               cmd_parts += files_to_run.collect { |fn| %["#{fn}"] }
               cmd = cmd_parts.join(" ")

data/lib/rspec/core/ruby_project.rb

@@ -0,0 +1,30 @@
+module Rspec
+  module Core
+    module RubyProject
+      def add_to_load_path(dir)
+        dir = File.join(root, dir)
+        $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
+        Pathname(File.expand_path('.')).ascend do |path|
+          if File.exists?(File.join(path, "spec"))
+            return path
+          end
+        end
+      end
+      
+      module_function :add_to_load_path
+      module_function :root
+      module_function :determine_root
+    end
+  end
+end

data/lib/rspec/core/runner.rb

@@ -21,16 +21,14 @@ module Rspec
         configuration.formatter
       end
 
-      def require_all_files(files)
-        files.each { |file| require file }
+      def require_all_files(configuration)
+        configuration.files_to_run.map {|f| require f.sub(/^spec\//,'') }
       end
       
       def run(args = [])
-        cli_config = Rspec::Core::CommandLineOptions.parse(args)
-        
-        require_all_files(cli_config.files_to_run)
-        
-        cli_config.apply(configuration)
+        Rspec::Core::CommandLineOptions.parse(args).apply(configuration)
+
+        require_all_files(configuration)
         
         total_examples_to_run = Rspec::Core.world.total_examples_to_run
 
@@ -59,6 +57,7 @@ module Rspec
 
         suite_success
       end
+      
 
     end
 

data/lib/rspec/core/version.rb

@@ -5,11 +5,11 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a1'
+        PRE    = 'a2'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 
-        SUMMARY = "rspec-core #{STRING}"
+        SUMMARY = "rspec-core " + STRING
       end
     end
   end

data/lib/rspec/core/world.rb

@@ -1,7 +1,5 @@
 module Rspec
-  
   module Core
-
     class World
 
       attr_reader :behaviours
@@ -98,8 +96,12 @@ module Rspec
         end
       end
 
-    end
+      def all_apply?(group, filters)
+        filters.all? do |filter_on, filter|
+          Rspec::Core.world.apply_condition(filter_on, filter, group.metadata)
+        end
+      end
 
+    end
   end
-  
 end

data/rspec-core.gemspec

@@ -1,17 +1,16 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.a1"
+  s.version = "2.0.0.a2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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{2009-09-16}
+  s.date = %q{2010-01-24}
   s.default_executable = %q{rspec}
-  s.description = %q{RSpec Core}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec"]
   s.extra_rdoc_files = [
@@ -25,8 +24,6 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "TODO.markdown",
-     "VERSION",
-     "VERSION.yml",
      "bin/rspec",
      "cucumber.yml",
      "example_specs/failing/README.txt",
@@ -80,7 +77,6 @@ Gem::Specification.new do |s|
      "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/example_groups/nested_groups.feature",
      "features-pending/expectations/expect_change.feature",
      "features-pending/expectations/expect_error.feature",
      "features-pending/extensions/custom_example_group.feature",
@@ -91,19 +87,23 @@ Gem::Specification.new do |s|
      "features-pending/interop/test_but_not_test_unit.feature",
      "features-pending/interop/test_case_with_should_methods.feature",
      "features-pending/matchers/define_diffable_matcher.feature",
-     "features-pending/matchers/define_matcher.feature",
      "features-pending/matchers/define_matcher_with_fluent_interface.feature",
-     "features-pending/mocks/mix_stubs_and_mocks.feature",
      "features-pending/mocks/stub_implementation.feature",
      "features-pending/pending/pending_examples.feature",
      "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/example_groups/describe_aliases.feature",
+     "features/example_groups/nested_groups.feature",
      "features/expectations/customized_message.feature",
+     "features/matchers/define_matcher.feature",
      "features/matchers/define_matcher_outside_rspec.feature",
      "features/mock_framework_integration/use_flexmock.feature",
      "features/mock_framework_integration/use_mocha.feature",
      "features/mock_framework_integration/use_rr.feature",
      "features/mock_framework_integration/use_rspec.feature",
+     "features/mocks/block_local_expectations.feature",
+     "features/mocks/mix_stubs_and_mocks.feature",
      "features/step_definitions/running_rspec_steps.rb",
      "features/subject/explicit_subject.feature",
      "features/subject/implicit_subject.feature",
@@ -111,6 +111,7 @@ Gem::Specification.new do |s|
      "features/support/matchers/smart_match.rb",
      "lib/rspec/autorun.rb",
      "lib/rspec/core.rb",
+     "lib/rspec/core/advice.rb",
      "lib/rspec/core/backward_compatibility.rb",
      "lib/rspec/core/command_line_options.rb",
      "lib/rspec/core/configuration.rb",
@@ -118,23 +119,27 @@ 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",
      "lib/rspec/core/formatters/documentation_formatter.rb",
      "lib/rspec/core/formatters/progress_formatter.rb",
      "lib/rspec/core/kernel_extensions.rb",
+     "lib/rspec/core/load_path.rb",
+     "lib/rspec/core/metadata.rb",
      "lib/rspec/core/mocking/with_absolutely_nothing.rb",
      "lib/rspec/core/mocking/with_flexmock.rb",
      "lib/rspec/core/mocking/with_mocha.rb",
      "lib/rspec/core/mocking/with_rr.rb",
      "lib/rspec/core/mocking/with_rspec.rb",
      "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/world.rb",
      "lib/rspec/core/version.rb",
+     "lib/rspec/core/world.rb",
      "rspec-core.gemspec",
      "script/console",
      "spec/resources/example_classes.rb",
@@ -147,6 +152,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
+     "spec/rspec/core/metadata_spec.rb",
      "spec/rspec/core/mocha_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
@@ -159,13 +165,15 @@ Gem::Specification.new do |s|
      "spec/rspec/core/world_spec.rb",
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "specs.watchr"
   ]
   s.homepage = %q{http://github.com/rspec/core}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{RSpec Core}
+  s.summary = %q{Rspec runner and example group classes}
   s.test_files = [
     "spec/resources/example_classes.rb",
      "spec/rspec/core/command_line_options_spec.rb",
@@ -177,6 +185,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
+     "spec/rspec/core/metadata_spec.rb",
      "spec/rspec/core/mocha_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
@@ -197,8 +206,18 @@ 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<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<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<cucumber>, [">= 0.5.3"])
   end
 end
+

data/spec/rspec/core/command_line_options_spec.rb

@@ -1,9 +1,9 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::CommandLineOptions do
   
   def options_from_args(*args)
-    Rspec::Core::CommandLineOptions.new(args).parse
+    Rspec::Core::CommandLineOptions.new(args).parse.options
   end
 
   describe 'color_enabled' do
@@ -43,18 +43,18 @@ describe Rspec::Core::CommandLineOptions do
 
   end
 
-  describe 'files_to_run' do
-  
-    example '-c file.rb dir/file.rb should parse' do
-      options_from_args('-c', 'file.rb', 'dir/file.rb').should include(:files_to_run => ['file.rb', 'dir/file.rb'])
+  describe "files_or_directories_to_run" do
+
+    it "parses files from '-c file.rb dir/file.rb'" do
+      options_from_args("-c", "file.rb", "dir/file.rb").should include(:files_or_directories_to_run => ["file.rb", "dir/file.rb"])
     end
 
-    example 'dir should parse' do
-      options_from_args('dir').should include(:files_to_run => ['dir'])
+    it "parses dir from 'dir'" do
+      options_from_args("dir").should include(:files_or_directories_to_run => ["dir"])
     end
 
-    example 'spec/file1_spec.rb, spec/file2_spec.rb should parse' do
-      options_from_args('spec/file1_spec.rb', 'spec/file2_spec.rb').should include(:files_to_run => ['spec/file1_spec.rb', 'spec/file2_spec.rb'])
+    it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
+      options_from_args("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
     end
 
   end