[DRE-commits] [ruby-rspec-instafail] 43/126: Require rspec formatter in rspec version file

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository ruby-rspec-instafail.

commit a01a1b7f65477d2aededf317a2bd8f88f5007529
Author: Steve Tooke <steve.tooke at gmail.com>
Date:   Tue Nov 16 23:23:33 2010 +0000

    Require rspec formatter in rspec version file
---
 lib/rspec/instafail.rb         | 4 ----
 lib/rspec/instafail/rspec_1.rb | 2 ++
 lib/rspec/instafail/rspec_2.rb | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/rspec/instafail.rb b/lib/rspec/instafail.rb
index 8a04132..afa5e85 100644
--- a/lib/rspec/instafail.rb
+++ b/lib/rspec/instafail.rb
@@ -1,11 +1,7 @@
 module RSpec
   begin
-    # rspec 2.x
-    require 'rspec/core/formatters/progress_formatter'
     require 'rspec/instafail/rspec_2'
   rescue LoadError => try_rspec_1
-    # rspec 1.x
-    require 'spec/runner/formatter/progress_bar_formatter'
     require 'rspec/instafail/rspec_1'
   end
 
diff --git a/lib/rspec/instafail/rspec_1.rb b/lib/rspec/instafail/rspec_1.rb
index 8f2a239..5475f87 100644
--- a/lib/rspec/instafail/rspec_1.rb
+++ b/lib/rspec/instafail/rspec_1.rb
@@ -1,3 +1,5 @@
+require 'spec/runner/formatter/progress_bar_formatter'
+
 module RSpec
   class Instafail < Spec::Runner::Formatter::ProgressBarFormatter
     def example_failed(example, counter, failure)
diff --git a/lib/rspec/instafail/rspec_2.rb b/lib/rspec/instafail/rspec_2.rb
index e5e0724..33c4ef3 100644
--- a/lib/rspec/instafail/rspec_2.rb
+++ b/lib/rspec/instafail/rspec_2.rb
@@ -1,3 +1,5 @@
+require 'rspec/core/formatters/progress_formatter'
+
 module RSpec
   class Instafail < RSpec::Core::Formatters::ProgressFormatter
     def example_failed(example)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec-instafail.git