rspec-core 2.0.0.a3 → 2.0.0.a4

data/Rakefile

@@ -19,7 +19,7 @@ begin
     gem.description = 'Rspec runner and example group classes'
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/core"
-    gem.authors = ["David Chelimsky", "Chad Humphries"]
+    gem.authors = ["Chad Humphries", "David Chelimsky"]
     gem.rubyforge_project = "rspec"
     gem.add_development_dependency "rspec-expectations", ">= #{Rspec::Core::Version::STRING}"
     gem.add_development_dependency "rspec-mocks", ">= #{Rspec::Core::Version::STRING}"

data/example_specs/failing/spec_helper.rb

@@ -1,8 +1 @@
-lib_path = File.expand_path('../../../lib', __FILE__)
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-require 'rspec/autorun'
-require 'rspec/expectations'
-
-Rspec::Core.configure do |c|
-  c.include Rspec::Matchers
-end
+require File.expand_path('../../spec_helper.rb', __FILE__)

data/example_specs/passing/spec_helper.rb

@@ -1,14 +1 @@
-lib_path = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-require 'rspec/autorun'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../../expectations/lib'))
-require 'rspec/expectations'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../../mocks/lib'))
-require 'rspec/mocks'
-
-Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
-
-Rspec::Core.configure do |c|
-  c.mock_framework = :rspec
-  c.color_enabled = true
-end
+require File.expand_path('../../spec_helper.rb', __FILE__)

data/example_specs/spec_helper.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
+require 'rspec/expectations'
+require 'rspec/autorun'
+
+Rspec::Core.configure do |c|
+  c.mock_with :rspec
+  c.include Rspec::Matchers
+end
+

data/lib/rspec/core/command_line_options.rb

@@ -42,8 +42,13 @@ module Rspec
             options[:profile_examples] = o
           end
 
+          opts.on('-b', '--backtrace', 'Enable full backtrace') do |o|
+            options[:full_backtrace] = true
+          end
+
           opts.on_tail('-h', '--help', "You're looking at it.") do 
             puts opts
+            exit
           end
         end.parse!(@args)
 

data/lib/rspec/core/configuration.rb

@@ -1,9 +1,6 @@
 module Rspec
   module Core
     class Configuration
-      # Regex patterns to scrub backtrace with
-      attr_reader :backtrace_clean_patterns
-
       # All of the defined advice in the configuration (before/after/around)
       attr_reader :advice
 
@@ -30,7 +27,6 @@ module Rspec
         @include_or_extend_modules = []
         @filter, @exclusion_filter = nil, nil
         @options = default_options
-        @backtrace_clean_patterns = []
       end
       
       def default_options
@@ -53,7 +49,11 @@ module Rspec
       def cleaned_from_backtrace?(line)
         options[:backtrace_clean_patterns].any? { |regex| line =~ regex }
       end
-      
+
+      def backtrace_clean_patterns
+        options[:backtrace_clean_patterns]
+      end
+
       def mock_framework=(use_me_to_mock)
         options[:mock_framework] = use_me_to_mock
         
@@ -95,6 +95,10 @@ module Rspec
         options[:color_enabled] = on_or_off
       end
 
+      def full_backtrace=(bool)
+        @options[:backtrace_clean_patterns].clear
+      end
+
       def color_enabled?
         options[:color_enabled]
       end
@@ -215,6 +219,5 @@ module Rspec
       end
 
     end
-
   end
 end

data/lib/rspec/core/example.rb

@@ -2,12 +2,17 @@ module Rspec
   module Core
     class Example
 
-      attr_reader :example_group, :metadata, :example_block
+      attr_reader :metadata, :example_block
+
+      def example_group
+        @example_group_class
+      end
+
       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)
+      def initialize(example_group_class, desc, options, example_block=nil)
+        @example_group_class, @options, @example_block = example_group_class, options, example_block
+        @metadata = @example_group_class.metadata.for_example(desc, options)
       end
 
       def description
@@ -51,11 +56,11 @@ module Rspec
 
       def run_before_each
         @example_group_instance._setup_mocks if @example_group_instance.respond_to?(:_setup_mocks)
-        @example_group.eval_before_eachs(@example_group_instance)
+        @example_group_class.eval_before_eachs(@example_group_instance)
       end
 
       def run_after_each
-        @example_group.eval_after_eachs(@example_group_instance)
+        @example_group_class.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)
@@ -93,10 +98,10 @@ module Rspec
 
         begin
           run_before_each
-          if @example_group.around_eachs.empty?
+          if @example_group_class.around_eachs.empty?
             @example_group_instance.instance_eval(&example_block) if runnable?
           else
-            @example_group.around_eachs.first.call(AroundProxy.new(self, &example_block))
+            @example_group_class.around_eachs.first.call(AroundProxy.new(self, &example_block))
           end
         rescue Exception => e
           exception_encountered = e

data/lib/rspec/core/example_group.rb

@@ -136,36 +136,36 @@ module Rspec
         @before_all_ivars ||= {}
       end
 
-      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) }
+      def self.eval_before_alls(running_example)
+        superclass.before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
+        Rspec::Core.configuration.find_advice(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
 
-        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) }
+        before_alls.each { |blk| running_example.instance_eval(&blk) }
+        running_example.instance_variables.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
-      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) } }
+      def self.eval_before_eachs(running_example)
+        Rspec::Core.configuration.find_advice(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
+        before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_example.instance_eval(&blk) } }
       end
 
-      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) }
+      def self.eval_after_alls(running_example)
+        after_alls.each { |blk| running_example.instance_eval(&blk) }
+        Rspec::Core.configuration.find_advice(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
+        before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
-      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) }
+      def self.eval_after_eachs(running_example)
+        after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_example.instance_eval(&blk) } }
+        Rspec::Core.configuration.find_advice(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
       end
 
       def self.run(reporter)
-        example_world = new
+        example_group_instance = new
         reporter.add_example_group(self)
-        eval_before_alls(example_world)
-        success = run_examples(example_world, reporter)
-        eval_after_alls(example_world)
+        eval_before_alls(example_group_instance)
+        success = run_examples(example_group_instance, reporter)
+        eval_after_alls(example_group_instance)
 
         success
       end

data/lib/rspec/core/version.rb

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

data/rspec-core.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.a3"
+  s.version = "2.0.0.a4"
 
   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-02-03}
+  s.authors = ["Chad Humphries", "David Chelimsky"]
+  s.date = %q{2010-02-04}
   s.default_executable = %q{rspec}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -74,6 +74,7 @@ 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",
+     "example_specs/spec_helper.rb",
      "features-pending/example_groups/example_group_with_should_methods.feature",
      "features-pending/example_groups/implicit_docstrings.feature",
      "features-pending/expectations/expect_change.feature",
@@ -174,7 +175,7 @@ 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-core 2.0.0.a3}
+  s.summary = %q{rspec-core 2.0.0.a4}
   s.test_files = [
     "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
@@ -207,17 +208,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.a3"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a4"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a4"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a3"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a4"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a4"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a3"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a4"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a4"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
   end
 end

data/spec/rspec/core/command_line_options_spec.rb

@@ -73,5 +73,12 @@ describe Rspec::Core::CommandLineOptions do
 
   end
 
+  describe "--backtrace (-b)" do
+    it "sets full_backtrace on config" do
+      options_from_args("--backtrace").should include(:full_backtrace => true)
+      options_from_args("-b").should include(:full_backtrace => true)
+    end
+  end
+
 end
 

data/spec/rspec/core/configuration_spec.rb

@@ -211,4 +211,12 @@ describe Rspec::Core::Configuration do
     end
   end
 
+  describe "full_backtrace=" do
+    it "clears the backtrace clean patterns" do
+      config = Rspec::Core::Configuration.new
+      config.full_backtrace = true
+      config.options[:backtrace_clean_patterns].should == []
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'rspec/core'
 
 require 'rubygems'
-$LOAD_PATH << File.expand_path('../../../expectations/lib', __FILE__)
-$LOAD_PATH << File.expand_path('../../../mocks/lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
 require 'rspec/expectations'
 require 'rspec/mocks'
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a3
+  version: 2.0.0.a4
 platform: ruby
 authors: 
-- David Chelimsky
 - Chad Humphries
+- David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -06:00
+date: 2010-02-04 00:00:00 -06:00
 default_executable: rspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a3
+        version: 2.0.0.a4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a3
+        version: 2.0.0.a4
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -108,6 +108,7 @@ files:
 - example_specs/passing/stubbing_example.rb
 - example_specs/passing/yielding_example.rb
 - example_specs/ruby1.9.compatibility/access_to_constants_spec.rb
+- example_specs/spec_helper.rb
 - features-pending/example_groups/example_group_with_should_methods.feature
 - features-pending/example_groups/implicit_docstrings.feature
 - features-pending/expectations/expect_change.feature
@@ -229,7 +230,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec-core 2.0.0.a3
+summary: rspec-core 2.0.0.a4
 test_files: 
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb