nyan-cat-formatter 0.7.0 → 0.8.0

data/.travis.yml

@@ -1,4 +1,6 @@
-before_install: gem install bundler
+before_script:
+  - gem install bundler
+  - bundle install
 
 rvm:
   - 1.8.7

data/gemfiles/rspec2

@@ -1,4 +1,6 @@
-gem 'rspec', '~> 2.14'
+source 'https://rubygems.org'
+
+gem 'rspec', '~> 2.99'
 
 group :development do
   gem 'rake'

data/gemfiles/rspec2.lock

@@ -1,19 +1,20 @@
 GEM
+  remote: https://rubygems.org/
   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)
+    rake (10.3.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.0)
+    rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.99.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rake
-  rspec (~> 2.14)
+  rspec (~> 2.99)

data/lib/nyan_cat_format/helpers.rb

@@ -0,0 +1,7 @@
+module NyanCatFormat
+  module Helpers
+    def rspec_3_or_greater?
+      Gem::Version.new(RSpec::Core::Version::STRING).release >= Gem::Version.new('3.0.0')
+    end
+  end
+end

data/lib/nyan_cat_format/music.rb

@@ -1,6 +1,6 @@
 module NyanCatFormat
   module Music
-  
+
     MUSIC_LENGTH = 27.06 # seconds
 
     def osx?
@@ -59,11 +59,11 @@ module NyanCatFormat
       end
     end
 
-    def dump_summary(duration, example_count, failure_count, pending_count)
+    def dump_summary(*args)
       kill_music
       super
     end
-    
+
     private
 
     def play_on_linux

data/lib/nyan_cat_formatter/common.rb

@@ -9,10 +9,25 @@ module NyanCat
     ERROR    = '!'
     PENDING  = '+'
 
+    VT100_CODES =
+      {
+      :black   => 30,
+      :red     => 31,
+      :green   => 32,
+      :yellow  => 33,
+      :blue    => 34,
+      :magenta => 35,
+      :cyan    => 36,
+      :white   => 37,
+      :bold    => 1,
+    }
+
+    VT100_CODE_VALUES = VT100_CODES.invert
+
     def self.included(base)
       base.class_eval do
         attr_reader :current, :example_results, :color_index, :pending_count, :failure_count,
-          :example_count
+        :example_count
       end
     end
 
@@ -48,7 +63,7 @@ module NyanCat
     def dump_progress
       output.print(progress_lines.join("\n") + eol)
     end
-    
+
     def progress_lines
       padding = @example_count.to_s.length * 2 + 2
       [
@@ -131,15 +146,15 @@ module NyanCat
     # @return [Array] Nyan cats
     def ascii_cat(o = '^')
       [[ "_,------,   ",
-         "_|  /\\_/\\ ",
-         "~|_( #{o} .#{o})  ",
-      " \"\"  \"\" "
-      ],
-      [ "_,------,   ",
-        "_|   /\\_/\\",
-        "^|__( #{o} .#{o}) ",
-        " \" \"  \" \""
-      ]]
+          "_|  /\\_/\\ ",
+          "~|_( #{o} .#{o})  ",
+          " \"\"  \"\" "
+        ],
+        [ "_,------,   ",
+          "_|   /\\_/\\",
+          "^|__( #{o} .#{o}) ",
+          " \" \"  \" \""
+        ]]
     end
 
     # Colorizes the string with raindow colors of the rainbow
@@ -214,5 +229,36 @@ module NyanCat
     def cat_length
       nyan_cat.split("\n").group_by(&:size).max.first
     end
+
+    def success_color(text)
+      wrap(text, :success)
+    end
+
+    def pending_color(text)
+      wrap(text, :pending)
+    end
+
+    def failure_color(text)
+      wrap(text, :failure)
+    end
+
+    def console_code_for(code_or_symbol)
+      if VT100_CODE_VALUES.has_key?(code_or_symbol)
+        code_or_symbol
+      else
+        VT100_CODES.fetch(code_or_symbol) do
+          console_code_for(:white)
+        end
+      end
+    end
+
+    def wrap(text, code_or_symbol)
+      if RSpec.configuration.color_enabled?
+        "\e[#{console_code_for(code_or_symbol)}m#{text}\e[0m"
+      else
+        text
+      end
+    end
+
   end
 end

data/lib/nyan_cat_formatter/rspec3.rb

@@ -11,6 +11,8 @@ class RSpec3 < RSpec::Core::Formatters::BaseTextFormatter
 
   def initialize(output)
     super(output)
+    @failure_count = 0
+    @pending_count = 0
   end
 
   def start(notification)
@@ -37,25 +39,11 @@ class RSpec3 < RSpec::Core::Formatters::BaseTextFormatter
   end
 
   def example_pending(notification)
-    if notification.respond_to?(:example)
-      super(notification)
-    else
-      super(OpenStruct.new(:example => notification))
-    end
-
     @pending_count += 1
-
     tick PENDING
   end
 
   def example_failed(notification)
-    # TODO: Lazy fix for specs
-    if notification.respond_to?(:example)
-      super(notification)
-    else
-      super(OpenStruct.new(:example => notification))
-    end
-
     @failure_count += 1
     tick FAIL
   end
@@ -67,10 +55,9 @@ class RSpec3 < RSpec::Core::Formatters::BaseTextFormatter
   def dump_summary(notification)
     duration      = notification.duration
     failure_count = notification.failure_count
-    dump_profile if profile_examples? && failure_count == 0
     summary = "\nYou've Nyaned for #{format_duration(duration)}\n".split(//).map { |c| rainbowify(c) }
     output.puts summary.join
-    output.puts colorise_summary(notification)
+    output.puts notification.fully_formatted
     if respond_to?(:dump_commands_to_rerun_failed_examples)
       dump_commands_to_rerun_failed_examples
     end

data/lib/nyan_cat_music_formatter.rb

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 require 'nyan_cat_formatter'
 require 'nyan_cat_format/music'
+require 'nyan_cat_format/helpers'
 
 NyanCatMusicFormatter = Class.new(NyanCatFormatter) do
+  extend NyanCatFormat::Helpers
   include NyanCatFormat::Music
+
+  RSpec::Core::Formatters.register(self, :example_passed, :example_pending,
+    :example_failed, :start_dump, :start) if rspec_3_or_greater?
 end

data/lib/nyan_cat_verbose_formatter.rb

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 require 'nyan_cat_formatter'
 require 'nyan_cat_format/verbose'
+require 'nyan_cat_format/helpers'
 
 NyanCatVerboseFormatter = Class.new(NyanCatFormatter) do
+  extend NyanCatFormat::Helpers
   include NyanCatFormat::Verbose
+
+  RSpec::Core::Formatters.register(self, :example_passed, :example_pending,
+    :example_failed, :start_dump, :start) if rspec_3_or_greater?
 end

data/lib/nyan_cat_wide_formatter.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 require 'nyan_cat_formatter'
 require 'nyan_cat_format/wide'
+require 'nyan_cat_format/helpers'
 
 NyanCatWideFormatter = Class.new(NyanCatFormatter) do
+  extend NyanCatFormat::Helpers
   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
+    :example_failed, :start_dump, :start) if rspec_3_or_greater?
 end

data/lib/nyan_cat_wide_music_formatter.rb

@@ -1,9 +1,14 @@
 # -*- coding: utf-8 -*-
 require 'nyan_cat_formatter'
+require 'nyan_cat_format/helpers'
 require 'nyan_cat_format/wide'
 require 'nyan_cat_format/music'
 
 NyanCatWideMusicFormatter = Class.new(NyanCatFormatter) do
+  extend NyanCatFormat::Helpers
   include NyanCatFormat::Wide
   include NyanCatFormat::Music
+
+  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.7.0"
+  s.version     = "0.8.0"
   s.authors     = ["Matt Sears"]
   s.email       = ["matt@mattsears.com"]
   s.homepage    = "https://github.com/mattsears/nyan-cat-formatter"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rspec", ">= 2.14.2", ">= 2.99.0.beta1", "< 4"
+  s.add_dependency "rspec", ">= 2.14.2", ">= 2.99", "< 4"
 
   s.add_development_dependency "rake"
 end

data/spec/nyan_cat_music_formatter_spec.rb

@@ -68,12 +68,8 @@ describe NyanCatMusicFormatter do
       before { formatter.platform = 'linux'}
       it 'plays the song for linux too' do
         formatter.start 10
-        expect {
-          mock_kernel.seen.any? { |entry| entry. end_with? "mpg321 #{path_to_mp3} &>/dev/null &" }
-        }.to be
-        expect {
-          mock_kernel.seen.any? { |entry| entry. end_with? "mpg123 #{path_to_mp3} &>/dev/null &" } 
-        }.to be
+        expect(mock_kernel.seen.any? { |entry| entry. end_with? "mpg321 #{path_to_mp3} &>/dev/null &" }).to be
+        expect(mock_kernel.seen.any? { |entry| entry. end_with? "mpg123 #{path_to_mp3} &>/dev/null &" }).to be
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyan-cat-formatter
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -21,7 +21,7 @@ dependencies:
         version: 2.14.2
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: '2.99'
     - - <
       - !ruby/object:Gem::Version
         version: '4'
@@ -35,7 +35,7 @@ dependencies:
         version: 2.14.2
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: '2.99'
     - - <
       - !ruby/object:Gem::Version
         version: '4'
@@ -77,6 +77,7 @@ files:
 - gemfiles/rspec1.lock
 - gemfiles/rspec2
 - gemfiles/rspec2.lock
+- lib/nyan_cat_format/helpers.rb
 - lib/nyan_cat_format/music.rb
 - lib/nyan_cat_format/verbose.rb
 - lib/nyan_cat_format/wide.rb