rspec-nc 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1896186f478c686492227612152565cef066a07e
-  data.tar.gz: 56f02cf23432812b5603db870b2561481c1e555d
+  metadata.gz: 0b1796d62f6c54875750b5e0be927291392b0d3a
+  data.tar.gz: 44a512f7a0a22131af968a1e478a5c35e8aa7217
 SHA512:
-  metadata.gz: 63698aadc280f99e04cd6c0e1e8b844362e766f399bef0ce8212c0420393f215d774d8f55664cab2b337594fcd08dea194ad5a4a972a0d5c8e09ef5edf9b27cc
-  data.tar.gz: c2308686aec0c280510bc39e0fa137fafd6873a10bb30385b38288c9037afc066db121483858f132bfa39bcd0d5a94e744665d4436d30d29987888e714dfcb88
+  metadata.gz: f78e9cbec54f20211bf9533e5958e1bb314046fd4d950d439675a6274d7a922ca160c1773a92bc311ff2151e110ec3d424efff6004404ac46eca2deea4daaced
+  data.tar.gz: 734c11e4e6352af74e1be6fdf2402ee7e163a9c56f00bf4fc011d905e2f374a9be98a5806120170f8af4801c2cf7875d6813ffef096b822566a5f8f1a97ec6ab

data/README.markdown

@@ -41,6 +41,9 @@ The default rake task uses [WWTD] to test multiple versions of RSpec.
 
 ``` ruby
 rake
+
+# with a formatter
+FORMATTER=Nc rake
 ```
 
 [WWTD]: https://github.com/grosser/wwtd

data/Rakefile

@@ -4,6 +4,8 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'wwtd/tasks'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--format=#{ENV['FORMATTER']}" if ENV['FORMATTER']
+end
 
 task :default => :wwtd

data/lib/nc.rb

@@ -2,11 +2,26 @@ require 'rspec/core/formatters/base_text_formatter'
 require 'terminal-notifier'
 
 class Nc < RSpec::Core::Formatters::BaseTextFormatter
-  if RSpec::Core::Formatters.respond_to? :register
-    RSpec::Core::Formatters.register self.class, :example_failed
+
+  def self.rspec_3?
+    RSpec::Core::Version::STRING.split('.').first == "3"
+  end
+
+  if rspec_3?
+    RSpec::Core::Formatters.register self, :dump_summary
   end
 
-  def dump_summary(duration, example_count, failure_count, pending_count)
+  def dump_summary(*args)
+    if self.class.rspec_3?
+      notification = args[0]
+      duration = notification.duration
+      example_count = notification.example_count
+      failure_count = notification.failure_count
+      pending_count = notification.pending_count
+    else
+      duration, example_count, failure_count, pending_count = args
+    end
+
     body = []
     body << "Finished in #{_format_duration duration}"
     body << _summary_line(example_count, failure_count, pending_count)
@@ -22,8 +37,8 @@ class Nc < RSpec::Core::Formatters::BaseTextFormatter
     say title, body.join("\n")
   end
 
-  def dump_pending; end
-  def dump_failures; end
+  def dump_pending(*args); end
+  def dump_failures(*args); end
   def message(message); end
 
   private

data/lib/nc_fail.rb

@@ -1,6 +1,10 @@
 require 'nc'
 
 class NcFail < Nc
+  if rspec_3?
+    RSpec::Core::Formatters.register self, :example_failed
+  end
+
   def say(title, body)
     @failed_examples ||= []
     return if @failed_examples.size <= 0
@@ -8,6 +12,7 @@ class NcFail < Nc
   end
 
   def example_failed(failure)
+    @failed_examples ||= []
     @failed_examples << failure
   end
 end

data/lib/nc_first_fail.rb

@@ -1,7 +1,13 @@
 require 'nc'
 
 class NcFirstFail < Nc
+  if rspec_3?
+    RSpec::Core::Formatters.register self, :example_failed
+  end
+
   def example_failed(example)
+    # For rspec3
+    example = example.example if example.respond_to?(:example)
     @failed_examples ||= []
     if @failed_examples.size == 0
       name = File.basename(File.expand_path '.')
@@ -10,7 +16,8 @@ class NcFirstFail < Nc
     @failed_examples << example
   end
 
-  def dump_summary(duration, example_count, failure_count, pending_count)
+  def dump_summary(*args)
+    failure_count = self.class.rspec_3? ? args[0].failure_count : args[2]
     super if failure_count == 0
   end
 end

data/rspec-nc.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name = 'rspec-nc'
-  gem.version = '0.1.1'
+  gem.version = '0.2.0'
   gem.authors = ['Odin Dutton']
   gem.email = ['odindutton@gmail.com']
   gem.description = 'https://github.com/twe4ked/rspec-nc'

data/spec/nc_first_fail_spec.rb

@@ -7,24 +7,80 @@ describe NcFirstFail do
   let(:example2) { double 'example2' }
 
   let(:failure) { "\u26D4" }
+  let(:success) { "\u2705" }
   let(:exception) { 'exception' }
   let(:description) { 'description' }
 
-  it 'notifies the first failure only' do
-    allow(example).to receive(:metadata).and_return({:full_description => description})
-    allow(example).to receive(:exception).and_return(exception)
+  context 'with RSpec 2' do
+    before do
+      allow(formatter.class).to receive(:rspec_3?).and_return(false)
+    end
 
-    expect(TerminalNotifier).to receive(:notify).with("#{description}\n#{exception}",
-      :title => "#{failure} #{current_dir}: Failure"
-    )
+    it 'notifies the first failure only' do
+      allow(example).to receive(:metadata).and_return({:full_description => description})
+      allow(example).to receive(:exception).and_return(exception)
 
-    formatter.example_failed(example)
-    formatter.example_failed(example2)
+      expect(TerminalNotifier).to receive(:notify).with("#{description}\n#{exception}",
+        :title => "#{failure} #{current_dir}: Failure"
+      ).once
+
+      formatter.example_failed(example)
+      formatter.example_failed(example2)
+    end
+
+    it "doesn't notify in the end if there has been any failures" do
+      expect(TerminalNotifier).to_not receive(:notify)
+
+      formatter.dump_summary(0.0001, 2, 1, 0)
+    end
+
+    it 'notifies in the end if there is no failures' do
+      expect(TerminalNotifier).to receive(:notify).with(
+        "Finished in 0.0001 seconds\n2 examples, 0 failures",
+        :title => "#{success} #{current_dir}: Success"
+      )
+
+      formatter.dump_summary(0.0001, 2, 0, 0)
+    end
   end
 
-  it "doesn't notify in the end if there has been any failures" do
-    expect(TerminalNotifier).to_not receive(:notify)
+  context 'with RSpec 3' do
+    let(:notification) do
+      Struct.new(:duration, :example_count, :failure_count, :pending_count).new(0.0001, 3, 1, 1)
+    end
+    let(:success_notification) do
+      Struct.new(:duration, :example_count, :failure_count, :pending_count).new(0.0001, 2, 0, 0)
+    end
+
+    before do
+      allow(formatter.class).to receive(:rspec_3?).and_return(true)
+    end
+
+    it 'notifies the first failure only' do
+      allow(example).to receive(:metadata).and_return({:full_description => description})
+      allow(example).to receive(:exception).and_return(exception)
+
+      expect(TerminalNotifier).to receive(:notify).with("#{description}\n#{exception}",
+        :title => "#{failure} #{current_dir}: Failure"
+      ).once
+
+      formatter.example_failed(double(example: example))
+      formatter.example_failed(double(example: example2))
+    end
+
+    it "doesn't notify in the end if there has been any failures" do
+      expect(TerminalNotifier).to_not receive(:notify)
+
+      formatter.dump_summary(notification)
+    end
+
+    it 'notifies in the end if there is no failures' do
+      expect(TerminalNotifier).to receive(:notify).with(
+        "Finished in 0.0001 seconds\n2 examples, 0 failures",
+        :title => "#{success} #{current_dir}: Success"
+      )
 
-    formatter.dump_summary(0.0001, 2, 1, 0)
+      formatter.dump_summary(success_notification)
+    end
   end
 end

data/spec/nc_spec.rb

@@ -8,30 +8,54 @@ describe Nc do
   let(:success) { "\u2705" }
   let(:failure) { "\u26D4" }
 
-  it 'returns the summary' do
-    expect(TerminalNotifier).to receive(:notify).with(
-      "Finished in 0.0001 seconds\n3 examples, 1 failure, 1 pending",
-      :title => "#{failure} #{current_dir}: 1 failed example"
-    )
-
-    formatter.dump_summary(0.0001, 3, 1, 1)
+  context 'with RSpec 2' do
+    before do
+      allow(formatter.class).to receive(:rspec_3?).and_return(false)
+    end
+
+    it 'returns the summary' do
+      expect(TerminalNotifier).to receive(:notify).with(
+        "Finished in 0.0001 seconds\n3 examples, 1 failure, 1 pending",
+        :title => "#{failure} #{current_dir}: 1 failed example"
+      )
+
+      formatter.dump_summary(0.0001, 3, 1, 1)
+    end
+
+    it 'returns a failing notification' do
+      expect(TerminalNotifier).to receive(:notify).with(
+        "Finished in 0.0001 seconds\n1 example, 1 failure",
+        :title => "#{failure} #{current_dir}: 1 failed example"
+      )
+
+      formatter.dump_summary(0.0001, 1, 1, 0)
+    end
+
+    it 'returns a success notification' do
+      expect(TerminalNotifier).to receive(:notify).with(
+        "Finished in 0.0001 seconds\n1 example, 0 failures",
+        :title => "#{success} #{current_dir}: Success"
+      )
+
+      formatter.dump_summary(0.0001, 1, 0, 0)
+    end
   end
 
-  it 'returns a failing notification' do
-    expect(TerminalNotifier).to receive(:notify).with(
-      "Finished in 0.0001 seconds\n1 example, 1 failure",
-      :title => "#{failure} #{current_dir}: 1 failed example"
-    )
-
-    formatter.dump_summary(0.0001, 1, 1, 0)
-  end
-
-  it 'returns a success notification' do
-    expect(TerminalNotifier).to receive(:notify).with(
-      "Finished in 0.0001 seconds\n1 example, 0 failures",
-      :title => "#{success} #{current_dir}: Success"
-    )
-
-    formatter.dump_summary(0.0001, 1, 0, 0)
+  context 'with RSpec 3' do
+    let(:notification) {
+      Struct.new(:duration, :example_count, :failure_count, :pending_count).new(0.0001, 3, 1, 1)
+    }
+    before do
+      allow(formatter.class).to receive(:rspec_3?).and_return(true)
+    end
+
+    it 'shows the summary' do
+      expect(TerminalNotifier).to receive(:notify).with(
+        "Finished in 0.0001 seconds\n3 examples, 1 failure, 1 pending",
+        :title => "#{failure} #{current_dir}: 1 failed example"
+      )
+
+      formatter.dump_summary(notification)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-nc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Odin Dutton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-notifier