fuubar 2.0.0.beta2 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f44685ac1981f569de28308e206e23686a6b3b9
-  data.tar.gz: def73165132a4b1f3076f90d2e4a194b0f850900
+  metadata.gz: 0abf88de6fb0095bdb04fb5169ceaea6fa102694
+  data.tar.gz: 3953bf49610d3bc8a6761ed38504166345913ada
 SHA512:
-  metadata.gz: 7f46d0747f7335758bec1ff6ff60c755e29b3d9ad18c05d6a068e098dae0ce8415e942f1dc53fa8fe298b6f278132f146e3fd6b8b84b157f98d65b482b14ebc4
-  data.tar.gz: 44c714040f143bb1659581440e6d17b21782c08d023d12f6b429191e6312058b75401e9184683e347718b4511aba572ff19b6bbdc9ba01b5800f72b790a15238
+  metadata.gz: 98b9c655ebd6223fa135f437de49a02fc39575c80d2ed2aa6f939632090b94c2b212e15d72400166f122d633156eda809eb15da4004b4a8cee94d95bf8416697
+  data.tar.gz: 75d107b7738cbc371af239b45c9609e3be0a4606c3cff29f1cdd25144a66864fc2070c761b9b600e2e628b6a605f7f263a2f98bc7f2cebeba84e4218f159be62

data/lib/fuubar.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require 'rspec/core/formatters/base_text_formatter'
+require 'rspec/core/formatters/console_codes'
 require 'ruby-progressbar'
 
 RSpec.configuration.add_setting :fuubar_progress_bar_options, :default => {}
@@ -14,7 +15,10 @@ class Fuubar < RSpec::Core::Formatters::BaseTextFormatter
                                           :example_failed,
                                           :dump_failures
 
-  attr_accessor :progress
+  attr_accessor :progress,
+                :passed_count,
+                :pending_count,
+                :failed_count
 
   def initialize(*args)
     super
@@ -34,7 +38,10 @@ class Fuubar < RSpec::Core::Formatters::BaseTextFormatter
                                     :output         => output,
                                     :autostart      => false)
 
-    self.progress = ProgressBar.create(progress_bar_options)
+    self.progress      = ProgressBar.create(progress_bar_options)
+    self.passed_count  = 0
+    self.pending_count = 0
+    self.failed_count  = 0
 
     super
 
@@ -42,24 +49,23 @@ class Fuubar < RSpec::Core::Formatters::BaseTextFormatter
   end
 
   def example_passed(notification)
+    self.passed_count += 1
+
     increment
   end
 
   def example_pending(notification)
-    super
+    self.pending_count += 1
 
     increment
   end
 
   def example_failed(notification)
-    super
+    self.failed_count += 1
 
-    example = notification.example
     progress.clear
 
-    dump_failure    example, failed_examples.size - 1
-    dump_backtrace  example
-
+    output.puts notification.fully_formatted(failed_count)
     output.puts
 
     increment
@@ -93,19 +99,27 @@ class Fuubar < RSpec::Core::Formatters::BaseTextFormatter
   end
 
   def color_enabled?
-    super && !continuous_integration?
+    configuration.color_enabled? && !continuous_integration?
   end
 
   def current_color
-    if failed_examples.size > 0
+    if failed_count > 0
       configuration.failure_color
-    elsif pending_examples.size > 0
+    elsif pending_count > 0
       configuration.pending_color
     else
       configuration.success_color
     end
   end
 
+  def color_code_for(*args)
+    RSpec::Core::Formatters::ConsoleCodes.console_code_for(*args)
+  end
+
+  def configuration
+    RSpec.configuration
+  end
+
   def continuous_integration?
     @continuous_integration ||= !(ENV['CONTINUOUS_INTEGRATION'].nil? || ENV['CONTINUOUS_INTEGRATION'] == '' || ENV['CONTINUOUS_INTEGRATION'] == 'false')
   end

data/spec/fuubar_spec.rb

@@ -12,14 +12,14 @@ describe Fuubar do
     io
   end
 
-  let(:formatter)           { Fuubar.new(output) }
-  let(:example)             { RSpec::Core::ExampleGroup.describe.example }
-  let(:notification)        { OpenStruct.new(count:   2,
-                                             example: example,
-                                             message: 'My Message') }
-  let(:failed_notification) { OpenStruct.new(count:   2,
-                                             example: failed_example,
-                                             message: 'My Message') }
+  let(:formatter)            { Fuubar.new(output) }
+  let(:example)              { RSpec::Core::ExampleGroup.describe.example }
+  let(:example_count)        { 2 }
+  let(:start_notification)   { RSpec::Core::Notifications::StartNotification.new(example_count, Time.now) }
+  let(:message_notification) { RSpec::Core::Notifications::MessageNotification.new('My Message') }
+  let(:example_notification) { RSpec::Core::Notifications::ExampleNotification.for(example) }
+  let(:pending_notification) { RSpec::Core::Notifications::ExampleNotification.for(pending_example) }
+  let(:failed_notification)  { RSpec::Core::Notifications::ExampleNotification.for(failed_example) }
 
   let(:failed_example) do
     exception = RuntimeError.new('Test Fuubar Error')
@@ -29,15 +29,19 @@ describe Fuubar do
 
     example = RSpec::Core::ExampleGroup.describe.example
 
-    example.instance_variable_set(:@metadata, {
-      :file_path        => '/my/example/spec.rb',
-      :execution_result => {
-        :exception => exception },
-    } )
+    example.metadata[:file_path] = '/my/example/spec.rb'
+    example.metadata[:execution_result].status = :failed
+    example.metadata[:execution_result].exception = exception
 
     example
   end
 
+  let(:pending_example) do
+    example = RSpec::Core::ExampleGroup.describe.example
+    example.metadata[:execution_result].pending_fixed = true
+    example
+  end
+
   let(:fuubar_results) do
     output.rewind
     output.read
@@ -56,7 +60,7 @@ describe Fuubar do
     it 'does not start the bar until the formatter is started' do
       expect(formatter.progress).not_to be_started
 
-      formatter.start(notification)
+      formatter.start(start_notification)
 
       expect(formatter.progress).to be_started
     end
@@ -93,7 +97,7 @@ describe Fuubar do
 
       context 'when processing an example' do
         before do
-          formatter.start(notification)
+          formatter.start(start_notification)
 
           throttle      = formatter.progress.instance_variable_get(:@throttle)
           throttle_rate = throttle.instance_variable_set(:@period, 0.0)
@@ -124,7 +128,7 @@ describe Fuubar do
 
       context 'when processing an example' do
         before do
-          formatter.start(notification)
+          formatter.start(start_notification)
 
           throttle      = formatter.progress.instance_variable_get(:@throttle)
           throttle_rate = throttle.instance_variable_set(:@period, 0.0)
@@ -152,7 +156,7 @@ describe Fuubar do
     end
 
     context 'when the bar is started' do
-      before(:each) { formatter.start(notification) }
+      before(:each) { formatter.start(start_notification) }
 
       it 'properly creates the bar' do
         expect(formatter.progress.instance_variable_get(:@format_string)).to eql '%c'
@@ -161,7 +165,7 @@ describe Fuubar do
   end
 
   context 'when it is started' do
-    before { formatter.start(notification) }
+    before { formatter.start(start_notification) }
 
     it 'sets the total to the number of examples' do
       expect(formatter.progress.total).to eql 2
@@ -189,10 +193,11 @@ describe Fuubar do
       before do
         output.rewind
 
-        formatter.example_pending(notification)
+        formatter.example_pending(pending_example)
       end
 
       it 'outputs the proper bar information' do
+        formatter.progress.increment
         expect(fuubar_results).to start_with "\e[33m 1/2 |== 50 ==>        |  ETA: 00:00:00 \r\e[0m"
       end
 
@@ -200,7 +205,7 @@ describe Fuubar do
         before do
           output.rewind
 
-          formatter.example_pending(notification)
+          formatter.example_pending(pending_notification)
         end
 
         it 'outputs the pending bar' do
@@ -218,22 +223,6 @@ describe Fuubar do
         expect(fuubar_results).to end_with "\e[31m 1/2 |== 50 ==>        |  ETA: 00:00:00 \r\e[0m"
       end
 
-      it 'dumps the failure' do
-        allow(formatter).to receive(:dump_failure).
-                            and_return('dump failure')
-
-        allow(formatter).to receive(:dump_backtrace).
-                            and_return('dump backtrace')
-
-        formatter.example_failed(failed_notification)
-
-        expect(formatter).to have_received(:dump_failure).
-                             with(failed_example, 0)
-
-        expect(formatter).to have_received(:dump_backtrace).
-                             with(failed_example)
-      end
-
       context 'and then an example succeeds' do
         before do
           formatter.example_failed(failed_notification)
@@ -254,7 +243,7 @@ describe Fuubar do
 
           output.rewind
 
-          formatter.example_pending(notification)
+          formatter.example_pending(example_notification)
         end
 
         it 'outputs the failed bar' do
@@ -264,7 +253,7 @@ describe Fuubar do
     end
 
     it 'can properly log messages' do
-      formatter.message notification
+      formatter.message message_notification
 
       expect(fuubar_results).to end_with "My Message\n 0/2 |>                |  ETA: ??:??:?? \r"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuubar
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Nicholas Evans
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.beta
+        version: 3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.beta
+        version: 3.0.rc1
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement