rspec-core 2.6.0.rc6 → 2.6.0

data/features/.nav

@@ -5,6 +5,15 @@
   - basic_structure.feature
   - shared_example_group.feature
   - shared_context.feature
+- command_line:
+  - configure.feature
+  - example_name_option.feature
+  - format_option.feature
+  - line_number_option.feature
+  - tag.feature
+  - line_number_appended_to_path.feature
+  - exit_status.feature
+  - rake_task.feature
 - pending:
   - pending_examples.feature
 - hooks:
@@ -29,15 +38,6 @@
   - exclusion_filters.feature
   - if_and_unless.feature
   - run_all_when_everything_filtered.feature
-- command_line:
-  - configure.feature
-  - example_name_option.feature
-  - format_option.feature
-  - line_number_option.feature
-  - tag.feature
-  - line_number_appended_to_path.feature
-  - exit_status.feature
-  - rake_task.feature
 - configuration:
   - read_options_from_file.feature
   - fail_fast.feature

data/features/Changelog.md

@@ -1,21 +1,6 @@
-### 2.6.0.rc6 / 2011-05-06
+### 2.6.0 / 2011-05-12
 
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0.rc4...v2.6.0.rc6)
-
-* Enhancements
-  * Restore --pattern/-P command line option from rspec-1
-  * Support false as well as true in config.full_backtrace= (Andreas Tolf Tolfsen)
-
-### 2.6.0.rc4 / 2011-05-01
-
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0.rc2...v2.6.0.rc4)
-
-* Enhancements
-  * Clean up messages for filters/tags.
-
-### 2.6.0.rc2 / 2011-04-18
-
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.0.rc2)
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.0)
 
 * Enhancements
   * `shared_context` (Damian Nurzynski)
@@ -31,8 +16,11 @@
     defined. (Myron Marston)
   * Pass the exit status of a DRb run to the invoking process. This causes
     specs run via DRb to not just return true or false. (Ilkka Laukkanen)
-  * Refactoring of ConfigurationOptions#parse_options (Rodrigo Rosenfeld Rosas)
+  * Refactoring of `ConfigurationOptions#parse_options` (Rodrigo Rosenfeld Rosas)
   * Report excluded filters in runner output (tip from andyl)
+  * Clean up messages for filters/tags.
+  * Restore --pattern/-P command line option from rspec-1
+  * Support false as well as true in config.full_backtrace= (Andreas Tolf Tolfsen)
 
 * Bug fixes
   * Don't stumble over an exception without a message (Hans Hasselberg)
@@ -43,12 +31,15 @@
   * Include RSpec::Matchers when first example group is defined, rather
     than just before running the examples.  This works around an obscure
     bug in ruby 1.9 that can cause infinite recursion. (Myron Marston)
-  * Don't send example_group_[started|finished] to formatters for empty groups.
+  * Don't send `example_group_[started|finished]` to formatters for empty groups.
   * Get specs passing on jruby (Sidu Ponnappa)
   * Fix bug where mixing nested groups and outer-level examples gave
     unpredictable :line_number behavior (Artur Małecki)
   * Regexp.escape the argument to --example (tip from Elliot Winkler)
   * Correctly pass/fail pending block with message expectations
+  * CommandLine returns exit status (0/1) instead of true/false
+  * Create path to formatter output file if it doesn't exist (marekj).
+
 
 ### 2.5.1 / 2011-02-06
 

data/features/command_line/README.md

@@ -4,3 +4,25 @@ behavior, including output formats, filtering examples, etc.
 For a full list of options, run the `rspec` command with the `--help` flag:
 
     $ rspec --help
+
+### Run with `ruby`
+
+Generally, life is simpler if you just use the `rspec` command. If you must use the `ruby`
+command, however, you'll want to do the following:
+
+* `require 'rspec/autorun'`
+
+This tells RSpec to run your examples.  Do this in any file that you are
+passing to the `ruby` command.
+
+* Update the `LOAD_PATH`
+
+It is conventional to put configuration in and require assorted support files
+from `spec/spec_helper.rb`. It is also conventional to require that file from
+the spec files using `require 'spec_helper'`. This works because RSpec
+implicitly adds the `spec` directory to the `LOAD_PATH`. It also adds `lib`, so
+your implementation files will be on the `LOAD_PATH` as well.
+
+If you're using the `ruby` command, you'll need to do this yourself:
+
+    ruby -Ilib -Ispec path/to/spec.rb

data/features/formatters/text_formatter.feature

@@ -7,8 +7,6 @@ Feature: text formatter
   Scenario: Backtrace formatting for failing specs in multiple files
     Given a file named "string_spec.rb" with:
       """
-      require 'rspec/core'
-
       describe String do
         it "has a failing example" do
           "foo".reverse.should == "ofo"
@@ -17,7 +15,7 @@ Feature: text formatter
       """
     And a file named "integer_spec.rb" with:
       """
-      require 'rspec/core'
+      require 'rspec/autorun'
 
       describe Integer do
         it "has a failing example" do
@@ -40,6 +38,6 @@ Feature: text formatter
            Failure/Error: "foo".reverse.should == "ofo"
              expected: "ofo"
                   got: "oof" (using ==)
-           # ./string_spec.rb:5
+           # ./string_spec.rb:3
       """
 

data/features/hooks/around_hooks.feature

@@ -9,6 +9,13 @@ Feature: around hooks
   example, if your database library offers a transaction method that receives
   a block, you can use an around hook as described in the first scenario:
 
+  WARNING: around hooks do not share state with the example the way before and
+  after hooks do. This means that you can not share instance variables between
+  around hooks and examples.
+
+  Also, mock frameworks are set up and torn down within the context of running
+  the example, so you can not interact with them directly in around hooks.
+
   Scenario: use the example as a proc within the block passed to around()
     Given a file named "example_spec.rb" with:
       """

data/features/metadata/user_defined.feature

@@ -5,7 +5,7 @@ Feature: User-defined metadata
   `context` or `it`.  RSpec supports many configuration options that apply
   only to certain examples or groups based on the metadata.
 
-  Metadata defined on an example group is available (and can be overriden)
+  Metadata defined on an example group is available (and can be overridden)
   by any sub-group or from any example in that group or a sub-group.
 
   In addition, there is a configuration option (which will be the default
@@ -68,12 +68,12 @@ Feature: User-defined metadata
     Given a file named "override_metadata_spec.rb" with:
       """
       describe "a group with user-defined metadata", :foo => 'bar' do
-        it 'can be overriden by an example', :foo => 'bazz' do
+        it 'can be overridden by an example', :foo => 'bazz' do
           example.metadata[:foo].should == 'bazz'
         end
 
         describe "a sub-group with an override", :foo => 'goo' do
-          it 'can be overriden by a sub-group' do
+          it 'can be overridden by a sub-group' do
             example.metadata[:foo].should == 'goo'
           end
         end

data/lib/rspec/core.rb

@@ -49,6 +49,13 @@ module RSpec
     @world ||= RSpec::Core::World.new
   end
 
+  # Used internally to ensure examples get reloaded between multiple runs in
+  # the same process.
+  def self.reset
+    world.reset
+    configuration.reset
+  end
+
   def self.configuration
     @configuration ||= RSpec::Core::Configuration.new
   end

data/lib/rspec/core/command_line.rb

@@ -21,7 +21,7 @@ module RSpec
         @configuration.reporter.report(@world.example_count) do |reporter|
           begin
             @configuration.run_hook(:before, :suite)
-            @world.example_groups.map {|g| g.run(reporter)}.all?
+            @world.example_groups.map {|g| g.run(reporter)}.all? ? 0 : 1
           ensure
             @configuration.run_hook(:after, :suite)
           end

data/lib/rspec/core/configuration.rb

@@ -1,4 +1,5 @@
 require "rbconfig"
+require 'fileutils'
 
 module RSpec
   module Core
@@ -59,6 +60,10 @@ module RSpec
         self.exclusion_filter = CONDITIONAL_FILTERS.dup
       end
 
+      def reset
+        @reporter = nil
+      end
+
       # :call-seq:
       #   add_setting(:name)
       #   add_setting(:name, :default => "default_value")
@@ -269,13 +274,13 @@ EOM
         filter_run({ :full_description => /#{description}/ }, true)
       end
 
-      def add_formatter(formatter_to_use, output=nil)
+      def add_formatter(formatter_to_use, path=nil)
         formatter_class =
           built_in_formatter(formatter_to_use) ||
           custom_formatter(formatter_to_use) ||
           (raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?.")
 
-        formatters << formatter_class.new(output ? File.new(output, 'w') : self.output)
+        formatters << formatter_class.new(path ? file_at(path) : output)
       end
 
       alias_method :formatter=, :add_formatter
@@ -486,6 +491,12 @@ MESSAGE
         word.downcase!
         word
       end
+
+      def file_at(path)
+        FileUtils.mkdir_p(File.dirname(path))
+        File.new(path, 'w')
+      end
+
     end
   end
 end

data/lib/rspec/core/example_group.rb

@@ -1,14 +1,15 @@
 module RSpec
   module Core
     class ExampleGroup
+      extend  MetadataHashBuilder::WithDeprecationWarning
       extend  Extensions::ModuleEvalWithArgs
-      include Extensions::InstanceEvalWithArgs
-      extend  Hooks
       extend  Subject::ClassMethods
+      extend  Hooks
+
+      include Extensions::InstanceEvalWithArgs
       include Subject::InstanceMethods
-      include Let
       include Pending
-      extend MetadataHashBuilder::WithDeprecationWarning
+      include Let
 
       attr_accessor :example
 
@@ -22,7 +23,6 @@ module RSpec
       end
 
       def self.register
-        RSpec::Core::Runner.autorun
         world.register(self)
       end
 

data/lib/rspec/core/runner.rb

@@ -4,31 +4,32 @@ module RSpec
   module Core
     class Runner
 
+      # Register an at_exit hook that runs the suite.
       def self.autorun
         return if autorun_disabled? || installed_at_exit? || running_in_drb?
         @installed_at_exit = true
-        at_exit { run(ARGV, $stderr, $stdout) ? exit(0) : exit(1) }
+        at_exit { exit(run(ARGV, $stderr, $stdout)) }
       end
       AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
 
-      def self.autorun_disabled?
-        @autorun_disabled ||= false
-      end
-
       def self.disable_autorun!
         @autorun_disabled = true
       end
 
-      def self.installed_at_exit?
+      def self.autorun_disabled? # :nodoc:
+        @autorun_disabled ||= false
+      end
+
+      def self.installed_at_exit? # :nodoc:
         @installed_at_exit ||= false
       end
 
-      def self.running_in_drb?
-        (DRb.current_server rescue false) && 
+      def self.running_in_drb? # :nodoc:
+        (DRb.current_server rescue false) &&
          DRb.current_server.uri =~ /druby\:\/\/127.0.0.1\:/
       end
 
-      def self.trap_interrupt
+      def self.trap_interrupt # :nodoc:
         trap('INT') do
           exit!(1) if RSpec.wants_to_quit
           RSpec.wants_to_quit = true
@@ -36,7 +37,23 @@ module RSpec
         end
       end
 
-      def self.run(args, err, out)
+      # Run a suite of RSpec examples.
+      #
+      # This is used internally by RSpec to run a suite, but is available
+      # for use by any other automation tool.
+      #
+      # If you want to run this multiple times in the same process, and you
+      # want files like spec_helper.rb to be reloaded, be sure to load `load`
+      # instead of `require`.
+      #
+      # ==== Parameters
+      # * +args+ - an array of command-line-supported arguments
+      # * +err+ - error stream (Default: $stderr)
+      # * +out+ - output stream (Default: $stdout)
+      #
+      # ==== Returns
+      # * +Fixnum+ - exit status code (0/1)
+      def self.run(args, err=$stderr, out=$stdout)
         trap_interrupt
         options = ConfigurationOptions.new(args)
         options.parse_options
@@ -51,13 +68,15 @@ module RSpec
         else
           run_in_process(options, err, out)
         end
+      ensure
+        RSpec.reset
       end
 
-      def self.run_over_drb(options, err, out)
+      def self.run_over_drb(options, err, out) # :nodoc:
         DRbCommandLine.new(options).run(err, out)
       end
 
-      def self.run_in_process(options, err, out)
+      def self.run_in_process(options, err, out) # :nodoc:
         CommandLine.new(options, RSpec::configuration, RSpec::world).run(err, out)
       end
 

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0.rc6'
+      STRING = '2.6.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -41,6 +41,10 @@ module RSpec
         }
       end
 
+      def reset
+        example_groups.clear
+      end
+
       def register(example_group)
         example_groups << example_group
         example_group
@@ -112,7 +116,7 @@ module RSpec
             reporter.message(
               "No examples were matched. Perhaps #{exclusion_filter.description} is excluding everything?")
           end
-        else
+        elsif !filter_announcements.empty?
           reporter.message("Run filtered #{filter_announcements.join(', ')}")
         end
       end

data/lib/rspec/monkey/spork/test_framework/rspec.rb

@@ -1,3 +1,4 @@
+# TODO (2011-05-08) - remove this as soon as spork 0.9.0 is released
 if defined?(Spork::TestFramework::RSpec)
   class Spork::TestFramework::RSpec < Spork::TestFramework
     def run_tests(argv, err, out)

data/spec/rspec/core/command_line_spec.rb

@@ -4,6 +4,42 @@ require 'tmpdir'
 
 module RSpec::Core
   describe CommandLine do
+
+    describe "#run" do
+      include_context "spec files"
+
+      let(:out)    { StringIO.new }
+      let(:err)    { StringIO.new }
+
+      def config_options(argv=[])
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        options
+      end
+
+      def command_line(args)
+        RSpec::Core::CommandLine.new(config_options(args))
+      end
+
+      def config_options(argv=[])
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        options
+      end
+
+      it "returns 0 if spec passes" do
+        err, out = StringIO.new, StringIO.new
+        result = command_line([passing_spec_filename]).run(err, out)
+        result.should be(0)
+      end
+
+      it "returns 1 if spec passes" do
+        err, out = StringIO.new, StringIO.new
+        result = command_line([failing_spec_filename]).run(err, out)
+        result.should be(1)
+      end
+    end
+
     context "given an Array of options" do
       it "assigns ConfigurationOptions built from Array to @options" do
         config_options = ConfigurationOptions.new(%w[--color])

data/spec/rspec/core/drb_command_line_spec.rb

@@ -5,18 +5,20 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
   let(:out)    { StringIO.new }
   let(:err)    { StringIO.new }
 
+  include_context "spec files"
+
+  def command_line(args)
+    RSpec::Core::DRbCommandLine.new(config_options(args))
+  end
+
   def config_options(argv=[])
     options = RSpec::Core::ConfigurationOptions.new(argv)
     options.parse_options
     options
   end
 
-  def drb_command_line(args)
-    RSpec::Core::DRbCommandLine.new(config_options(args))
-  end
-
   def run_with(args)
-    drb_command_line(args).run(err, out)
+    command_line(args).run(err, out)
   end
 
   context "without server running" do
@@ -39,14 +41,14 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
     context "without RSPEC_DRB environment variable set" do
       it "defaults to 8989" do
         with_RSPEC_DRB_set_to(nil) do
-          drb_command_line([]).drb_port.should == 8989
+          command_line([]).drb_port.should == 8989
         end
       end
 
       it "sets the DRb port" do
         with_RSPEC_DRB_set_to(nil) do
-          drb_command_line(["--drb-port", "1234"]).drb_port.should == 1234
-          drb_command_line(["--drb-port", "5678"]).drb_port.should == 5678
+          command_line(["--drb-port", "1234"]).drb_port.should == 1234
+          command_line(["--drb-port", "5678"]).drb_port.should == 5678
         end
       end
     end
@@ -56,7 +58,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "without config variable set" do
         it "uses RSPEC_DRB value" do
           with_RSPEC_DRB_set_to('9000') do
-            drb_command_line([]).drb_port.should == "9000"
+            command_line([]).drb_port.should == "9000"
           end
         end
       end
@@ -64,7 +66,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "and config variable set" do
         it "uses configured value" do
           with_RSPEC_DRB_set_to('9000') do
-            drb_command_line(%w[--drb-port 5678]).drb_port.should == 5678
+            command_line(%w[--drb-port 5678]).drb_port.should == 5678
           end
         end
       end
@@ -80,59 +82,30 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       end
     end
 
-    def dummy_spec_filename
-      @dummy_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@drb_example_file_counter}.rb"
-    end
-
     before(:all) do
       @drb_port = 8990
       @drb_example_file_counter = 0
       DRb::start_service("druby://127.0.0.1:#{@drb_port}", ::FakeDrbSpecServer)
     end
 
-    before(:each) do
-      @drb_example_file_counter += 1
-      create_dummy_spec_file
-    end
-
-    after(:each) do
-      File.delete(dummy_spec_filename)
-    end
-
     after(:all) do
       DRb::stop_service
     end
 
-    def create_dummy_spec_file
-      File.open(dummy_spec_filename, 'w') do |f|
-        f.write %q{
-          describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
-            it "should be output with green bar" do
-              true.should be_true
-            end
-
-            it "should be output with red bar" do
-              raise("I want to see a red bar!")
-            end
-          end
-        }
-      end
-    end
-
-    it "returns true" do
+    it "returns 0 if spec passes" do
       err, out = StringIO.new, StringIO.new
-      result = drb_command_line(["--drb-port", @drb_port.to_s]).run(err, out)
-      result.should be_true
+      result = command_line(["--drb-port", @drb_port.to_s, passing_spec_filename]).run(err, out)
+      result.should be(0)
     end
 
-    it "integrates via Runner.new.run" do
+    it "returns 1 if spec passes" do
       err, out = StringIO.new, StringIO.new
-      result = RSpec::Core::Runner.run(%W[ --drb --drb-port #{@drb_port} #{dummy_spec_filename}], err, out)
-      result.should be_false
+      result = command_line(["--drb-port", @drb_port.to_s, failing_spec_filename]).run(err, out)
+      result.should be(1)
     end
 
     def run_spec_via_druby
-      run_with([dummy_spec_filename, "--colour", "--drb-port", @drb_port.to_s])
+      run_with([failing_spec_filename, "--colour", "--drb-port", @drb_port.to_s])
       out.rewind
       out.read
     end

data/spec/rspec/core/runner_spec.rb

@@ -21,9 +21,16 @@ module RSpec::Core
     end
 
     describe "#run" do
+      let(:err) { StringIO.new }
+      let(:out) { StringIO.new }
+
+      it "resets world and configuration" do
+        RSpec.configuration.should_receive(:reset)
+        RSpec.world.should_receive(:reset)
+        RSpec::Core::Runner.run([], err, out)
+      end
+
       context "with --drb or -X" do
-        let(:err) { StringIO.new }
-        let(:out) { StringIO.new }
 
         before(:each) do
           @options = RSpec::Core::ConfigurationOptions.new(%w[--drb --drb-port 8181 --color])

data/spec/rspec/core/world_spec.rb

@@ -236,6 +236,17 @@ module RSpec::Core
           end
         end
       end
+
+      context "with examples" do
+        before { world.stub(:example_count) { 1 } }
+
+        context "with no filters" do
+          it "does not announce" do
+            reporter.should_not_receive(:message)
+            world.announce_filters
+          end
+        end
+      end
     end
 
     describe "#inclusion_filter" do

data/spec/support/spec_files.rb

@@ -0,0 +1,44 @@
+shared_context "spec files" do
+  def failing_spec_filename
+    @failing_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_failing_spec.rb"
+  end
+
+  def passing_spec_filename
+    @passing_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_passing_spec.rb"
+  end
+
+  def create_passing_spec_file
+    File.open(passing_spec_filename, 'w') do |f|
+      f.write %q{
+          describe "passing spec" do
+            it "passes" do
+              1.should eq(1)
+            end
+          end
+      }
+    end
+  end
+
+  def create_failing_spec_file
+    File.open(failing_spec_filename, 'w') do |f|
+      f.write %q{
+          describe "failing spec" do
+            it "fails" do
+              1.should eq(2)
+            end
+          end
+      }
+    end
+  end
+
+  before(:all) do
+    create_passing_spec_file
+    create_failing_spec_file
+  end
+
+  after(:all) do
+    File.delete(passing_spec_filename)
+    File.delete(failing_spec_filename)
+  end
+
+end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 15424057
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 2
   - 6
   - 0
-  - rc
-  - 6
-  version: 2.6.0.rc6
+  version: 2.6.0
 platform: ruby
 authors: 
 - Chad Humphries
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -05:00
+date: 2011-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -206,10 +204,10 @@ files:
 - spec/rspec/core/subject_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
-- spec/ruby_forker.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
 - spec/support/shared_example_groups.rb
+- spec/support/spec_files.rb
 has_rdoc: true
 homepage: http://github.com/rspec
 licenses: []
@@ -231,21 +229,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.6.0.rc6
+summary: rspec-core-2.6.0
 test_files: 
 - features/Autotest.md
 - features/Changelog.md
@@ -349,7 +345,7 @@ test_files:
 - spec/rspec/core/subject_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
-- spec/ruby_forker.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
 - spec/support/shared_example_groups.rb
+- spec/support/spec_files.rb

data/spec/ruby_forker.rb

@@ -1,13 +0,0 @@
-require 'rbconfig'
-
-module RubyForker
-  # Forks a ruby interpreter with same type as ourself.
-  # jruby will fork jruby, ruby will fork ruby etc.
-  def ruby(args, stderr=nil)
-    config       = ::RbConfig::CONFIG
-    interpreter  = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
-    cmd = "#{interpreter} #{args}"
-    cmd << " 2> #{stderr}" unless stderr.nil?
-    `#{cmd}`
-  end
-end