nyan-cat-formatter 0.0.3 → 0.0.4

data/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Matt Sears
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -12,6 +12,8 @@ This is my take on the Nyan Cat RSpec Formatter. It simply creates a rainbow tra
 
 The rainbow changes colors as it runs. See it in action [here](http://vimeo.com/32424001).
 
+Works with RSpec 1.3 and RSpec 2.
+
 ```
 rspec --format NyanCatFormatter
 ```

data/lib/nyan_cat_formatter.rb

@@ -1,7 +1,17 @@
 # -*- coding: utf-8 -*-
-require 'rspec/core/formatters/base_text_formatter'
 
-class NyanCatFormatter < RSpec::Core::Formatters::BaseTextFormatter
+rspec_bin = $0.split('/').last
+if rspec_bin == 'rspec'
+  ['rspec2','rspec/core/formatters/base_text_formatter'].each {|f| require f}
+  parent_class = RSpec::Core::Formatters::BaseTextFormatter
+  rspec_module = RSpec2
+elsif rspec_bin == 'spec'
+  ['spec', 'rspec1', 'spec/runner/formatter/base_text_formatter'].each {|f| require f}
+  parent_class = Spec::Runner::Formatter::BaseTextFormatter
+  rspec_module = RSpec1
+end
+
+NyanCatFormatter = Class.new(parent_class) do
 
   ESC      = "\e["
   NND      = "#{ESC}0m"
@@ -11,77 +21,27 @@ class NyanCatFormatter < RSpec::Core::Formatters::BaseTextFormatter
   ERROR    = '!'
   PENDING  = '+'
 
-  attr_reader :current, :example_results, :color_index
-
-  def start(example_count)
-    super(example_count)
-    @current, @color_index, @passing_count = 0,0,0
-    @example_results = []
-  end
-
-  def example_passed(example)
-    super(example)
-    tick PASS
-  end
+  include rspec_module
 
-  def example_pending(example)
-    super(example)
-    @pending_count =+1
-    tick PENDING
-  end
-
-  def example_failed(example)
-    super(example)
-    @failure_count =+1
-    tick FAIL
-  end
-
-  def start_dump
-    @current = @example_count
-  end
-
-  def dump_summary(duration, example_count, failure_count, pending_count)
-    dump_profile if profile_examples? && failure_count == 0
-    summary = "\nNyan Cat flew #{format_seconds(duration)} seconds".split(//).map { |c| rainbowify(c) }
-    output.puts summary.join
-    output.puts colorise_summary(summary_line(example_count, failure_count, pending_count))
-
-    if respond_to?(:dump_commands_to_rerun_failed_examples)
-      dump_commands_to_rerun_failed_examples
-    end
-  end
-
-  def dump_failures
-    #no op
-  end
+  attr_reader :current, :example_results, :color_index, :pending_count,
+              :failure_count, :example_count
 
   # Increments the example count and displays the current progress
   #
   # @returns nothing
   def tick(mark = PASS)
     @example_results << mark
-    @current =  (@current > @example_count) ? @example_count : @current + 1
+    @current = (@current > @example_count) ? @example_count : @current + 1
     dump_progress
   end
 
-  # Creates a rainbow trail
-  #
-  # @return [String] the sprintf format of the Nyan cat
-  def nyan_trail
-    marks = @example_results.map{ |mark| highlight(mark) }
-    marks.shift(current_width - terminal_width) if current_width > terminal_width
-    nyan_cat_lines = nyan_cat.split("\n").each_with_index.map do |line, index|
-      format("%s#{line}", marks.join)
-    end.join("\n")
-  end
-
   # Determine which Ascii Nyan Cat to display. If tests are complete,
   # Nyan Cat goes to sleep. If there are failing or pending examples,
   # Nyan Cat is concerned.
   #
   # @return [String] Nyan Cat
   def nyan_cat
-    if @failure_count > 0 || @pending_count > 0
+    if @failure_count.to_i > 0 || @pending_count.to_i > 0
       ascii_cat('o')[@color_index%2].join("\n") #'~|_(o.o)'
     elsif (@current == @example_count)
       ascii_cat('-')[@color_index%2].join("\n") # '~|_(-.-)'
@@ -133,11 +93,24 @@ class NyanCatFormatter < RSpec::Core::Formatters::BaseTextFormatter
   #
   # @return [Array]
   def scoreboard
-    padding = @example_count.to_s.length + 9
-    [ @current.to_s.rjust( @example_count.to_s.length),
-      green(@current - @pending_examples.size - @failed_examples.size).rjust(padding),
-      yellow(@pending_examples.size).rjust(padding),
-      red(@failed_examples.size).rjust(padding) ]
+    @pending_examples ||= []
+    @failed_examples ||= []
+    padding = @example_count.to_s.length
+    [ @current.to_s.rjust(padding),
+      green((@current - @pending_examples.size - @failed_examples.size).to_s.rjust(padding)),
+      yellow(@pending_count.to_s.rjust(padding)),
+      red(@failure_count.to_s.rjust(padding)) ]
+  end
+
+  # Creates a rainbow trail
+  #
+  # @return [String] the sprintf format of the Nyan cat
+  def nyan_trail
+    marks = @example_results.map{ |mark| highlight(mark) }
+    marks.shift(current_width - terminal_width) if current_width >= terminal_width
+    nyan_cat_lines = nyan_cat.split("\n").each_with_index.map do |line, index|
+      format("%s#{line}", marks.join)
+    end.join("\n")
   end
 
   # Ascii version of Nyan cat. Two cats in the array allow Nyan to animate running.
@@ -187,9 +160,10 @@ class NyanCatFormatter < RSpec::Core::Formatters::BaseTextFormatter
   # @return [String]
   def highlight(mark = PASS)
     case mark
-    when PASS;  rainbowify PASS_ARY[@color_index%2]
-    when FAIL;  red mark
-    when ERROR; yellow mark
+    when PASS; rainbowify PASS_ARY[@color_index%2]
+    when FAIL; "\e[31m#{mark}\e[0m"
+    when ERROR; "\e[33m#{mark}\e[0m"
+    when PENDING; "\e[33m#{mark}\e[0m"
     else mark
     end
   end

data/lib/rspec1.rb

@@ -0,0 +1,61 @@
+module RSpec1
+
+  def start(example_count)
+    super(example_count)
+    @example_count = example_count
+    @current = @color_index = @passing_count = @failure_count = @pending_count = 0
+    @example_results = []
+  end
+
+  def example_passed(example)
+    super
+    @passing_count += 1
+    tick PASS
+  end
+
+  def example_pending(example, message = nil)
+    super
+    @pending_count =+1
+    tick PENDING
+  end
+
+  def example_failed(example, counter = nil, failure = nil)
+    super
+    @failure_count =+1
+    tick FAIL
+  end
+
+  def start_dump
+    @current = @example_count
+  end
+
+  def dump_pending
+    output.puts "\e[0;33m"
+    super
+  end
+
+  def dump_failure(*args)
+    output.puts "\e[0;31m"
+    super
+  end
+
+  def dump_summary(duration, example_count, failure_count, pending_count)
+    @output.puts "\nNyan Cat flew #{duration} seconds\n".each_char.map {|c| rainbowify(c)}.join
+    summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+    summary << ", #{pending_count} pending" if pending_count > 0
+
+    if failure_count == 0
+      @output.puts red(summary)
+    elsif pending_count > 0
+      @output.puts yellow(summary)
+    else
+      @output.puts green(summary)
+    end
+    @output.flush
+  end
+
+  def dump_failures
+    #no op
+  end
+
+end

data/lib/rspec2.rb

@@ -0,0 +1,45 @@
+module RSpec2
+
+  def start(example_count)
+    super(example_count)
+    @current = @color_index = @passing_count = 0
+    @example_results = []
+  end
+
+  def example_passed(example)
+    super(example)
+    tick PASS
+  end
+
+  def example_pending(example)
+    super(example)
+    @pending_count =+1
+    tick PENDING
+  end
+
+  def example_failed(example)
+    super(example)
+    @failure_count =+1
+    tick FAIL
+  end
+
+  def start_dump
+    @current = @example_count
+  end
+
+  def dump_summary(duration, example_count, failure_count, pending_count)
+    dump_profile if profile_examples? && failure_count == 0
+    summary = "\nNyan Cat flew #{format_seconds(duration)} seconds".split(//).map { |c| rainbowify(c) }
+    output.puts summary.join
+    output.puts colorise_summary(summary_line(example_count, failure_count, pending_count))
+
+    if respond_to?(:dump_commands_to_rerun_failed_examples)
+      dump_commands_to_rerun_failed_examples
+    end
+  end
+
+  def dump_failures
+    #no op
+  end
+
+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.0.3"
+  s.version     = "0.0.4"
   s.authors     = ["Matt Sears"]
   s.email       = ["matt@mattsears.com"]
   s.homepage    = "http://mtts.rs/nyancat"

data/spec/nyan_cat_formatter_spec.rb

@@ -4,10 +4,18 @@ require 'stringio'
 describe NyanCatFormatter do
 
   before do
+    rspec_bin = $0.split('/').last
     @output = StringIO.new
-    @formatter = NyanCatFormatter.new(@output)
+    if rspec_bin == 'rspec'
+      @formatter = NyanCatFormatter.new(@output)
+      @example = RSpec::Core::ExampleGroup.describe.example
+    else
+      formatter_options = OpenStruct.new(:colour => true, :dry_run => false, :autospec => nil)
+      @formatter = NyanCatFormatter.new(formatter_options, @output)
+      @example = Spec::Example::ExampleProxy.new("should pass")
+      @formatter.instance_variable_set(:@example_group, OpenStruct.new(:description => "group"))
+    end
     @formatter.start(2)
-    @example = RSpec::Core::ExampleGroup.describe.example
     sleep(0.1)  # Just to slow it down a little :-)
   end
 

metadata

@@ -1,89 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nyan-cat-formatter
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Matt Sears
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70322272045780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: "Nyan Cat inspired RSpec formatter! "
-email: 
+  prerelease: false
+  version_requirements: *70322272045780
+description: ! 'Nyan Cat inspired RSpec formatter! '
+email:
 - matt@mattsears.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - lib/nyan_cat_formatter.rb
+- lib/rspec1.rb
+- lib/rspec2.rb
 - nyan-cat-formatter.gemspec
 - spec/nyan_cat_formatter_spec.rb
 - spec/spec_helper.rb
 homepage: http://mtts.rs/nyancat
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nyan-cat-formatter
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Nyan Cat inspired RSpec formatter!
-test_files: 
+test_files:
 - spec/nyan_cat_formatter_spec.rb
 - spec/spec_helper.rb