nyan-cat-formatter 0.6.0 → 0.7.0

data/.travis.yml

@@ -1,3 +1,5 @@
+before_install: gem install bundler
+
 rvm:
   - 1.8.7
   - 1.9.2
@@ -6,5 +8,4 @@ rvm:
   - ree
 gemfile:
   - Gemfile
-  - gemfiles/rspec1.gemfile
   - gemfiles/rspec2.gemfile

data/Rakefile

@@ -1,6 +1,8 @@
+require 'bundler/setup'
 require "bundler/gem_tasks"
 
-task :default => :spec
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
+
+desc 'Default: run the rspec examples'
+task :default => :spec

data/gemfiles/rspec1.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (10.1.1)
+    rspec (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec (~> 1)

data/gemfiles/rspec2.lock

@@ -0,0 +1,19 @@
+GEM
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec (~> 2.14)

data/lib/nyan_cat_format/verbose.rb

@@ -0,0 +1,10 @@
+module NyanCatFormat
+  module Verbose
+    def progress_lines
+      [
+        format("%-#{terminal_width}s", finished? ? '' : "running: #{example_name}"),
+      ].concat(super)
+    end
+
+  end
+end

data/lib/nyan_cat_formatter/common.rb

@@ -46,12 +46,17 @@ module NyanCat
     #
     # @return nothing
     def dump_progress
+      output.print(progress_lines.join("\n") + eol)
+    end
+    
+    def progress_lines
       padding = @example_count.to_s.length * 2 + 2
-      line = nyan_trail.split("\n").each_with_index.inject([]) do |result, (trail, index)|
-        value = "#{scoreboard[index]}/#{@example_count}:"
-        result << format("%s %s", value, trail)
-      end.join("\n")
-      output.print line + eol
+      [
+        nyan_trail.split("\n").each_with_index.inject([]) do |result, (trail, index)|
+          value = "#{scoreboard[index]}/#{@example_count}:"
+          result << format("%s %s", value, trail)
+        end
+      ].flatten
     end
 
     # Determines how we end the trail line. If complete, return a newline etc.
@@ -59,7 +64,7 @@ module NyanCat
     # @return [String]
     def eol
       return "\n" if @current == @example_count
-      length = (nyan_cat.split("\n").length - 1)
+      length = progress_lines.length - 1
       length > 0 ? format("\e[1A" * length + "\r") : "\r"
     end
 

data/lib/nyan_cat_formatter/rspec2.rb

@@ -1,12 +1,19 @@
 class RSpec2 < RSpec::Core::Formatters::BaseTextFormatter
   include NyanCat::Common
 
+  attr_reader :example_name
+
   def start(example_count)
     super(example_count)
     @current = @color_index = @passing_count = 0
     @example_results = []
   end
 
+  def example_started(example)
+    super(example)
+    @example_name = example.full_description
+  end
+
   def example_passed(example)
     super(example)
     tick PASS

data/lib/nyan_cat_formatter/rspec3.rb

@@ -4,7 +4,9 @@ require 'ostruct'
 class RSpec3 < RSpec::Core::Formatters::BaseTextFormatter
   include NyanCat::Common
 
-  RSpec::Core::Formatters.register self, :example_passed, :example_pending,
+  attr_reader :example_name
+
+  RSpec::Core::Formatters.register self, :example_started, :example_passed, :example_pending,
     :example_failed, :start_dump, :start
 
   def initialize(output)
@@ -23,6 +25,13 @@ class RSpec3 < RSpec::Core::Formatters::BaseTextFormatter
     @example_results = []
   end
 
+  def example_started(notification)
+    if notification.respond_to?(:example)
+      notification = notification.example
+    end
+    @example_name = notification.full_description
+  end
+
   def example_passed(notification)
     tick PASS
   end

data/lib/nyan_cat_verbose_formatter.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+require 'nyan_cat_formatter'
+require 'nyan_cat_format/verbose'
+
+NyanCatVerboseFormatter = Class.new(NyanCatFormatter) do
+  include NyanCatFormat::Verbose
+end

data/lib/nyan_cat_wide_formatter.rb

@@ -4,4 +4,9 @@ require 'nyan_cat_format/wide'
 
 NyanCatWideFormatter = Class.new(NyanCatFormatter) do
   include NyanCatFormat::Wide
+
+  rspec_3_or_greater = Gem::Version.new(RSpec::Core::Version::STRING).release >= Gem::Version.new('3.0.0')
+
+  RSpec::Core::Formatters.register(self, :example_passed, :example_pending,
+    :example_failed, :start_dump, :start) if rspec_3_or_greater
 end

data/nyan-cat-formatter.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "nyan-cat-formatter"
-  s.version     = "0.6.0"
+  s.version     = "0.7.0"
   s.authors     = ["Matt Sears"]
   s.email       = ["matt@mattsears.com"]
   s.homepage    = "https://github.com/mattsears/nyan-cat-formatter"

data/spec/nyan_cat_formatter_spec.rb

@@ -16,7 +16,14 @@ describe NyanCatFormatter do
       @formatter.instance_variable_set(:@example_group, OpenStruct.new(:description => "group"))
     end
     @formatter.start(2)
-    sleep(0.1)  # Just to slow it down a little :-)
+    @formatter.example_started(@example)
+  end
+
+  shared_examples 'a test' do
+    it 'should call the increment method' do
+      expect(@formatter).to receive(:tick)
+      @formatter.example_passed(@example)
+    end
   end
 
   describe 'passed, pending and failed' do
@@ -26,11 +33,7 @@ describe NyanCatFormatter do
     end
 
     describe 'example_passed' do
-
-      it 'should call the increment method' do
-        expect(@formatter).to receive(:tick)
-        @formatter.example_passed(@example)
-      end
+      it_behaves_like 'a test'
 
       it 'should relax Nyan Cat' do
         @formatter.example_passed(@example)
@@ -48,11 +51,7 @@ describe NyanCatFormatter do
     end
 
     describe 'example_pending' do
-
-      it 'should call the tick method' do
-        expect(@formatter).to receive(:tick)
-        @formatter.example_pending(@example)
-      end
+      it_behaves_like 'a test'
 
       it 'should increment the pending count' do
         expect {
@@ -73,11 +72,7 @@ describe NyanCatFormatter do
     end
 
     describe 'example_failed' do
-
-      it 'should call the increment method' do
-        expect(@formatter).to receive(:tick)
-        @formatter.example_failed(@example)
-      end
+      it_behaves_like 'a test'
 
       it 'should increment the failure count' do
         expect {

data/spec/nyan_cat_verbose_formatter_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'stringio'
+require 'nyan_cat_verbose_formatter'
+
+describe NyanCatVerboseFormatter do
+  before(:all) do
+    @output = StringIO.new
+    @formatter = described_class.new(@output)
+  end
+
+  before(:each) do
+    @formatter.start(1)
+  end
+
+  it 'displays "running" line with name of test on the first line' do
+    expect(@formatter.progress_lines.first).to include('running: ')
+  end
+
+  context 'this was the last test' do
+    before(:each) do
+      allow(@formatter).to receive(:finished?).and_return(true)
+    end
+
+    it 'should display an empty first line' do
+      expect(@formatter.progress_lines.first.scan(/[^ ]/)).to be_empty
+    end
+  end
+
+end

data/spec/nyan_cat_wide_formatter_spec.rb

@@ -15,6 +15,16 @@ describe NyanCatWideFormatter do
       @whole_net_width = 100 - 2*2 - 6 - 11
     end
 
+    context "for rspec 3" do
+      context "to avoid deprecation warnings" do
+        it "registers a nyan cat wide formatter compatible with rspec 3 format" do
+          if Gem::Version.new(RSpec::Core::Version::STRING).release >= Gem::Version.new('3.0.0')
+            expect(RSpec::Core::Formatters::Loader.formatters.keys).to include(NyanCatWideFormatter)
+          end
+        end
+      end
+    end
+
     context "for 35 examples" do
       before do
         @formatter.start(35)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyan-cat-formatter
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -74,8 +74,11 @@ files:
 - data/nyan-cat.mp3
 - demo.rb
 - gemfiles/rspec1
+- gemfiles/rspec1.lock
 - gemfiles/rspec2
+- gemfiles/rspec2.lock
 - lib/nyan_cat_format/music.rb
+- lib/nyan_cat_format/verbose.rb
 - lib/nyan_cat_format/wide.rb
 - lib/nyan_cat_formatter.rb
 - lib/nyan_cat_formatter/common.rb
@@ -83,12 +86,14 @@ files:
 - lib/nyan_cat_formatter/rspec2.rb
 - lib/nyan_cat_formatter/rspec3.rb
 - lib/nyan_cat_music_formatter.rb
+- lib/nyan_cat_verbose_formatter.rb
 - lib/nyan_cat_wide_formatter.rb
 - lib/nyan_cat_wide_music_formatter.rb
 - nyan-cat-formatter.gemspec
 - nyan_example.gif
 - spec/nyan_cat_formatter_spec.rb
 - spec/nyan_cat_music_formatter_spec.rb
+- spec/nyan_cat_verbose_formatter_spec.rb
 - spec/nyan_cat_wide_formatter_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mattsears/nyan-cat-formatter
@@ -118,6 +123,7 @@ summary: Nyan Cat inspired RSpec formatter!
 test_files:
 - spec/nyan_cat_formatter_spec.rb
 - spec/nyan_cat_music_formatter_spec.rb
+- spec/nyan_cat_verbose_formatter_spec.rb
 - spec/nyan_cat_wide_formatter_spec.rb
 - spec/spec_helper.rb
 has_rdoc: