guard-rspec 0.1.7 → 0.1.8

data/lib/guard/rspec/formatters/default_rspec.rb

@@ -0,0 +1,14 @@
+require "#{File.dirname(__FILE__)}/../formatter"
+require 'rspec/core/formatters/progress_formatter'
+
+class DefaultRSpec < RSpec::Core::Formatters::ProgressFormatter
+  include Formatter
+  
+  def dump_summary(duration, total, failures, pending)
+    super # needed to keep progress formatter
+    
+    message = guard_message(total, failures, pending, duration)
+    image   = guard_image(failures, pending)
+    notify(message, image)
+  end
+end

data/lib/guard/rspec/formatters/default_spec.rb

@@ -0,0 +1,12 @@
+require "#{File.dirname(__FILE__)}/../formatter"
+require 'spec/runner/formatter/progress_bar_formatter'
+
+class DefaultSpec < Spec::Runner::Formatter::ProgressBarFormatter
+  include Formatter
+  
+  def dump_summary(duration, total, failures, pending)
+    message = guard_message(total, failures, pending, duration)
+    image   = guard_image(failures, pending)
+    notify(message, image)
+  end
+end

data/lib/guard/rspec/formatters/instafail_rspec.rb

@@ -0,0 +1,32 @@
+# Inspired from https://github.com/grosser/rspec-instafail/blob/master/lib/rspec/instafail.rb
+require "#{File.dirname(__FILE__)}/../formatter"
+require 'rspec/core/formatters/progress_formatter'
+
+class InstafailRSpec < RSpec::Core::Formatters::ProgressFormatter
+  include Formatter
+  
+  def dump_summary(duration, total, failures, pending)
+    super # needed to keep progress formatter
+    
+    message = guard_message(total, failures, pending, duration)
+    image   = guard_image(failures, pending)
+    notify(message, image)
+  end
+  
+  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

data/lib/guard/rspec/formatters/instafail_spec.rb

@@ -0,0 +1,35 @@
+# Inspired from https://github.com/grosser/rspec-instafail/blob/master/lib/rspec/instafail.rb
+require "#{File.dirname(__FILE__)}/../formatter"
+require 'spec/runner/formatter/progress_bar_formatter'
+
+class InstafailSpec < Spec::Runner::Formatter::ProgressBarFormatter
+  include Formatter
+  
+  def dump_summary(duration, total, failures, pending)
+    message = guard_message(total, failures, pending, duration)
+    image   = guard_image(failures, pending)
+    notify(message, image)
+  end
+  
+  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

data/lib/guard/rspec/runner.rb

@@ -21,16 +21,16 @@ module Guard
           cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].is_a?(Array)
           cmd_parts << "bundle exec" if bundler? && options[:bundler] != false
           
+          formatter = options[:formatter] || "default"
           case rspec_version
           when 1
             cmd_parts << "spec"
+            cmd_parts << "--require #{File.dirname(__FILE__)}/formatters/#{formatter}_spec.rb --format #{formatter.capitalize}Spec"
           when 2
             cmd_parts << "rspec"
+            cmd_parts << "--require #{File.dirname(__FILE__)}/formatters/#{formatter}_rspec.rb --format #{formatter.capitalize}RSpec"
           end
           
-          formatter = options[:formatter] || "default"
-          cmd_parts << "--require #{File.dirname(__FILE__)}/formatters/#{formatter}.rb --format #{formatter.capitalize}"
-          
           cmd_parts << "--drb" if options[:drb] == true
           cmd_parts << "--color" if options[:color] != false
           cmd_parts << "--fail-fast" if options[:fail_fast] == true

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-rspec
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,8 +77,10 @@ extra_rdoc_files: []
 
 files: 
 - lib/guard/rspec/formatter.rb
-- lib/guard/rspec/formatters/default.rb
-- lib/guard/rspec/formatters/instafail.rb
+- lib/guard/rspec/formatters/default_rspec.rb
+- lib/guard/rspec/formatters/default_spec.rb
+- lib/guard/rspec/formatters/instafail_rspec.rb
+- lib/guard/rspec/formatters/instafail_spec.rb
 - lib/guard/rspec/inspector.rb
 - lib/guard/rspec/runner.rb
 - lib/guard/rspec/templates/Guardfile

data/lib/guard/rspec/formatters/default.rb

@@ -1,29 +0,0 @@
-require "#{File.dirname(__FILE__)}/../formatter"
-
-if defined?(Spec)
-  # RSpec 1.x
-  require 'spec/runner/formatter/progress_bar_formatter'
-  class Default < Spec::Runner::Formatter::ProgressBarFormatter
-    include Formatter
-    
-    def dump_summary(duration, total, failures, pending)
-      message = guard_message(total, failures, pending, duration)
-      image   = guard_image(failures, pending)
-      notify(message, image)
-    end
-  end
-else
-  # RSpec 2.x
-  require 'rspec/core/formatters/progress_formatter'
-  class Default < RSpec::Core::Formatters::ProgressFormatter
-    include Formatter
-    
-    def dump_summary(duration, total, failures, pending)
-      super # needed to keep progress formatter
-      
-      message = guard_message(total, failures, pending, duration)
-      image   = guard_image(failures, pending)
-      notify(message, image)
-    end
-  end
-end

data/lib/guard/rspec/formatters/instafail.rb

@@ -1,69 +0,0 @@
-# Inspired from https://github.com/grosser/rspec-instafail/blob/master/lib/rspec/instafail.rb
-require "#{File.dirname(__FILE__)}/../formatter"
-
-if defined?(Spec)
-  # RSpec 1.x
-  require 'spec/runner/formatter/progress_bar_formatter'
-  class Instafail < Spec::Runner::Formatter::ProgressBarFormatter
-    include Formatter
-    
-    def dump_summary(duration, total, failures, pending)
-      message = guard_message(total, failures, pending, duration)
-      image   = guard_image(failures, pending)
-      notify(message, image)
-    end
-    
-    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
-else
-  # RSpec 2.x
-  require 'rspec/core/formatters/progress_formatter'
-  class Instafail < RSpec::Core::Formatters::ProgressFormatter
-    include Formatter
-    
-    def dump_summary(duration, total, failures, pending)
-      super # needed to keep progress formatter
-      
-      message = guard_message(total, failures, pending, duration)
-      image   = guard_image(failures, pending)
-      notify(message, image)
-    end
-    
-    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