ci_reporter_rspec 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5782dda8a0c0bda589fb30fb0dff6af461a3b6c
-  data.tar.gz: 50004c58bab2655617aec6e18a2bfc7eced4ec5a
+  metadata.gz: a33ed2d94b91f22678eb86c1bc7bcdf4e678cd50
+  data.tar.gz: 9b68fabf8d01213ef97062205b5f36036be93c80
 SHA512:
-  metadata.gz: 7f1550786b9be743b0bbf452204001eb2f7a424129d4916439ebf8654b044c0ea94d972c07ef36c79d625ba853617fbfe9aef4ba158b9dd828e4a20fdab0b36a
-  data.tar.gz: b813f2e977a9c41d546784207090330f0ca74dbb795b74c7afcf888e0b378c17469eea16a5a5f79b2788cf73aac48515b8cfda775e47d1795bf0260e65ed9328
+  metadata.gz: b311d9e867b79555cbda704ee86cf18c208a92089d3dd6e941df793cf862e7ef47f8363d506fd0754c44e289cc3e5a2cdbc7d4088329899c2c65a6c64187c33f
+  data.tar.gz: ee3e68cf1c0942c749ad0ae5e58396638ab4ae3b501c2f6e645c06c9741bd46dbd638d9f4fa648300fea07b160642b2d1fe1cd1ebd88f6da4cdde243a4eb64ed

data/.travis.yml

@@ -7,3 +7,4 @@ rvm:
 gemfile:
   - Gemfile
   - gemfiles/Gemfile.2.14
+  - gemfiles/Gemfile.2.99

data/README.md

@@ -3,6 +3,11 @@
 Connects [RSpec][rspec] to [CI::Reporter][ci], and then to your CI
 system.
 
+[![Gem Version](https://badge.fury.io/rb/ci_reporter_rspec.svg)](http://badge.fury.io/rb/ci_reporter_rspec)
+[![Build Status](https://travis-ci.org/ci-reporter/ci_reporter_rspec.svg?branch=master)](https://travis-ci.org/ci-reporter/ci_reporter_rspec)
+[![Dependency Status](https://gemnasium.com/ci-reporter/ci_reporter_rspec.svg)](https://gemnasium.com/ci-reporter/ci_reporter_rspec)
+[![Code Climate](https://codeclimate.com/github/ci-reporter/ci_reporter_rspec.png)](https://codeclimate.com/github/ci-reporter/ci_reporter_rspec)
+
 [rspec]: https://www.relishapp.com/rspec
 [ci]: https://github.com/ci-reporter/ci_reporter
 

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
-require 'ci/reporter/internal'
-include CI::Reporter::Internal
+require 'ci/reporter/test_utils/rake'
+include CI::Reporter::TestUtils::Rake
 
 namespace :generate do
   task :clean do
@@ -9,7 +9,7 @@ namespace :generate do
 
   task :rspec do
     rspec = "#{Gem.loaded_specs['rspec-core'].gem_dir}/exe/rspec"
-    run_ruby_acceptance "-S #{rspec} --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb"
+    run_ruby_acceptance "-S #{rspec} --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpecFormatter acceptance/rspec_example_spec.rb"
   end
 
   task :all => [:clean, :rspec]

data/acceptance/rspec_example_spec.rb

@@ -1,17 +1,48 @@
-describe "RSpec example" do
-  it "should succeed" do
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
+describe "a passing example" do
+  it "passes" do
     true.should be true
-    nil.should be_nil
   end
+end
 
-  it "should fail" do
+describe "a failing example" do
+  it "fails" do
     true.should be false
   end
+end
+
+describe "an errored example" do
+  it "errors" do
+    raise "What happened?"
+  end
+end
+
+describe "a pending example" do
+  it "is not run"
+end
 
-  it "should be pending"
+describe "a failure in a before block" do
+  before do
+    true.should be false
+  end
+
+  it "doesn't matter" do
+    true.should be true
+  end
+end
+
+describe "outer context" do
+  it "passes" do
+    true.should be true
+  end
 
-  describe "nested" do
-    it "should succeed" do
+  describe "inner context" do
+    it "passes" do
       true.should be true
     end
   end

data/acceptance/verification_spec.rb

@@ -1,33 +1,132 @@
 require 'rexml/document'
+require 'ci/reporter/test_utils/accessor'
+require 'ci/reporter/test_utils/shared_examples'
+begin
+  require 'rspec/collection_matchers'
+rescue LoadError
+  # This gem doesn't support all versions of RSpec
+end
 
 REPORTS_DIR = File.dirname(__FILE__) + '/reports'
 
+shared_examples "assertions are not tracked" do
+  describe "the assertion count" do
+    subject { result.assertions_count }
+    it { should eql 0 }
+  end
+end
+
 describe "RSpec acceptance" do
-  it "should generate two XML files" do
-    File.exist?(File.join(REPORTS_DIR, 'SPEC-RSpec-example.xml')).should == true
-    File.exist?(File.join(REPORTS_DIR, 'SPEC-RSpec-example-nested.xml')).should == true
+  include CI::Reporter::TestUtils::SharedExamples
+  Accessor = CI::Reporter::TestUtils::Accessor
+
+  let(:passing_report_path) { File.join(REPORTS_DIR, 'SPEC-a-passing-example.xml') }
+  let(:failing_report_path) { File.join(REPORTS_DIR, 'SPEC-a-failing-example.xml') }
+  let(:errored_report_path) { File.join(REPORTS_DIR, 'SPEC-an-errored-example.xml') }
+  let(:pending_report_path) { File.join(REPORTS_DIR, 'SPEC-a-pending-example.xml') }
+  let(:failure_in_before_report_path) { File.join(REPORTS_DIR, 'SPEC-a-failure-in-a-before-block.xml') }
+  let(:nested_outer_report_path) { File.join(REPORTS_DIR, 'SPEC-outer-context.xml') }
+  let(:nested_inner_report_path) { File.join(REPORTS_DIR, 'SPEC-outer-context-inner-context.xml') }
+
+  describe "the passing test" do
+    subject(:result) { Accessor.new(load_xml_result(passing_report_path)) }
+
+    it { should have(0).errors }
+    it { should have(0).failures }
+    it { should have(1).testcases }
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
   end
 
-  it "should have two tests and one failure" do
-    doc = File.open(File.join(REPORTS_DIR, 'SPEC-RSpec-example.xml')) do |f|
-      REXML::Document.new(f)
+  describe "the failing test" do
+    subject(:result) { Accessor.new(load_xml_result(failing_report_path)) }
+
+    it { should have(0).errors }
+    it { should have(1).failures }
+    it { should have(1).testcases }
+
+    describe "the failure" do
+      subject(:failure) { result.failures.first }
+      it "indicates the type" do
+        failure.attributes['type'].should =~ /ExpectationNotMetError/
+      end
+    end
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
+  end
+
+  describe "the errored test" do
+    subject(:result) { Accessor.new(load_xml_result(errored_report_path)) }
+
+    it { should have(1).errors }
+    it { should have(0).failures }
+    it { should have(1).testcases }
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
+  end
+
+  describe "the pending test" do
+    subject(:result) { Accessor.new(load_xml_result(pending_report_path)) }
+
+    it { should have(0).errors }
+    it { should have(0).failures }
+    it { should have(1).testcases }
+
+    describe "the skipped count" do
+      subject { result.skipped_count }
+      it { should eql 1 }
     end
-    doc.root.attributes["errors"].should == "0"
-    doc.root.attributes["failures"].should == "1"
-    doc.root.attributes["tests"].should == "3"
-    doc.root.elements.to_a("/testsuite/testcase").size.should == 3
-    failures = doc.root.elements.to_a("/testsuite/testcase/failure")
-    failures.size.should == 1
-    failures.first.attributes["type"].should =~ /ExpectationNotMetError/
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
+  end
+
+  describe "the test that fails in a before block" do
+    subject(:result) { Accessor.new(load_xml_result(failure_in_before_report_path)) }
+
+    it { should have(0).errors }
+    it { should have(1).failures }
+    it { should have(1).testcases }
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
+  end
+
+  describe "the outer context" do
+    subject(:result) { Accessor.new(load_xml_result(nested_outer_report_path)) }
+
+    it { should have(0).errors }
+    it { should have(0).failures }
+    it { should have(1).testcases }
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
+  end
+
+  describe "the inner context" do
+    subject(:result) { Accessor.new(load_xml_result(nested_inner_report_path)) }
+
+    it { should have(0).errors }
+    it { should have(0).failures }
+    it { should have(1).testcases }
+
+    it_behaves_like "a report with consistent attribute counts"
+    it_behaves_like "assertions are not tracked"
+    it_behaves_like "nothing was output"
   end
 
-  it "should have one test in the nested example report" do
-    doc = File.open(File.join(REPORTS_DIR, 'SPEC-RSpec-example-nested.xml')) do |f|
+  def load_xml_result(path)
+    File.open(path) do |f|
       REXML::Document.new(f)
     end
-    doc.root.attributes["errors"].should == "0"
-    doc.root.attributes["failures"].should == "0"
-    doc.root.attributes["tests"].should == "1"
-    doc.root.elements.to_a("/testsuite/testcase").size.should == 1
   end
 end

data/ci_reporter_rspec.gemspec

@@ -17,9 +17,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|acceptance)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rspec", "~> 2.14"
-  spec.add_dependency "ci_reporter", "2.0.0.alpha1"
+  spec.add_dependency "rspec", ">= 2.14", "< 4"
+  spec.add_dependency "ci_reporter", "2.0.0.alpha2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "ci_reporter_test_utils"
+  spec.add_development_dependency "rspec-collection_matchers"
 end

data/gemfiles/Gemfile.2.14

@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 gem 'rake'
 gem 'rspec', '~> 2.14.0'
 gem 'ci_reporter_rspec', path: '..'
+
+group :test do
+  gem 'ci_reporter_test_utils'
+end

data/gemfiles/Gemfile.2.99

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'rspec', '~> 2.99.0'
+gem 'ci_reporter_rspec', path: '..'
+
+group :test do
+  gem 'ci_reporter_test_utils'
+end

data/lib/ci/reporter/rake/rspec.rb

@@ -6,22 +6,26 @@ namespace :ci do
       rm_rf ENV["CI_REPORTS"] || "spec/reports"
     end
 
-    task :rspec => :spec_report_cleanup do
-      spec_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"),
-        "--format", "CI::Reporter::RSpec"].join(" ")
+    def setup_spec_opts(*extra_options)
+      base_opts = [
+        "--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"),
+        "--format", "CI::Reporter::RSpecFormatter"
+      ]
+
+      spec_opts = (base_opts + extra_options).join(" ")
       ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}"
     end
 
+    task :rspec => :spec_report_cleanup do
+      setup_spec_opts("--format", "progress")
+    end
+
     task :rspecdoc => :spec_report_cleanup do
-      spec_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"),
-        "--format", "CI::Reporter::RSpecDoc"].join(" ")
-      ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}"
+      setup_spec_opts("--format", "documentation")
     end
 
     task :rspecbase => :spec_report_cleanup do
-      spec_opts = ["--require", CI::Reporter.maybe_quote_filename("#{File.dirname(__FILE__)}/rspec_loader.rb"),
-        "--format", "CI::Reporter::RSpecBase"].join(" ")
-      ENV["SPEC_OPTS"] = "#{ENV['SPEC_OPTS']} #{spec_opts}"
+      setup_spec_opts
     end
   end
 end

data/lib/ci/reporter/rspec.rb

@@ -1,173 +1,15 @@
 require 'ci/reporter/core'
 
-module CI
-  module Reporter
-    module RSpecFormatters
-      require 'rspec/core/formatters/base_formatter'
-      require 'rspec/core/formatters/progress_formatter'
-      require 'rspec/core/formatters/documentation_formatter'
-      BaseFormatter = ::RSpec::Core::Formatters::BaseFormatter
-      ProgressFormatter = ::RSpec::Core::Formatters::ProgressFormatter
-      DocFormatter = ::RSpec::Core::Formatters::DocumentationFormatter
-      # See https://github.com/nicksieger/ci_reporter/issues/76 and
-      #     https://github.com/nicksieger/ci_reporter/issues/80
-      require 'rspec/core/version'
-      RSpec_2_12_0_bug = (::RSpec::Core::Version::STRING == '2.12.0' &&
-                          !BaseFormatter.instance_methods(false).map(&:to_s).include?("format_backtrace"))
-    end
-
-    # Wrapper around a <code>RSpec</code> error or failure to be used by the test suite to interpret results.
-    class RSpec2Failure
-      attr_reader :exception
-
-      def initialize(example, formatter)
-        @formatter = formatter
-        @example = example
-        if @example.respond_to?(:execution_result)
-          @exception = @example.execution_result[:exception] || @example.execution_result[:exception_encountered]
-        else
-          @exception = @example.metadata[:execution_result][:exception]
-        end
-      end
-
-      def name
-        @exception.class.name
-      end
-
-      def message
-        @exception.message
-      end
-
-      def failure?
-        exception.is_a?(::RSpec::Expectations::ExpectationNotMetError)
-      end
-
-      def error?
-        !failure?
-      end
-
-      def location
-        output = []
-        output.push "#{exception.class.name << ":"}" unless exception.class.name =~ /RSpec/
-        output.push @exception.message
-
-        format_metadata = RSpecFormatters::RSpec_2_12_0_bug ? @example.metadata : @example
-
-        [@formatter.format_backtrace(@exception.backtrace, format_metadata)].flatten.each do |backtrace_info|
-          backtrace_info.lines.each do |line|
-            output.push "     #{line}"
-          end
-        end
-        output.join "\n"
-      end
-    end
-
-    # Custom +RSpec+ formatter used to hook into the spec runs and capture results.
-    class RSpec
-      attr_accessor :report_manager
-      attr_accessor :formatter
-      def initialize(*args)
-        @formatter ||= RSpecFormatters::ProgressFormatter.new(*args)
-        @report_manager = ReportManager.new("spec")
-        @suite = nil
-      end
-
-      def example_group_started(example_group)
-        @formatter.example_group_started(example_group)
-        new_suite(description_for(example_group))
-      end
-
-      def example_started(name_or_example)
-        @formatter.example_started(name_or_example)
-        spec = TestCase.new
-        @suite.testcases << spec
-        spec.start
-      end
-
-      def example_failed(name_or_example, *rest)
-        @formatter.example_failed(name_or_example, *rest)
-
-        # In case we fail in before(:all)
-        example_started(name_or_example) if @suite.testcases.empty?
-
-        failure = RSpec2Failure.new(name_or_example, @formatter)
-
-        spec = @suite.testcases.last
-        spec.finish
-        spec.name = description_for(name_or_example)
-        spec.failures << failure
-      end
-
-      def example_passed(name_or_example)
-        @formatter.example_passed(name_or_example)
-        spec = @suite.testcases.last
-        spec.finish
-        spec.name = description_for(name_or_example)
-      end
-
-      def example_pending(*args)
-        @formatter.example_pending(*args)
-        name = description_for(args[0])
-        spec = @suite.testcases.last
-        spec.finish
-        spec.name = "#{name} (PENDING)"
-        spec.skipped = true
-      end
-
-      def dump_summary(*args)
-        @formatter.dump_summary(*args)
-        write_report
-        @formatter.dump_failures
-      end
-
-      def respond_to?(*args)
-        @formatter.respond_to?(*args)
-      end
-
-      # Pass through other methods to RSpec formatter for compatibility
-      def method_missing(meth,*args,&block)
-        @formatter.send(meth,*args,&block)
-      end
-
-      private
-      def description_for(name_or_example)
-        if name_or_example.respond_to?(:full_description)
-          name_or_example.full_description
-        elsif name_or_example.respond_to?(:metadata)
-          name_or_example.metadata[:example_group][:full_description]
-        elsif name_or_example.respond_to?(:description)
-          name_or_example.description
-        else
-          "UNKNOWN"
-        end
-      end
-
-      def write_report
-        if @suite
-          @suite.finish
-          @report_manager.write_report(@suite)
-        end
-      end
-
-      def new_suite(name)
-        write_report if @suite
-        @suite = TestSuite.new name
-        @suite.start
-      end
-    end
-
-    class RSpecDoc < RSpec
-      def initialize(*args)
-        @formatter = RSpecFormatters::DocFormatter.new(*args)
-        super
-      end
-    end
-
-    class RSpecBase < RSpec
-      def initialize(*args)
-        @formatter = RSpecFormatters::BaseFormatter.new(*args)
-        super
-      end
-    end
+module CI::Reporter
+  rspec_version = Gem::Version.new(::RSpec::Core::Version::STRING)
+  rspec_3 = Gem::Version.new('3.0.0')
+  RSPEC_3_AVAILABLE = rspec_version >= rspec_3
+
+  if RSPEC_3_AVAILABLE
+    require 'ci/reporter/rspec3/formatter'
+    RSpecFormatter = CI::Reporter::RSpec3::Formatter
+  else
+    require 'ci/reporter/rspec2/formatter'
+    RSpecFormatter = CI::Reporter::RSpec2::Formatter
   end
 end

data/lib/ci/reporter/rspec/version.rb

@@ -1,7 +1,7 @@
 module CI
   module Reporter
-    class RSpec
-      VERSION = "0.0.1"
+    module RSpec
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/ci/reporter/rspec2/failure.rb

@@ -0,0 +1,46 @@
+module CI::Reporter
+  module RSpec2
+    class Failure
+      attr_reader :exception
+
+      def initialize(example, formatter)
+        @formatter = formatter
+        @example = example
+        if @example.respond_to?(:execution_result)
+          @exception = @example.execution_result[:exception] || @example.execution_result[:exception_encountered]
+        else
+          @exception = @example.metadata[:execution_result][:exception]
+        end
+      end
+
+      def name
+        @exception.class.name
+      end
+
+      def message
+        @exception.message
+      end
+
+      def failure?
+        exception.is_a?(::RSpec::Expectations::ExpectationNotMetError)
+      end
+
+      def error?
+        !failure?
+      end
+
+      def location
+        output = []
+        output.push "#{exception.class.name << ":"}" unless exception.class.name =~ /RSpec/
+        output.push @exception.message
+
+        [@formatter.format_backtrace(@exception.backtrace, @example)].flatten.each do |backtrace_info|
+          backtrace_info.lines.each do |line|
+            output.push "     #{line}"
+          end
+        end
+        output.join "\n"
+      end
+    end
+  end
+end

data/lib/ci/reporter/rspec2/formatter.rb

@@ -0,0 +1,80 @@
+require 'rspec/core/formatters/base_formatter'
+require 'ci/reporter/rspec2/failure'
+
+module CI::Reporter
+  module RSpec2
+    class Formatter < ::RSpec::Core::Formatters::BaseFormatter
+      attr_accessor :report_manager
+      def initialize(*args)
+        @report_manager = ReportManager.new("spec")
+        @suite = nil
+      end
+
+      def example_group_started(example_group)
+        new_suite(description_for(example_group))
+      end
+
+      def example_started(name_or_example)
+        spec = TestCase.new
+        @suite.testcases << spec
+        spec.start
+      end
+
+      def example_failed(name_or_example, *rest)
+        # In case we fail in before(:all)
+        example_started(name_or_example) if @suite.testcases.empty?
+
+        failure = Failure.new(name_or_example, self)
+
+        spec = @suite.testcases.last
+        spec.finish
+        spec.name = description_for(name_or_example)
+        spec.failures << failure
+      end
+
+      def example_passed(name_or_example)
+        spec = @suite.testcases.last
+        spec.finish
+        spec.name = description_for(name_or_example)
+      end
+
+      def example_pending(*args)
+        name = description_for(args[0])
+        spec = @suite.testcases.last
+        spec.finish
+        spec.name = "#{name} (PENDING)"
+        spec.skipped = true
+      end
+
+      def dump_summary(*args)
+        write_report
+      end
+
+      private
+      def description_for(name_or_example)
+        if name_or_example.respond_to?(:full_description)
+          name_or_example.full_description
+        elsif name_or_example.respond_to?(:metadata)
+          name_or_example.metadata[:example_group][:full_description]
+        elsif name_or_example.respond_to?(:description)
+          name_or_example.description
+        else
+          "UNKNOWN"
+        end
+      end
+
+      def write_report
+        if @suite
+          @suite.finish
+          @report_manager.write_report(@suite)
+        end
+      end
+
+      def new_suite(name)
+        write_report if @suite
+        @suite = TestSuite.new name
+        @suite.start
+      end
+    end
+  end
+end

data/lib/ci/reporter/rspec3/failure.rb

@@ -0,0 +1,37 @@
+module CI::Reporter
+  module RSpec3
+    class Failure
+      def initialize(example)
+        @example = example
+      end
+
+      def name
+        exception.class.name
+      end
+
+      def message
+        exception.message
+      end
+
+      def failure?
+        exception.is_a?(::RSpec::Expectations::ExpectationNotMetError)
+      end
+
+      def error?
+        !failure?
+      end
+
+      def location
+        output = []
+        output.push "#{name}:" unless name =~ /RSpec/
+        output.push message
+        output.push @example.formatted_backtrace
+        output.join "\n"
+      end
+
+      def exception
+        @example.exception
+      end
+    end
+  end
+end

data/lib/ci/reporter/rspec3/formatter.rb

@@ -0,0 +1,76 @@
+require 'ci/reporter/core'
+require 'ci/reporter/rspec3/failure'
+
+module CI::Reporter
+  module RSpec3
+    class Formatter
+      attr_accessor :report_manager
+
+      def initialize(*args)
+        @report_manager = ReportManager.new("spec")
+      end
+
+      def example_group_started(notification)
+        new_suite(notification.group.metadata[:full_description])
+      end
+
+      def example_started(notification)
+        spec = TestCase.new
+        @suite.testcases << spec
+        spec.start
+      end
+
+      def example_failed(notification)
+        # In case we fail in before(:all)
+        example_started(nil) if @suite.testcases.empty?
+
+        failure = Failure.new(notification)
+
+        current_spec.finish
+        current_spec.name = notification.example.full_description
+        current_spec.failures << failure
+      end
+
+      def example_passed(notification)
+        current_spec.finish
+        current_spec.name = notification.example.full_description
+      end
+
+      def example_pending(notification)
+        current_spec.finish
+        current_spec.name = "#{notification.example.full_description} (PENDING)"
+        current_spec.skipped = true
+      end
+
+      def stop(notification)
+        write_report
+      end
+
+      private
+
+      def current_spec
+        @suite.testcases.last
+      end
+
+      def write_report
+        return unless @suite
+        @suite.finish
+        @report_manager.write_report(@suite)
+      end
+
+      def new_suite(name)
+        write_report
+        @suite = TestSuite.new(name)
+        @suite.start
+      end
+    end
+
+    ::RSpec::Core::Formatters.register Formatter,
+                                       :example_group_started,
+                                       :example_started,
+                                       :example_passed,
+                                       :example_failed,
+                                       :example_pending,
+                                       :stop
+  end
+end

data/spec/ci/reporter/rake/rake_tasks_spec.rb

@@ -1,42 +1,62 @@
 require File.dirname(__FILE__) + "/../../../spec_helper.rb"
 require 'rake'
+require 'ci/reporter/test_utils/unit'
 
-require 'ci/reporter/internal'
-include CI::Reporter::Internal
+describe "Rake tasks" do
+  include CI::Reporter::TestUtils::Unit
+
+  let (:rake) { Rake::Application.new }
 
-describe "ci_reporter ci:setup:rspec task" do
   before(:each) do
-    @rake = Rake::Application.new
-    Rake.application = @rake
+    Rake.application = rake
     load CI_REPORTER_LIB + '/ci/reporter/rake/rspec.rb'
     save_env "CI_REPORTS"
     save_env "SPEC_OPTS"
     ENV["CI_REPORTS"] = "some-bogus-nonexistent-directory-that-wont-fail-rm_rf"
   end
+
   after(:each) do
     restore_env "SPEC_OPTS"
     restore_env "CI_REPORTS"
     Rake.application = nil
   end
 
-  it "should set ENV['SPEC_OPTS'] to include rspec formatter args" do
-    @rake["ci:setup:rspec"].invoke
-    ENV["SPEC_OPTS"].should =~ /--require.*rspec_loader.*--format.*CI::Reporter::RSpec/
+  subject(:spec_opts) { ENV["SPEC_OPTS"] }
+
+  context "ci:setup:rspec" do
+    before do
+      rake["ci:setup:rspec"].invoke
+    end
+
+    it { should match(/--require\s+\S+rspec_loader/) }
+    it { should match(/--format\s+CI::Reporter::RSpecFormatter\b/) }
+    it { should match(/--format\s+progress/) }
   end
 
-  it "should set ENV['SPEC_OPTS'] to include rspec doc formatter if task is ci:setup:rspecdoc" do
-    @rake["ci:setup:rspecdoc"].invoke
-    ENV["SPEC_OPTS"].should =~ /--require.*rspec_loader.*--format.*CI::Reporter::RSpecDoc/
+  context "ci:setup:rspecdoc" do
+    before do
+      rake["ci:setup:rspecdoc"].invoke
+    end
+
+    it { should match(/--require\s+\S+rspec_loader/) }
+    it { should match(/--format\s+CI::Reporter::RSpecFormatter\b/) }
+    it { should match(/--format\s+documentation/) }
   end
 
-  it "should set ENV['SPEC_OPTS'] to include rspec base formatter if task is ci:setup:rspecbase" do
-    @rake["ci:setup:rspecbase"].invoke
-    ENV["SPEC_OPTS"].should =~ /--require.*rspec_loader.*--format.*CI::Reporter::RSpecBase/
+  context "ci:setup:rspecbase" do
+    before do
+      rake["ci:setup:rspecbase"].invoke
+    end
+
+    it { should match(/--require\s+\S+rspec_loader/) }
+    it { should match(/--format\s+CI::Reporter::RSpecFormatter\b/) }
   end
 
-  it "should append to ENV['SPEC_OPTS'] if it already contains a value" do
-    ENV["SPEC_OPTS"] = "somevalue".freeze
-    @rake["ci:setup:rspec"].invoke
-    ENV["SPEC_OPTS"].should =~ /somevalue.*--require.*rspec_loader.*--format.*CI::Reporter::RSpec/
+  context "with existing options" do
+    it "appends new options" do
+      ENV["SPEC_OPTS"] = "previous-value".freeze
+      rake["ci:setup:rspec"].invoke
+      spec_opts.should match(/previous-value.*CI::Reporter::RSpecFormatter\b/)
+    end
   end
 end

data/spec/ci/reporter/rspec2/failure_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + "/../../../spec_helper.rb"
+require File.dirname(__FILE__) + "/../../../support/rspec2"
+require 'ci/reporter/rspec'
+require 'ci/reporter/rspec2/failure'
+
+module CI::Reporter::RSpec2
+  describe Failure do
+    include RSpec2Helpers
+
+    before(:each) do
+      skip "RSpec 3 present, skipping RSpec 2 tests" if CI::Reporter::RSPEC_3_AVAILABLE
+    end
+
+    before(:each) do
+      @formatter = Formatter.new
+      @rspec20_example = double('RSpec2.0 Example',
+                                :execution_result => {:exception_encountered => StandardError.new('rspec2.0 ftw')},
+                                :metadata => {})
+
+      @rspec22_example = rspec2_failing_example('rspec2.2 ftw')
+    end
+
+    it 'should handle rspec (< 2.2) execution results' do
+      failure = Failure.new(@rspec20_example, @formatter)
+      failure.name.should_not be_nil
+      failure.message.should == 'rspec2.0 ftw'
+      failure.location.should_not be_nil
+    end
+    it 'should handle rspec (>= 2.2) execution results' do
+      failure = Failure.new(@rspec22_example, @formatter)
+      failure.name.should_not be_nil
+      failure.message.should == 'rspec2.2 ftw'
+      failure.location.should_not be_nil
+    end
+  end
+end

data/spec/ci/reporter/rspec2/formatter_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + "/../../../spec_helper.rb"
+require File.dirname(__FILE__) + "/../../../support/rspec2"
+require 'ci/reporter/rspec'
+require 'ci/reporter/rspec2/formatter'
+require 'stringio'
+
+module CI::Reporter::RSpec2
+  describe Formatter do
+    include RSpec2Helpers
+
+    before(:each) do
+      skip "RSpec 3 present, skipping RSpec 2 tests" if CI::Reporter::RSPEC_3_AVAILABLE
+    end
+
+    before(:each) do
+      @error = double("error")
+      @error.stub(:expectation_not_met?).and_return(false)
+      @error.stub(:pending_fixed?).and_return(false)
+      @error.stub(:exception).and_return(StandardError.new)
+      @report_mgr = double("report manager")
+      @options = double("options")
+      @args = [@options, StringIO.new("")]
+      @fmt = Formatter.new *@args
+      @fmt.report_manager = @report_mgr
+    end
+
+    it "should create a test suite with one success, one failure, and one pending" do
+      @report_mgr.should_receive(:write_report) do |suite|
+        suite.testcases.length.should == 3
+        suite.testcases[0].should_not be_failure
+        suite.testcases[0].should_not be_error
+        suite.testcases[1].should be_error
+        suite.testcases[2].name.should =~ /\(PENDING\)/
+      end
+
+      example_group = double "example group"
+      example_group.stub(:description).and_return "A context"
+
+      @fmt.start(3)
+      @fmt.example_group_started(example_group)
+      @fmt.example_started("should pass")
+      @fmt.example_passed("should pass")
+      @fmt.example_started("should fail")
+      @fmt.example_failed(rspec2_failing_example("should fail"), 1, @error)
+      @fmt.example_started("should be pending")
+      @fmt.example_pending("A context", "should be pending", "Not Yet Implemented")
+      @fmt.start_dump
+      @fmt.dump_summary(0.1, 3, 1, 1)
+      @fmt.dump_pending
+      @fmt.close
+    end
+
+    it "should use the example #description method when available" do
+      group = double "example group"
+      group.stub(:description).and_return "group description"
+      example = double "example"
+      example.stub(:description).and_return "should do something"
+
+      @report_mgr.should_receive(:write_report) do |suite|
+        suite.testcases.last.name.should == "should do something"
+      end
+
+      @fmt.start(2)
+      @fmt.example_group_started(group)
+      @fmt.example_started(example)
+      @fmt.example_passed(example)
+      @fmt.dump_summary(0.1, 1, 0, 0)
+    end
+
+    it "should create a test suite with failure in before(:all)" do
+      example_group = double "example group"
+      example_group.stub(:description).and_return "A context"
+
+      @report_mgr.should_receive(:write_report)
+
+      @fmt.start(2)
+      @fmt.example_group_started(example_group)
+      @fmt.example_failed(rspec2_failing_example("should fail"), 1, @error)
+      @fmt.dump_summary(0.1, 1, 0, 0)
+    end
+  end
+end

data/spec/support/rspec2.rb

@@ -0,0 +1,13 @@
+module RSpec2Helpers
+  def rspec2_failing_example(exception_text)
+    double('RSpec2.2 Example',
+           :execution_result => {
+             :exception => StandardError.new(exception_text)
+           },
+           :metadata => {
+             :example_group => {
+               :full_description => "description"
+             }
+           })
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_reporter_rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Sieger
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha1
+        version: 2.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha1
+        version: 2.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +73,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter_test_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - nick@nicksieger.com
@@ -87,13 +121,20 @@ files:
 - ci_reporter_rspec.gemspec
 - gemfiles/.gitignore
 - gemfiles/Gemfile.2.14
+- gemfiles/Gemfile.2.99
 - lib/ci/reporter/rake/rspec.rb
 - lib/ci/reporter/rake/rspec_loader.rb
 - lib/ci/reporter/rspec.rb
 - lib/ci/reporter/rspec/version.rb
+- lib/ci/reporter/rspec2/failure.rb
+- lib/ci/reporter/rspec2/formatter.rb
+- lib/ci/reporter/rspec3/failure.rb
+- lib/ci/reporter/rspec3/formatter.rb
 - spec/ci/reporter/rake/rake_tasks_spec.rb
-- spec/ci/reporter/rspec_spec.rb
+- spec/ci/reporter/rspec2/failure_spec.rb
+- spec/ci/reporter/rspec2/formatter_spec.rb
 - spec/spec_helper.rb
+- spec/support/rspec2.rb
 homepage: https://github.com/ci-reporter/ci_reporter_rspec
 licenses:
 - MIT
@@ -123,5 +164,7 @@ test_files:
 - acceptance/rspec_example_spec.rb
 - acceptance/verification_spec.rb
 - spec/ci/reporter/rake/rake_tasks_spec.rb
-- spec/ci/reporter/rspec_spec.rb
+- spec/ci/reporter/rspec2/failure_spec.rb
+- spec/ci/reporter/rspec2/formatter_spec.rb
 - spec/spec_helper.rb
+- spec/support/rspec2.rb

data/spec/ci/reporter/rspec_spec.rb

@@ -1,148 +0,0 @@
-require File.dirname(__FILE__) + "/../../spec_helper.rb"
-require 'ci/reporter/rspec'
-require 'stringio'
-
-describe "The RSpec reporter" do
-  before(:each) do
-    @error = double("error")
-    @error.stub(:expectation_not_met?).and_return(false)
-    @error.stub(:pending_fixed?).and_return(false)
-    @error.stub(:exception).and_return(StandardError.new)
-    @report_mgr = double("report manager")
-    @options = double("options")
-    @args = [@options, StringIO.new("")]
-    @args.shift unless defined?(::Spec) && ::Spec::VERSION::MAJOR == 1 && ::Spec::VERSION::MINOR >= 1
-    @fmt = CI::Reporter::RSpec.new *@args
-    @fmt.report_manager = @report_mgr
-    @formatter = double("formatter")
-    @fmt.formatter = @formatter
-  end
-
-  it "should use a progress bar formatter by default" do
-    fmt = CI::Reporter::RSpec.new *@args
-    fmt.formatter.should be_instance_of(CI::Reporter::RSpecFormatters::ProgressFormatter)
-  end
-
-  it "should use a specdoc formatter for RSpecDoc" do
-    fmt = CI::Reporter::RSpecDoc.new *@args
-    fmt.formatter.should be_instance_of(CI::Reporter::RSpecFormatters::DocFormatter)
-  end
-
-  def rspec2_failing_example(exception_text)
-    double('RSpec2.2 Example',
-           :execution_result => {
-             :exception => StandardError.new(exception_text)
-           },
-           :metadata => {
-             :example_group => {
-               :full_description => "description"
-             }
-           })
-  end
-
-  it "should create a test suite with one success, one failure, and one pending" do
-    @report_mgr.should_receive(:write_report) do |suite|
-      suite.testcases.length.should == 3
-      suite.testcases[0].should_not be_failure
-      suite.testcases[0].should_not be_error
-      suite.testcases[1].should be_error
-      suite.testcases[2].name.should =~ /\(PENDING\)/
-    end
-
-    example_group = double "example group"
-    example_group.stub(:description).and_return "A context"
-
-    @formatter.should_receive(:start).with(3)
-    @formatter.should_receive(:example_group_started).with(example_group)
-    @formatter.should_receive(:example_started).exactly(3).times
-    @formatter.should_receive(:example_passed).once
-    @formatter.should_receive(:example_failed).once
-    @formatter.should_receive(:example_pending).once
-    @formatter.should_receive(:start_dump).once
-    @formatter.should_receive(:dump_failure).once
-    @formatter.should_receive(:dump_summary).once
-    @formatter.should_receive(:dump_pending).once
-    @formatter.should_receive(:dump_failures).once
-    @formatter.should_receive(:close).once
-
-    @fmt.start(3)
-    @fmt.example_group_started(example_group)
-    @fmt.example_started("should pass")
-    @fmt.example_passed("should pass")
-    @fmt.example_started("should fail")
-    @fmt.example_failed(rspec2_failing_example("should fail"), 1, @error)
-    @fmt.example_started("should be pending")
-    @fmt.example_pending("A context", "should be pending", "Not Yet Implemented")
-    @fmt.start_dump
-    @fmt.dump_failure(1, double("failure"))
-    @fmt.dump_summary(0.1, 3, 1, 1)
-    @fmt.dump_pending
-    @fmt.close
-  end
-
-  it "should use the example #description method when available" do
-    group = double "example group"
-    group.stub(:description).and_return "group description"
-    example = double "example"
-    example.stub(:description).and_return "should do something"
-
-    @formatter.should_receive(:start)
-    @formatter.should_receive(:example_group_started).with(group)
-    @formatter.should_receive(:example_started).with(example).once
-    @formatter.should_receive(:example_passed).once
-    @formatter.should_receive(:dump_summary)
-    @formatter.should_receive(:dump_failures).once
-    @report_mgr.should_receive(:write_report) do |suite|
-      suite.testcases.last.name.should == "should do something"
-    end
-
-    @fmt.start(2)
-    @fmt.example_group_started(group)
-    @fmt.example_started(example)
-    @fmt.example_passed(example)
-    @fmt.dump_summary(0.1, 1, 0, 0)
-  end
-
-  it "should create a test suite with failure in before(:all)" do
-    example_group = double "example group"
-    example_group.stub(:description).and_return "A context"
-
-    @formatter.should_receive(:start)
-    @formatter.should_receive(:example_group_started).with(example_group)
-    @formatter.should_receive(:example_started).once
-    @formatter.should_receive(:example_failed).once
-    @formatter.should_receive(:dump_summary)
-    @formatter.should_receive(:dump_failures).once
-    @report_mgr.should_receive(:write_report)
-
-    @fmt.start(2)
-    @fmt.example_group_started(example_group)
-    @fmt.example_failed(rspec2_failing_example("should fail"), 1, @error)
-    @fmt.dump_summary(0.1, 1, 0, 0)
-  end
-
-  describe 'RSpec2Failure' do
-    before(:each) do
-      @formatter = double "formatter"
-      @formatter.should_receive(:format_backtrace).and_return("backtrace")
-      @rspec20_example = double('RSpec2.0 Example',
-                              :execution_result => {:exception_encountered => StandardError.new('rspec2.0 ftw')},
-                              :metadata => {})
-
-      @rspec22_example = rspec2_failing_example('rspec2.2 ftw')
-    end
-
-    it 'should handle rspec (< 2.2) execution results' do
-      failure = CI::Reporter::RSpec2Failure.new(@rspec20_example, @formatter)
-      failure.name.should_not be_nil
-      failure.message.should == 'rspec2.0 ftw'
-      failure.location.should_not be_nil
-    end
-    it 'should handle rspec (>= 2.2) execution results' do
-      failure = CI::Reporter::RSpec2Failure.new(@rspec22_example, @formatter)
-      failure.name.should_not be_nil
-      failure.message.should == 'rspec2.2 ftw'
-      failure.location.should_not be_nil
-    end
-  end
-end