rspec-core 2.0.0.rc → 2.0.0

data/Gemfile

@@ -14,7 +14,9 @@ gem "syntax"
 gem "rspec-core", :path => "."
 gem "rspec-expectations", :path => "../rspec-expectations"
 gem "rspec-mocks", :path => "../rspec-mocks"
+gem "relish"
 unless RUBY_PLATFORM == "java"
+  gem "ruby-prof"
   case RUBY_VERSION
   when /^1.9.2/
     gem "ruby-debug19"

data/History.markdown

@@ -1,5 +1,16 @@
 ## rspec-core release history (incomplete)
 
+### 2.0.0 / 2010-10-10
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.0.0.rc...v2.0.0)
+
+* RSpec-1 compatibility
+  * Rake task uses ENV["SPEC"] as file list if present
+
+* Bug fixes
+  * Bug Fix: optparse --out foo.txt (Leonardo Bessa)
+  * Suppress color codes for non-tty output (except autotest)
+
 ### 2.0.0.rc / 2010-10-05
 
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.0.0.beta.22...v2.0.0.rc)

data/README.markdown

@@ -8,7 +8,7 @@ See [Upgrade.markdown](http://github.com/rspec/rspec-core/blob/master/Upgrade.ma
 
 ## Install
 
-    gem install rspec --prerelease
+    gem install rspec -v 2.0.0
 
 This will install the rspec, rspec-core, rspec-expectations and rspec-mocks
 gems.

data/Rakefile

@@ -10,48 +10,57 @@ require "rspec/core/rake_task"
 require "rspec/core/version"
 require "cucumber/rake/task"
 
-RSpec::Core::RakeTask.new(:spec)
-
-desc "Run all examples using rcov"
-RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-  t.rcov = true
-  t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
-  t.rcov_opts << %[--no-html --aggregate coverage.data]
+class Cucumber::Rake::Task::ForkedCucumberRunner
+  # When cucumber shells out, we still need it to run in the context of our
+  # bundle.
+  def run
+    sh "bundle exec #{RUBY} " + args.join(" ")
+  end
 end
 
 task :cleanup_rcov_files do
   rm_rf 'coverage.data'
 end
 
-task :clobber do
-  rm_rf 'pkg'
-  rm_rf 'tmp'
-  rm_rf 'coverage'
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_path = 'bin/rspec'
+  t.rspec_opts = %w[--color]
 end
 
-class Cucumber::Rake::Task::ForkedCucumberRunner
-  # When cucumber shells out, we still need it to run in the context of our
-  # bundle.
-  def run
-    sh "bundle exec #{RUBY} " + args.join(" ")
+Cucumber::Rake::Task.new(:cucumber)
+
+namespace :spec do
+  desc "Run all examples using rcov"
+  RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+    t.rcov = true
+    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+    t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
   end
 end
 
-if RUBY_VERSION.to_f >= 1.9
-  Cucumber::Rake::Task.new(:cucumber) do |t|
+namespace :cucumber do
+  desc "Run cucumber features using rcov"
+  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
     t.cucumber_opts = %w{--format progress}
-  end
-
-  task :default => [:spec, :cucumber]
-else
-  Cucumber::Rake::Task.new(:cucumber) do |t|
     t.rcov = true
-    t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,features,spec/ruby_forker,spec/rspec,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
+    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
     t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
-    t.cucumber_opts = %w{--format progress}
   end
+end
+
+task :default => [:spec, :cucumber]
+
+task :clobber do
+  rm_rf 'pkg'
+  rm_rf 'tmp'
+  rm_rf 'coverage'
+end
 
-  task :default => [:rcov, :cucumber]
+desc "Push cukes to relishapp using the relish-client-gem"
+task :relish, :version do |t, args|
+  raise "rake relish[VERSION]" unless args[:version]
+  sh "bundle exec relish --organization rspec --project rspec-core -v #{args[:version]} push"
 end
 
 Rake::RDocTask.new do |rdoc|

data/Upgrade.markdown

@@ -1,6 +1,6 @@
 # Upgrade to rspec-core-2.0
 
-## What's changed since rspec-1
+## What's changed since RSpec-1
 
 ### rspec command
 
@@ -8,6 +8,27 @@ The command to run specs is now `rspec` instead of `spec`.
 
     rspec ./spec
 
+#### Co-habitation of rspec-1 and rspec-2
+
+Early beta versions of RSpec-2 included a `spec` command, which conflicted with
+the RSpec-1 `spec` command because RSpec-1's was installed by the rspec gem,
+while RSpec-2's is installed by the rspec-core gem.
+
+If you installed one of these early versions, the safest bet is to uninstall
+rspec-1 and rspec-core-2, and then reinstall both. After you do this, you will
+be able to run rspec-2 like this:
+
+    `rspec ./spec`
+
+... and rspec-1 like this:
+
+    `spec _1.3.1_ ./spec`
+
+Rubygems inspects the first argument to any gem executable to see if it's
+formatted like a version number surrounded by underscores. If so, it uses that
+version (e.g.  `1.3.1`). If not, it uses the most recent version (e.g.
+`2.0.0`).
+
 ### rake task
 
 The RSpec rake task has moved to:
@@ -43,7 +64,7 @@ Or, if you're using bundler:
 
 The `autospec` command is a thing of the past. 
 
-### RSpec
+### RSpec is the new Spec
 
 The root namespace (top level module) is now `RSpec` instead of `Spec`, and
 the root directory under `lib` within all of the `rspec` gems is `rspec` instead of `spec`.
@@ -66,6 +87,37 @@ options. Precedence is:
     ./.rspec
     ~/.rspec
 
+### Bones
+
+Bones produces a handy little Rakefile to provide several services including
+running specs. The current version (3.4.7) still assumes RSpec-1. To bring its
+Rakefile into conformance with RSpec-2 a few changes are necessary.
+
+1.  The require line has changed to `require 'spec/rake/spectask'`
+
+2.  The `spec_opts` accessor has been deprecated in favor of `rspec_opts`. Also,
+    the `rspec` command no longer supports the `--options` command line option
+    so the options must be embedded directly in the Rakefile, or stored in the
+    `.rspec` files mentioned above.
+
+3.  The `spec_files` accessor has been replaced by `pattern`.
+
+Here is a complete example:
+
+    # rspec-1
+    Spec::Rake::SpecTask.new do |t|
+      t.spec_opts = ['--options', "\"spec/spec.opts\""]
+      t.spec_files = FileList['spec/**/*.rb']
+    end
+
+becomes:
+
+    # rspec-2
+    RSpec::Core::RakeTask.new do |t|
+      t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+      t.pattern = 'spec/**/*_spec.rb'
+    end
+
 ### `context` is no longer a top-level method
 
 We removed `context` from the main object because it was creating conflicts with

data/features/README.markdown

@@ -1,12 +1,19 @@
-# Cucumber features
+rspec-core provides the structure for RSpec code examples:
 
-RSpec is specified using both RSpec and
-[Cucumber](http://github.com/aslakhellesoy/cucumber). Cucumber provides
-_executable documentation_.  This means that the _.feature_ files below this
-directory serve as specification, documentation _and_ regression tests of the
-behaviour.
+    describe Account do
+      it "has a balance of zero when first opened" do
+        # example code goes here - for more on the 
+        # code inside the examples, see rspec-expectations 
+        # and rspec-mocks
+      end
+    end
 
 ## Issues
 
-If you find this documentation incomplete or confusing, please [submit an
-issue](http://github.com/rspec/rspec-core/issues).
+The documentation for rspec-core is a work in progress. We'll be adding
+Cucumber features over time, and clarifying existing ones.  If you have
+specific features you'd like to see added, find the existing documentation
+incomplete or confusing, or, better yet, wish to write a missing Cucumber
+feature yourself, please [submit an
+issue](http://github.com/rspec/rspec-core/issues) or a [pull
+request](http://github.com/rspec/rspec-core).

data/features/command_line/configure.feature

@@ -1,6 +1,7 @@
 Feature: configure
 
-  Use --configure to generate configuration files.
+  Use the --configure option on the command line to generate configuration
+  files.
 
   The only supported argument, so far, is "autotest", which creates an
   autotest/discover.rb file in your project root directory.

data/features/configuration/read_options_from_file.feature

@@ -18,6 +18,12 @@ Feature: read command line configuration options from files
       """
       describe "color_enabled" do
         context "when set with RSpec.configure" do
+          before do
+            # color is disabled for non-tty output, so stub the output stream
+            # to say it is tty, even though we're running this with cucumber
+            RSpec.configuration.output_stream.stub(:tty?) { true }
+          end
+
           it "is true" do
             RSpec.configuration.should be_color_enabled
           end

data/features/hooks/before_and_after_hooks.feature

@@ -155,6 +155,29 @@ Feature: before and after hooks
       after all ran
       """
 
+  Scenario: failure in after(:all) block
+    Given a file named "after_all_spec.rb" with:
+      """
+      describe "an error in after(:all)" do
+        after(:all) do
+          raise StandardError.new("Boom!")
+        end
+
+        it "passes this example" do
+        end
+
+        it "passes this example, too" do
+        end
+      end
+      """
+    When I run "rspec after_all_spec.rb"
+    Then the output should contain "2 examples, 0 failures"
+    And the output should contain:
+      """
+      An error occurred in an after(:all) hook.
+        StandardError: Boom!
+      """
+
   Scenario: define before and after blocks in configuration
     Given a file named "befores_in_configuration_spec.rb" with:
       """

data/lib/autotest/rspec2.rb

@@ -10,7 +10,10 @@ class Autotest::Rspec2 < Autotest
     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+Failure.*(\n\s+#\s(.*)?:\d+(?::.*)?)+$/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
 
@@ -38,11 +41,15 @@ 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(' ')}"
+      "#{bundle_exec}#{ruby} #{require_rubygems}-S #{SPEC_PROGRAM} --autotest #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
+  end
+
+  def bundle_exec
+    using_bundler? ? "bundle exec " : ""
   end
 
   def require_rubygems
-    using_bundler? ? "" : defined?(:Gem) ? "-rrubygems " : ""
+    using_bundler? ? "" : defined?(:Gem) ? "-rrubygems " : " "
   end
 
   def normalize(files_to_test)
@@ -52,10 +59,6 @@ class Autotest::Rspec2 < Autotest
     end
   end
 
-  def ruby
-    using_bundler? ? "bundle exec" : super
-  end
-
   def using_bundler?
     File.exists?('./Gemfile')
   end

data/lib/rspec/core/command_line.rb

@@ -12,44 +12,22 @@ 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
 
-        @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?
           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/configuration.rb

@@ -23,7 +23,6 @@ module RSpec
       add_setting :out, :alias => :output_stream
       add_setting :drb
       add_setting :drb_port
-      add_setting :color_enabled
       add_setting :profile_examples
       add_setting :fail_fast, :default => false
       add_setting :run_all_when_everything_filtered
@@ -34,16 +33,17 @@ module RSpec
       add_setting :files_to_run
       add_setting :include_or_extend_modules
       add_setting :backtrace_clean_patterns
+      add_setting :autotest
 
       def initialize
+        @color_enabled = false
         self.include_or_extend_modules = []
         self.files_to_run = []
         self.backtrace_clean_patterns = [
           /\/lib\d*\/ruby\//,
-          /bin\/rcov:/,
-          /vendor\/rails/,
-          /bin\/rspec/,
-          /bin\/spec/,
+          /bin\//,
+          /gems/,
+          /spec\/spec_helper\.rb/,
           /lib\/rspec\/(core|expectations|matchers|mocks)/
         ]
       end
@@ -129,20 +129,27 @@ module RSpec
         settings[:backtrace_clean_patterns] = []
       end
 
-      remove_method :color_enabled=
+      def color_enabled
+        @color_enabled && (output_to_tty? || autotest?)
+      end
+
+      def color_enabled?
+        !!color_enabled
+      end
 
       def color_enabled=(bool)
         return unless bool
-        settings[:color_enabled] = true
+        @color_enabled = true
         if bool && ::RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-          orig_output_stream = settings[:output_stream]
+          using_stdout = settings[:output_stream] == $stdout
+          using_stderr = settings[:error_stream]  == $stderr
           begin
             require 'Win32/Console/ANSI'
+            settings[:output_stream] = $stdout if using_stdout
+            settings[:error_stream]  = $stderr if using_stderr
           rescue LoadError
             warn "You must 'gem install win32console' to use colour on Windows"
-            settings[:color_enabled] = false
-          ensure
-            settings[:output_stream] = orig_output_stream
+            @color_enabled = false
           end
         end
       end
@@ -301,6 +308,14 @@ EOM
 
     private
 
+      def output_to_tty?
+        begin
+          settings[:output_stream].tty?
+        rescue NoMethodError
+          false
+        end
+      end
+
       def built_in_formatter(key)
         case key.to_s
         when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'