rspec-instafail 0.1.3 → 0.1.4

data/Readme.md

@@ -40,6 +40,7 @@ Authors
 ### [Contributors](http://github.com/grosser/rspec-instafail/contributors)
  - [Matthew Willhite](http://github.com/miwillhite)
  - [Jeff Kreeftmeijer](http://jeffkreeftmeijer.com)
+ - [Steve Tooke](http://tooky.github.com)
 
 
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rspec/instafail.rb

@@ -1,53 +1,9 @@
 module RSpec
-  klass = if defined? Spec
-    # rspec 1.x
-    require 'spec/runner/formatter/progress_bar_formatter'
-    class Instafail < Spec::Runner::Formatter::ProgressBarFormatter
-      def example_failed(example, counter, failure)
-        short_padding = '  '
-        padding = '     '
-
-        output.puts
-        output.puts red("#{short_padding}#{counter}) #{example_group.description} #{example.description}")
-        output.puts "#{padding}#{red(failure.exception)}"
-
-        format_backtrace(failure.exception.backtrace).each do |backtrace_info|
-          output.puts insta_gray("#{padding}# #{backtrace_info.strip}")
-        end
-
-        output.flush
-      end
-
-      private
-
-      # there is a gray() that returns nil, so we use our own...
-      def insta_gray(text)
-        colour(text, "\e[90m")
-      end
-    end
-    Instafail
-  else
-    # rspec 2.x
-    require 'rspec/core/formatters/progress_formatter'
-    class Instafail < RSpec::Core::Formatters::ProgressFormatter
-      def example_failed(example)
-        @counter ||= 0
-        @counter += 1
-        exception = example.metadata[:execution_result][:exception_encountered]
-        short_padding = '  '
-        padding = '     '
-        output.puts
-        output.puts "#{short_padding}#{@counter}) #{example.full_description}"
-        output.puts "#{padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
-        output.puts "#{padding}#{red(exception)}"
-        format_backtrace(exception.backtrace, example).each do |backtrace_info|
-          output.puts grey("#{padding}# #{backtrace_info}")
-        end
-        output.flush
-      end
-    end
-    Instafail
+  begin
+    require 'rspec/instafail/rspec_2'
+  rescue LoadError => try_rspec_1
+    require 'rspec/instafail/rspec_1'
   end
 
-  klass::VERSION = File.read( File.join(File.dirname(__FILE__),'..','..','VERSION') ).strip
+  Instafail::VERSION = File.read( File.join(File.dirname(__FILE__),'..','..','VERSION') ).strip
 end

data/lib/rspec/instafail/rspec_1.rb

@@ -0,0 +1,27 @@
+require 'spec/runner/formatter/progress_bar_formatter'
+
+module RSpec
+  class Instafail < Spec::Runner::Formatter::ProgressBarFormatter
+    def example_failed(example, counter, failure)
+      short_padding = '  '
+      padding = '     '
+
+      output.puts
+      output.puts red("#{short_padding}#{counter}) #{example_group.description} #{example.description}")
+      output.puts "#{padding}#{red(failure.exception)}"
+
+      [*format_backtrace(failure.exception.backtrace)].each do |backtrace_info|
+        output.puts insta_gray("#{padding}# #{backtrace_info.strip}")
+      end
+
+      output.flush
+    end
+
+    private
+
+    # there is a gray() that returns nil, so we use our own...
+    def insta_gray(text)
+      colour(text, "\e[90m")
+    end
+  end
+end

data/lib/rspec/instafail/rspec_2.rb

@@ -0,0 +1,21 @@
+require 'rspec/core/formatters/progress_formatter'
+
+module RSpec
+  class Instafail < RSpec::Core::Formatters::ProgressFormatter
+    def example_failed(example)
+      @counter ||= 0
+      @counter += 1
+      exception = example.metadata[:execution_result][:exception_encountered]
+      short_padding = '  '
+      padding = '     '
+      output.puts
+      output.puts "#{short_padding}#{@counter}) #{example.full_description}"
+      output.puts "#{padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
+      output.puts "#{padding}#{red(exception)}"
+      format_backtrace(exception.backtrace, example).each do |backtrace_info|
+        output.puts grey("#{padding}# #{backtrace_info}")
+      end
+      output.flush
+    end
+  end
+end

data/rspec-instafail.gemspec

@@ -5,17 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-instafail}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-11-15}
+  s.date = %q{2010-11-17}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Rakefile",
      "Readme.md",
      "VERSION",
      "lib/rspec/instafail.rb",
+     "lib/rspec/instafail/rspec_1.rb",
+     "lib/rspec/instafail/rspec_2.rb",
      "rspec-instafail.gemspec",
      "spec/instafail_spec.rb",
      "spec/rspec_1/Gemfile",

data/spec/instafail_spec.rb

@@ -5,27 +5,22 @@ describe 'RSpec::Instafail' do
   1\\) x a
      expected: 2,
      got: 1 \\(using ==\\)
-     # \\.\\/a_test\\.rb:5:
+     # (\\.\\/)?a_test\\.rb:5:(in `block \\(2 levels\\) in <top \\(required\\)>')?
 \\.\\.\\*\\.
 
 Pending:
 
 x d \\(TODO\\)
-\\.\\/a_test\\.rb:14
+(\\.\\/)?a_test\\.rb:14(\:in `block in <top \\(required\\)>')?
 
 1\\)
 'x a' FAILED
 expected: 2,
      got: 1 \\(using ==\\)
-\\./a_test\\.rb:5:
-
-Finished in \\d\\.\\d+ seconds
-
-5 examples, 1 failure, 1 pending
+(\\./)?a_test\\.rb:5:(in `block \\(2 levels\\) in <top \\(required\\)>')?
 EXP
 
     output.should =~ Regexp.new(expected_output, 'x')
-
   end
 
   it "works correctly with RSpec 2.x (but backtrace might be broken)" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,8 @@ files:
 - Readme.md
 - VERSION
 - lib/rspec/instafail.rb
+- lib/rspec/instafail/rspec_1.rb
+- lib/rspec/instafail/rspec_2.rb
 - rspec-instafail.gemspec
 - spec/instafail_spec.rb
 - spec/rspec_1/Gemfile