[DRE-commits] [ruby-rspec-instafail] 01/04: Imported Upstream version 0.4.0

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository ruby-rspec-instafail.

commit 0fec03982b792bbd337151767b9f98dd58da3c88
Author: Hideki Yamane <henrich at debian.org>
Date:   Mon Nov 16 03:19:36 2015 +0900

    Imported Upstream version 0.4.0
---
 lib/rspec/instafail.rb         | 18 ++----------------
 lib/rspec/instafail/rspec_3.rb |  3 +--
 lib/rspec/instafail/version.rb |  2 +-
 metadata.yml                   |  4 ++--
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lib/rspec/instafail.rb b/lib/rspec/instafail.rb
index 05145a8..e08e473 100755
--- a/lib/rspec/instafail.rb
+++ b/lib/rspec/instafail.rb
@@ -1,18 +1,4 @@
 module RSpec
-  # Rails 3: when installed as plugin, lib is not in load-path when running tests
-  # https://github.com/grosser/rspec-instafail/pull/3
-  lib = File.expand_path(File.dirname(File.dirname(__FILE__)))
-  $LOAD_PATH << lib unless $LOAD_PATH.include?(lib)
-
-  if defined?(::RSpec::Core) && ::RSpec::Core::Version::STRING >= '3.0.0'
-    require "rspec/instafail/rspec_3"
-  else
-    begin
-      require "rspec/instafail/rspec_2"
-    rescue LoadError # try rspec 1
-      require "rspec/instafail/rspec_1"
-    end
-  end
-
-  require 'rspec/instafail/version'
+  version = Gem.loaded_specs["rspec"].version
+  require "rspec/instafail/rspec_#{[3, version.segments.first].min}"
 end
diff --git a/lib/rspec/instafail/rspec_3.rb b/lib/rspec/instafail/rspec_3.rb
index 93321ee..d062532 100755
--- a/lib/rspec/instafail/rspec_3.rb
+++ b/lib/rspec/instafail/rspec_3.rb
@@ -6,13 +6,12 @@ module RSpec
 
     def initialize(output)
       super
-      @output = output
       @failed_examples = []
     end
 
     def example_failed(failure)
       @failed_examples << failure.example
-      @output.puts failure.fully_formatted(@failed_examples.size)
+      output.puts failure.fully_formatted(@failed_examples.size)
     end
   end
 end
diff --git a/lib/rspec/instafail/version.rb b/lib/rspec/instafail/version.rb
index ce28ecd..998b01e 100755
--- a/lib/rspec/instafail/version.rb
+++ b/lib/rspec/instafail/version.rb
@@ -1,5 +1,5 @@
 module RSpec
   class Instafail
-    VERSION = '0.2.6'
+    VERSION = '0.4.0'
   end
 end
diff --git a/metadata.yml b/metadata.yml
index 60cd0c8..99a62d2 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-instafail
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec

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