Revert "Drop old RSpec support"

This reverts commit 9d7203f.

Author: deivid-rodriguez

rspec-maven-plugin/pom.xml

@@ -20,6 +20,11 @@
 	    <executions>
 	      <execution>
 		<id>integration-test-no-pom</id>
+		<configuration>
+		  <pomExcludes>
+		    <pomExclude>rspec1-no-pom/pom.xml</pomExclude>
+		  </pomExcludes>
+		</configuration>
 	      </execution>
 	    </executions>
 	  </plugin>

rspec-maven-plugin/src/it/rspec-path/pom.xml

@@ -18,7 +18,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rspec</artifactId>
-      <version>3.10.0</version>
+      <version>2.11.0</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>

rspec-maven-plugin/src/it/without-specs-path/pom.xml

@@ -18,7 +18,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rspec</artifactId>
-      <version>3.10.0</version>
+      <version>2.7.0</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>

rspec-maven-plugin/src/main/java/de/saumya/mojo/rspec/RSpecMavenTestScriptFactory.java

@@ -24,12 +24,28 @@ protected void getRunnerScript(StringBuilder builder) {
         builder.append("require %q(rspec/core/formatters/html_formatter)\n");
         builder.append("\n");
 
-        builder.append("require %q(de/saumya/mojo/rspec/rspec3/maven_surefire_reporter)\n");
+        builder.append("if RSpec::Core::Formatters.respond_to? :register\n");
+
+        builder.append("  require %q(de/saumya/mojo/rspec/rspec3/maven_surefire_reporter)\n");
         builder.append("::RSpec.configure do |config|\n");
         builder.append("  config.add_formatter RSpec::Core::Formatters::ProgressFormatter\n");
         builder.append("  config.add_formatter RSpec::Core::Formatters::HtmlFormatter, File.open( \"#{REPORT_PATH}\", 'w' )\n");
         builder.append("  config.add_formatter MavenSurefireReporter\n");
         builder.append("end\n");
+        builder.append("else\n");
+
+        builder.append("  require %q(de/saumya/mojo/rspec/rspec2/multi_formatter)\n");
+        builder.append("  require %q(de/saumya/mojo/rspec/rspec2/maven_console_progress_formatter)\n");
+        builder.append("  require %q(de/saumya/mojo/rspec/rspec2/maven_surefire_reporter)\n");
+        builder.append("  require %q(de/saumya/mojo/rspec/rspec2/monkey_patch)\n");
+        builder.append("::MultiFormatter.formatters << [ MavenConsoleProgressFormatter, nil ]\n");
+        builder.append("::MultiFormatter.formatters << [ MavenSurefireReporter, \"#{TARGET_DIR}\" ] \n");
+        builder.append("::MultiFormatter.formatters << [ RSpec::Core::Formatters::HtmlFormatter, File.open( \"#{REPORT_PATH}\", 'w' ) ] \n");
+        builder.append("\n");
+        builder.append("::RSpec.configure do |config|\n");
+        builder.append("  config.formatter = ::MultiFormatter\n");
+        builder.append("end\n");
+        builder.append("end\n");
         builder.append("\n");
         builder.append("::RSpec::Core::Runner.disable_autorun!\n");
         builder.append("RESULT = ::RSpec::Core::Runner.run( run_args, STDERR, STDOUT)\n");

rspec-maven-plugin/src/main/ruby/de/saumya/mojo/rspec/rspec1/maven_console_progress_formatter.rb

@@ -0,0 +1,99 @@
+
+require 'spec/runner/formatter/base_formatter'
+
+class MojoLog
+
+  def info(str)
+    puts str
+  end  
+  
+end
+
+MOJO_LOG = MojoLog.new
+
+class MavenConsoleProgressFormatter < Spec::Runner::Formatter::BaseFormatter
+  
+  def initialize(options, where)
+    super( options, where )
+    @first = true
+    @passing = []   
+    @pending = []
+    @failing = []   
+    @filename = nil
+  end
+  
+  def example_group_started(example_group)
+    #MOJO_LOG.info( "spec dir #{SPEC_DIR}")
+    #MOJO_LOG.info( "location #{example_group.location}" )
+    unless ( @first )
+      MOJO_LOG.info( "  #{@passing.size} passing; #{@failing.size} failing; #{@pending.size} pending")
+    end
+    @first = false
+    @passing = []   
+    @pending = []
+    @failing = []   
+    example_group.location =~ /^(.*):([0-9])+/
+    filename = $1
+    lineno = $2
+    filename = filename[ SPEC_DIR.length..-1 ]
+    if ( filename[0,1] == "/" ) 
+      filename = filename[1..-1] 
+    end
+    unless ( @filename == filename )
+      @filename = filename
+      MOJO_LOG.info( "SPEC: #{@filename}" )
+    end
+    
+    MOJO_LOG.info( "  - #{example_group.description}" )
+    super( example_group )
+  end
+  
+  def example_passed(example)
+    @passing << example 
+  end
+  
+  def example_pending(example, message)
+    @pending << example 
+  end
+  
+  def example_failed(example, counter, failure)
+    @failing << example 
+  end
+  
+  def dump_summary(duration, example_count, failure_count, pending_count)
+    unless ( @first )
+      MOJO_LOG.info( "  #{@passing.size} passing; #{@failing.size} failing; #{@pending.size} pending")
+    end
+    pass_count = example_count - ( failure_count + pending_count ) 
+    MOJO_LOG.info( "=========================================" )
+    MOJO_LOG.info( "TOTAL: #{pass_count} passing; #{failure_count} failing; #{pending_count} pending")
+
+    if SUMMARY_REPORT
+
+      # Creating the XML report
+      FileUtils.mkdir_p File.dirname SUMMARY_REPORT
+      content = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+<testsuite failures=\"#{failure_count}\" time=\"#{duration}\" errors=\"0\" skipped=\"#{pending_count}\" tests=\"#{example_count}\" name=\"Ruby\">\n"
+
+      # Passing
+      @passing.each { |test|
+        content = content + "<testcase time=\"0.0\" name=\"#{test.description}\"/>\n"
+      }
+	
+      # Pending - considering as failures
+      @pending.each { |test|
+        content = content + "<testcase time=\"0.0\" name=\"#{test.description}\"><failure></failure></testcase>\n"
+      }
+	
+      # Failures
+      @failing.each { |test|
+        content = content + "<testcase time=\"0.0\" name=\"#{test.description}\"><failure></failure></testcase>\n"
+      }
+	
+      content = content + "</testsuite>"
+
+      File.open(SUMMARY_REPORT, 'w+') {|f| f.write(content) }
+    end
+  end
+  
+end

rspec-maven-plugin/src/main/ruby/de/saumya/mojo/rspec/rspec1/maven_surefire_reporter.rb

@@ -0,0 +1,196 @@
+
+require 'spec/runner/formatter/base_formatter'
+
+
+class FileInfo
+  attr_accessor :path
+  attr_accessor :groups
+  
+  def initialize(path)
+    @path = path
+    @groups = []
+  end
+  
+  def duration
+    @groups.inject(0){|sum,e|sum+=e.duration}
+  end
+  
+  def examples
+    @groups.collect{|e| e.examples}.flatten
+  end
+  
+  def passing
+    @groups.collect{|e| e.passing}.flatten
+  end
+  
+  def failing
+    @groups.collect{|e| e.failing}.flatten
+  end
+  
+  def pending
+    @groups.collect{|e| e.pending}.flatten
+  end
+  
+end
+
+class GroupInfo
+  attr_accessor :rspec_group
+  attr_accessor :examples
+  
+  def initialize(rspec_group)
+    @rspec_group = rspec_group
+    @examples = []
+  end
+  
+  def duration
+    @examples.inject(0){|sum,e|sum+=e.duration}
+  end
+  
+  def passing
+    @examples.select{|e| e.status == :passing }
+  end
+  
+  def failing
+    @examples.select{|e| e.status == :failing }
+  end
+  
+  def pending
+    @examples.select{|e| e.status == :pending }
+  end
+  
+end
+
+class ExampleInfo
+  attr_accessor :rspec_example
+  attr_accessor :duration
+  attr_accessor :status
+  
+  attr_accessor :failure
+  attr_accessor :message
+  
+  def initialize(rspec_example)
+    @rspec_example = rspec_example
+    @duration = 0
+    @start_time = Time.now
+    @status = :pending
+  end
+  
+  def finish()
+    @duration = ( Time.now - @start_time ).to_f
+  end
+end
+
+
+class MavenSurefireReporter < Spec::Runner::Formatter::BaseFormatter
+  
+  attr_accessor :output
+  
+  def initialize(options, output)
+    super( options, output )
+    @file_info = {}
+    
+    @output = output
+    
+    @current_file_info = nil
+    @current_group_info = nil
+    @current_example_info = nil
+  end
+  
+  def files
+    @file_info.values
+  end
+  
+  def example_group_started(example_group)   
+    setup_current_file_info( example_group )
+    setup_current_group_info( example_group )
+    @current_group = example_group
+  end
+  
+  def setup_current_file_info(example_group)
+    filename = filename_for( example_group )
+    @current_file_info = @file_info[ filename ] 
+    if ( @current_file_info.nil? )
+      @current_file_info = FileInfo.new( filename )
+      @file_info[ filename ] = @current_file_info
+    end
+  end
+  
+  def setup_current_group_info(example_group)
+    @current_group_info = GroupInfo.new( example_group )
+    @current_file_info.groups << @current_group_info
+  end
+  
+  def setup_current_example_info(example)
+    @current_example_info = ExampleInfo.new( example )
+    @current_group_info.examples << @current_example_info
+  end
+  
+  def filename_for(example_group)
+    example_group.location =~ /^(.*):([0-9])+/
+    filename = $1
+    lineno = $2
+    filename = filename[ SPEC_DIR.length..-1 ]
+    if ( filename[0,1] == "/" ) 
+      filename = filename[1..-1] 
+    end
+    filename
+  end
+  
+  def example_started(example)
+    example_finished() unless ( @current_example.nil? )
+    
+    setup_current_example_info( example )
+  end
+  
+  def example_finished()
+  	@current_example_info.finish
+  	@current_example_info = nil
+  end
+  
+  def example_passed(example)
+    @current_example_info.status = :passing
+    example_finished
+  end
+  
+  def example_failed(example, counter, failure)
+    return unless @current_example_info
+    @current_example_info.status = :failing
+    @current_example_info.failure = failure
+    example_finished
+  end
+  
+  def example_pending(example, message)
+    @current_example_info.status = :pending
+    @current_example_info.failure = message
+    example_finished
+  end
+  
+  def xml_escape(str)
+    str.gsub( /&/, '&amp;' ).gsub( /"/, '&quot;' )
+  end
+  
+  def start_dump
+    files.each do |f|
+      output_filename = File.join( output, "TEST-#{File.basename(f.path, '.rb')}" ) + '.xml'
+      FileUtils.mkdir_p( File.dirname( output_filename ) )
+      File.open( output_filename, 'w' ) do |output|
+        output.puts( %Q(<?xml version="1.0" encoding="UTF-8" ?>) )
+        output.puts( %Q(<testsuite name="#{f.path}" time="#{f.duration}" tests="#{f.examples.size}" errors="#{f.failing.size}" skipped="#{f.pending.size}">) )
+        f.groups.each do |g|
+          g.examples.each do |ex|
+            case_name = xml_escape( g.rspec_group.description + ' ' + ex.rspec_example.description )
+            output.puts( %Q(  <testcase time="#{ex.duration}" name="#{case_name}">) )
+            if ( ex.status == :pending )
+              output.puts( %Q(    <skipped/>) )
+            elsif ( ex.status == :failing )
+              output.puts( %Q(    <failure/>) )
+            end
+            output.puts( %Q(  </testcase>) )
+          end
+        end
+        output.puts( %Q(</testsuite>) )
+      end
+    end
+  end
+  
+end