rspec-core 2.0.0.beta.22 → 2.6.0

data/features/subject/implicit_subject.feature

@@ -1,20 +1,19 @@
 Feature: implicit subject
 
-  The first argument to the outermost example group block is
-  made available to each example as an implicit subject of
-  that example.
-
+  If the first argument to the outermost example group is a class, an instance
+  of that class is exposed to each example via the subject() method.
+  
   Scenario: subject in top level group
     Given a file named "top_level_subject_spec.rb" with:
       """
       describe Array, "when first created" do
         it "should be empty" do
-          subject.should == []
+          subject.should eq([])
         end
       end
       """
-    When I run "rspec ./top_level_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec ./top_level_subject_spec.rb`
+    Then the examples should all pass
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -22,10 +21,10 @@ Feature: implicit subject
       describe Array do
         describe "when first created" do
           it "should be empty" do
-            subject.should == []
+            subject.should eq([])
           end
         end
       end
       """
-    When I run "rspec ./nested_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    When I run `rspec nested_subject_spec.rb`
+    Then the examples should all pass

data/features/support/env.rb

@@ -1 +1,6 @@
-require 'aruba'
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 3
+end
+

data/lib/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" } if File.exist?("./.rspec")

data/lib/autotest/rspec2.rb

@@ -1,16 +1,20 @@
 require 'autotest'
+require 'rspec/core/deprecation'
 
 class RSpecCommandError < StandardError; end
 
 class Autotest::Rspec2 < Autotest
 
-  SPEC_PROGRAM = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
+  SPEC_PROGRAM = File.expand_path('../../../bin/rspec', __FILE__)
 
   def initialize
-    super
+    super()
     clear_mappings
     setup_rspec_project_mappings
-    self.failed_results_re = /^\s*\d\)\s(.*?$\n.*?$).*?#\s(.*?):/m
+
+    # Example for Ruby 1.8: http://rubular.com/r/AOXNVDrZpx
+    # Example for Ruby 1.9: http://rubular.com/r/85ag5AZ2jP
+    self.failed_results_re = /^\s*\d+\).*\n\s+(?:\e\[\d*m)?Failure.*(\n(?:\e\[\d*m)?\s+#\s(.*)?:\d+(?::.*)?(?:\e\[\d*m)?)+$/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
 
@@ -38,11 +42,7 @@ class Autotest::Rspec2 < Autotest
 
   def make_test_cmd(files_to_test)
     files_to_test.empty? ? '' :
-      "#{ruby} #{require_rubygems}#{SPEC_PROGRAM} #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
-  end
-
-  def require_rubygems
-    using_bundler? ? "" : defined?(:Gem) ? "-rrubygems " : ""
+      "#{prefix}#{ruby}#{suffix} -S #{SPEC_PROGRAM} --tty #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
   end
 
   def normalize(files_to_test)
@@ -52,12 +52,16 @@ class Autotest::Rspec2 < Autotest
     end
   end
 
-  def ruby
-    using_bundler? ? "bundle exec" : super
+  def suffix
+    using_bundler? ? "" : defined?(:Gem) ? " -rrubygems" : ""
   end
 
   def using_bundler?
-    File.exists?('./Gemfile')
+    prefix =~ /bundle exec/
+  end
+
+  def gemfile?
+    File.exist?('./Gemfile')
   end
 
 end

data/lib/rspec/autorun.rb

@@ -0,0 +1,2 @@
+require 'rspec/core'
+RSpec::Core::Runner.autorun

data/lib/rspec/core/backward_compatibility.rb

@@ -9,21 +9,50 @@ module RSpec
 DEPRECATION WARNING: you are using a deprecated constant that will
 be removed from a future version of RSpec.
 
+#{caller(0)[2]}
+
 * #{name} is deprecated.
 * RSpec is the new top-level module in RSpec-2
-
-#{caller(0)[1]}
-*****************************************************************
+***************************************************************
 WARNING
           RSpec
         else
-          super(name)
+          begin
+            super
+          rescue Exception => e
+            e.backtrace.reject! {|l| l =~ Regexp.compile(__FILE__) }
+            raise e
+          end
         end
       end
     end
+  end
 
+  module Runner
+    def self.configure(&block)
+      RSpec.deprecate("Spec::Runner.configure", "RSpec.configure")
+      RSpec.configure(&block)
+    end
   end
 
+  module Rake
+    def self.const_missing(name)
+      case name
+      when :SpecTask
+        RSpec.deprecate("Spec::Rake::SpecTask", "RSpec::Core::RakeTask")
+        require 'rspec/core/rake_task'
+        RSpec::Core::RakeTask
+      else
+        begin
+          super
+        rescue Exception => e
+          e.backtrace.reject! {|l| l =~ Regexp.compile(__FILE__) }
+          raise e
+        end
+      end
+    end
+
+  end
 end
 
 Object.extend(RSpec::Core::ConstMissing)

data/lib/rspec/core/command_line.rb

@@ -12,44 +12,20 @@ module RSpec
       end
 
       def run(err, out)
-        @options.configure(@configuration)
         @configuration.error_stream = err
         @configuration.output_stream ||= out
+        @options.configure(@configuration)
         @configuration.load_spec_files
-        @configuration.configure_mock_framework
-        @world.announce_inclusion_filter
-        @world.announce_exclusion_filter
+        @world.announce_filters
 
-        @configuration.reporter.report(example_count) do |reporter|
+        @configuration.reporter.report(@world.example_count) do |reporter|
           begin
             @configuration.run_hook(:before, :suite)
-            example_groups.run_examples(reporter)
+            @world.example_groups.map {|g| g.run(reporter)}.all? ? 0 : 1
           ensure
             @configuration.run_hook(:after, :suite)
           end
         end
-
-        example_groups.success?
-      end
-
-    private
-
-      def example_count
-        @world.example_count
-      end
-
-      module ExampleGroups
-        def run_examples(reporter)
-          @success = self.inject(true) {|success, group| success &= group.run(reporter)}
-        end
-
-        def success?
-          @success ||= false
-        end
-      end
-
-      def example_groups
-        @world.example_groups.extend(ExampleGroups)
       end
     end
   end

data/lib/rspec/core/command_line_configuration.rb

@@ -16,7 +16,7 @@ module RSpec
 "#{@command}" is not valid a valid argument to "rspec --configure".
 Supported options are:
 
-  rspec --configure autotest # generates configuration to run autotest with rspec
+  rspec --configure autotest # generates .rspec file
 
 #{"*"*50}
 MESSAGE
@@ -26,26 +26,26 @@ MESSAGE
       class Autotest
         class << self
           def generate
-            create_autotest_directory
-            create_discover_file
-            puts "autotest/discover.rb has been added"
+            create_dot_rspec_file
+            remove_autotest_dir_if_present
           end
 
-          def create_autotest_directory
-            Dir.mkdir('autotest') unless File.exist?('autotest')
-          end
-
-          def create_discover_file
-            optionally_remove_discover_file if discover_file_exists?
-            File.open(discover_file_path, 'w') do |file|
-              file << 'Autotest.add_discovery { "rspec2" }'
+          def create_dot_rspec_file
+            puts "Autotest loads RSpec's Autotest subclass when there is a .rspec file in the project's root directory."
+            if File.exist?('./.rspec')
+              puts ".rspec file already exists, so nothing was changed."
+            else
+              FileUtils.touch('./.rspec')
+              puts ".rspec file did not exist, so it was created."
             end
           end
 
-          def optionally_remove_discover_file
-            print "Discover file already exists, overwrite [y/N]? "
-            exit if gets !~ /y/i
-            FileUtils.rm_rf(discover_file_path)
+          def remove_autotest_dir_if_present
+            if discover_file_exists?
+              print "Delete obsolete autotest/discover.rb [y/n]? "
+              exit if gets !~ /y/i
+              FileUtils.rm_rf(discover_file_path)
+            end
           end
 
           def discover_file_exists?