nyan-cat-formatter 0.5.2 → 0.6.0

data/.travis.yml

@@ -2,4 +2,9 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.1.0
   - ree
+gemfile:
+  - Gemfile
+  - gemfiles/rspec1.gemfile
+  - gemfiles/rspec2.gemfile

data/README.md

@@ -7,7 +7,7 @@ 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.
+Works with RSpec 1.3, 2 and 3.
 
 Using  Nyan Cat
 ---------------

data/gemfiles/rspec1

@@ -0,0 +1,9 @@
+source :rubygems
+
+gem 'rspec', '~> 1'
+
+group :development do
+  gem 'rake'
+end
+
+# vi:ft=ruby

data/gemfiles/rspec2

@@ -0,0 +1,7 @@
+gem 'rspec', '~> 2.14'
+
+group :development do
+  gem 'rake'
+end
+
+#vi:ft=ruby

data/lib/nyan_cat_formatter.rb

@@ -1,223 +1,20 @@
 # -*- coding: utf-8 -*-
 
+require 'nyan_cat_formatter/common'
+
 rspec_bin = $0.split('/').last
 if rspec_bin == 'spec'
   ['spec', 'nyan_cat_formatter/rspec1', 'spec/runner/formatter/base_text_formatter'].each {|f| require f}
-  parent_class = Spec::Runner::Formatter::BaseTextFormatter
-  rspec_module = RSpec1
+  formatter = RSpec1
 else
-  ['nyan_cat_formatter/rspec2', 'rspec/core/formatters/base_text_formatter'].each {|f| require f}
-  parent_class = RSpec::Core::Formatters::BaseTextFormatter
-  rspec_module = RSpec2
-end
-
-NyanCatFormatter = Class.new(parent_class) do
-
-  ESC      = "\e["
-  NND      = "#{ESC}0m"
-  PASS     = '='
-  PASS_ARY = ['-', '_']
-  FAIL     = '*'
-  ERROR    = '!'
-  PENDING  = '+'
-
-  include rspec_module
-
-  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
-    dump_progress
-  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 self.failed_or_pending? && self.finished?
-      ascii_cat('x')[@color_index%2].join("\n") #'~|_(x.x)'
-    elsif self.failed_or_pending?
-      ascii_cat('o')[@color_index%2].join("\n") #'~|_(o.o)'
-    elsif self.finished?
-      ascii_cat('-')[@color_index%2].join("\n") # '~|_(-.-)'
-    else
-      ascii_cat('^')[@color_index%2].join("\n") # '~|_(^.^)'
-    end
-  end
-
-  # Displays the current progress in all Nyan Cat glory
-  #
-  # @return nothing
-  def dump_progress
-    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
-  end
-
-  # Determines how we end the trail line. If complete, return a newline etc.
-  #
-  # @return [String]
-  def eol
-    return "\n" if @current == @example_count
-    length = (nyan_cat.split("\n").length - 1)
-    length > 0 ? format("\e[1A" * length + "\r") : "\r"
-  end
-
-  # Calculates the current flight length
-  #
-  # @return [Fixnum]
-  def current_width
-    padding_width + example_width + cat_length
-  end
-
-  # Gets the padding for the current example count
-  #
-  # @return [Fixnum]
-  def padding_width
-    @example_count.to_s.length * 2 + 6
-  end
-
-  # A Unix trick using stty to get the console columns
-  #
-  # @return [Fixnum]
-  def terminal_width
-    if defined? JRUBY_VERSION
-      default_width = 80
-    else
-      default_width = `stty size`.split.map { |x| x.to_i }.reverse.first - 1
-    end
-    @terminal_width ||= default_width
-  end
-
-  # Creates a data store of pass, failed, and pending example results
-  # We have to pad the results here because sprintf can't properly pad color
-  #
-  # @return [Array]
-  def scoreboard
-    @pending_examples ||= []
-    @failed_examples ||= []
-    padding = @example_count.to_s.length
-    [ @current.to_s.rjust(padding),
-      success_color((@current - @pending_examples.size - @failed_examples.size).to_s.rjust(padding)),
-      pending_color(@pending_examples.size.to_s.rjust(padding)),
-      failure_color(@failed_examples.size.to_s.rjust(padding)) ]
-  end
-
-  # Creates a rainbow trail
-  #
-  # @return [String] the sprintf format of the Nyan cat
-  def nyan_trail
-    marks = @example_results.each_with_index.map{ |mark, i| highlight(mark) * example_width(i) }
-    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")
+  require 'rspec/core/formatters/base_text_formatter'
+  if Gem::Version.new(RSpec::Core::Version::STRING).release >= Gem::Version.new('3.0.0')
+    require 'nyan_cat_formatter/rspec3'
+    formatter = RSpec3
+  else
+    require 'nyan_cat_formatter/rspec2'
+    formatter = RSpec2
   end
-
-  # Times a mark has to be repeated
-  def example_width(item = 1)
-    1
-  end
-
-  # Ascii version of Nyan cat. Two cats in the array allow Nyan to animate running.
-  #
-  # @param o [String] Nyan's eye
-  # @return [Array] Nyan cats
-  def ascii_cat(o = '^')
-    [[ "_,------,   ",
-        "_|  /\\_/\\ ",
-        "~|_( #{o} .#{o})  ",
-        " \"\"  \"\" "
-      ],
-      [ "_,------,   ",
-        "_|   /\\_/\\",
-        "^|__( #{o} .#{o}) ",
-        " \" \"  \" \""
-      ]]
-  end
-
-  # Colorizes the string with raindow colors of the rainbow
-  #
-  # @params string [String]
-  # @return [String]
-  def rainbowify(string)
-    c = colors[@color_index % colors.size]
-    @color_index += 1
-    "#{ESC}38;5;#{c}m#{string}#{NND}"
-  end
-
-  # Calculates the colors of the rainbow
-  #
-  # @return [Array]
-  def colors
-    @colors ||= (0...(6 * 7)).map do |n|
-      pi_3 = Math::PI / 3
-      n *= 1.0 / 6
-      r  = (3 * Math.sin(n           ) + 3).to_i
-      g  = (3 * Math.sin(n + 2 * pi_3) + 3).to_i
-      b  = (3 * Math.sin(n + 4 * pi_3) + 3).to_i
-      36 * r + 6 * g + b + 16
-    end
-  end
-
-  # Determines how to color the example.  If pass, it is rainbowified, otherwise
-  # we assign red if failed or yellow if an error occurred.
-  #
-  # @return [String]
-  def highlight(mark = PASS)
-    case 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
-
-  # Converts a float of seconds into a minutes/seconds string
-  #
-  # @return [String]
-  def format_duration(duration)
-    seconds = ((duration % 60) * 100.0).round / 100.0   # 1.8.7 safe .round(2)
-    seconds = seconds.to_i if seconds.to_i == seconds   # drop that zero if it's not needed
-
-    message = "#{seconds} second#{seconds == 1 ? "" : "s"}"
-    message = "#{(duration / 60).to_i} minute#{(duration / 60).to_i == 1 ? "" : "s"} and " + message if duration >= 60
-
-    message
-  end
-
-
-  # Determines if the specs have completed
-  #
-  # @returns [Boolean] true if finished; false otherwise
-  def finished?
-    (@current == @example_count)
-  end
-
-  # Determines if the any specs failed or are in pending state
-  #
-  # @returns [Boolean] true if failed or pending; false otherwise
-  def failed_or_pending?
-    (@failure_count.to_i > 0 || @pending_count.to_i > 0)
-  end
-
-  # Returns the cat length
-  #
-  # @returns [Fixnum]
-  def cat_length
-    nyan_cat.split("\n").group_by(&:size).max.first
-  end
-
 end
 
+NyanCatFormatter = formatter

data/lib/nyan_cat_formatter/common.rb

@@ -0,0 +1,213 @@
+# -*- coding: utf-8 -*-
+module NyanCat
+  module Common
+    ESC      = "\e["
+    NND      = "#{ESC}0m"
+    PASS     = '='
+    PASS_ARY = ['-', '_']
+    FAIL     = '*'
+    ERROR    = '!'
+    PENDING  = '+'
+
+    def self.included(base)
+      base.class_eval do
+        attr_reader :current, :example_results, :color_index, :pending_count, :failure_count,
+          :example_count
+      end
+    end
+
+    # 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
+      dump_progress
+    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 self.failed_or_pending? && self.finished?
+        ascii_cat('x')[@color_index%2].join("\n") #'~|_(x.x)'
+      elsif self.failed_or_pending?
+        ascii_cat('o')[@color_index%2].join("\n") #'~|_(o.o)'
+      elsif self.finished?
+        ascii_cat('-')[@color_index%2].join("\n") # '~|_(-.-)'
+      else
+        ascii_cat('^')[@color_index%2].join("\n") # '~|_(^.^)'
+      end
+    end
+
+    # Displays the current progress in all Nyan Cat glory
+    #
+    # @return nothing
+    def dump_progress
+      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
+    end
+
+    # Determines how we end the trail line. If complete, return a newline etc.
+    #
+    # @return [String]
+    def eol
+      return "\n" if @current == @example_count
+      length = (nyan_cat.split("\n").length - 1)
+      length > 0 ? format("\e[1A" * length + "\r") : "\r"
+    end
+
+    # Calculates the current flight length
+    #
+    # @return [Fixnum]
+    def current_width
+      # padding_width + example_width + cat_length
+      padding_width + (@current * example_width) + cat_length
+    end
+
+    # Gets the padding for the current example count
+    #
+    # @return [Fixnum]
+    def padding_width
+      @example_count.to_s.length * 2 + 6
+    end
+
+    # A Unix trick using stty to get the console columns
+    #
+    # @return [Fixnum]
+    def terminal_width
+      if defined? JRUBY_VERSION
+        default_width = 80
+      else
+        default_width = `stty size`.split.map { |x| x.to_i }.reverse.first - 1
+      end
+      @terminal_width ||= default_width
+    end
+
+    # Creates a data store of pass, failed, and pending example results
+    # We have to pad the results here because sprintf can't properly pad color
+    #
+    # @return [Array]
+    def scoreboard
+      @pending_examples ||= []
+      @failed_examples ||= []
+      padding = @example_count.to_s.length
+      [ @current.to_s.rjust(padding),
+        success_color((@current - @pending_examples.size - @failed_examples.size).to_s.rjust(padding)),
+        pending_color(@pending_examples.size.to_s.rjust(padding)),
+        failure_color(@failed_examples.size.to_s.rjust(padding)) ]
+    end
+
+    # Creates a rainbow trail
+    #
+    # @return [String] the sprintf format of the Nyan cat
+    def nyan_trail
+      marks = @example_results.each_with_index.map{ |mark, i| highlight(mark) * example_width(i) }
+      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
+
+    # Times a mark has to be repeated
+    def example_width(item = 1)
+      1
+    end
+
+    # Ascii version of Nyan cat. Two cats in the array allow Nyan to animate running.
+    #
+    # @param o [String] Nyan's eye
+    # @return [Array] Nyan cats
+    def ascii_cat(o = '^')
+      [[ "_,------,   ",
+         "_|  /\\_/\\ ",
+         "~|_( #{o} .#{o})  ",
+      " \"\"  \"\" "
+      ],
+      [ "_,------,   ",
+        "_|   /\\_/\\",
+        "^|__( #{o} .#{o}) ",
+        " \" \"  \" \""
+      ]]
+    end
+
+    # Colorizes the string with raindow colors of the rainbow
+    #
+    # @params string [String]
+    # @return [String]
+    def rainbowify(string)
+      c = colors[@color_index % colors.size]
+      @color_index += 1
+      "#{ESC}38;5;#{c}m#{string}#{NND}"
+    end
+
+    # Calculates the colors of the rainbow
+    #
+    # @return [Array]
+    def colors
+      @colors ||= (0...(6 * 7)).map do |n|
+        pi_3 = Math::PI / 3
+        n *= 1.0 / 6
+        r  = (3 * Math.sin(n           ) + 3).to_i
+        g  = (3 * Math.sin(n + 2 * pi_3) + 3).to_i
+        b  = (3 * Math.sin(n + 4 * pi_3) + 3).to_i
+        36 * r + 6 * g + b + 16
+      end
+    end
+
+    # Determines how to color the example.  If pass, it is rainbowified, otherwise
+    # we assign red if failed or yellow if an error occurred.
+    #
+    # @return [String]
+    def highlight(mark = PASS)
+      case 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
+
+    # Converts a float of seconds into a minutes/seconds string
+    #
+    # @return [String]
+    def format_duration(duration)
+      seconds = ((duration % 60) * 100.0).round / 100.0   # 1.8.7 safe .round(2)
+      seconds = seconds.to_i if seconds.to_i == seconds   # drop that zero if it's not needed
+
+      message = "#{seconds} second#{seconds == 1 ? "" : "s"}"
+      message = "#{(duration / 60).to_i} minute#{(duration / 60).to_i == 1 ? "" : "s"} and " + message if duration >= 60
+
+      message
+    end
+
+
+    # Determines if the specs have completed
+    #
+    # @returns [Boolean] true if finished; false otherwise
+    def finished?
+      (@current == @example_count)
+    end
+
+    # Determines if the any specs failed or are in pending state
+    #
+    # @returns [Boolean] true if failed or pending; false otherwise
+    def failed_or_pending?
+      (@failure_count.to_i > 0 || @pending_count.to_i > 0)
+    end
+
+    # Returns the cat length
+    #
+    # @returns [Fixnum]
+    def cat_length
+      nyan_cat.split("\n").group_by(&:size).max.first
+    end
+  end
+end

data/lib/nyan_cat_formatter/rspec1.rb

@@ -1,4 +1,5 @@
-module RSpec1
+class RSpec1 < Spec::Runner::Formatter::BaseTextFormatter
+  include NyanCat::Common
 
   def start(example_count)
     super(example_count)

data/lib/nyan_cat_formatter/rspec2.rb

@@ -1,4 +1,5 @@
-module RSpec2
+class RSpec2 < RSpec::Core::Formatters::BaseTextFormatter
+  include NyanCat::Common
 
   def start(example_count)
     super(example_count)

data/lib/nyan_cat_formatter/rspec3.rb

@@ -0,0 +1,69 @@
+require "rspec/core/formatters/base_text_formatter"
+require 'ostruct'
+
+class RSpec3 < RSpec::Core::Formatters::BaseTextFormatter
+  include NyanCat::Common
+
+  RSpec::Core::Formatters.register self, :example_passed, :example_pending,
+    :example_failed, :start_dump, :start
+
+  def initialize(output)
+    super(output)
+  end
+
+  def start(notification)
+    # TODO: Lazy fix for specs.
+    if notification.kind_of?(Fixnum)
+      super(OpenStruct.new(:count => notification))
+    else
+      super(notification)
+    end
+
+    @current = @color_index = @passing_count = 0
+    @example_results = []
+  end
+
+  def example_passed(notification)
+    tick PASS
+  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
+
+  def start_dump(notification)
+    @current = @example_count
+  end
+
+  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)
+    if respond_to?(:dump_commands_to_rerun_failed_examples)
+      dump_commands_to_rerun_failed_examples
+    end
+  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.5.2"
+  s.version     = "0.6.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.13"
+  s.add_dependency "rspec", ">= 2.14.2", ">= 2.99.0.beta1", "< 4"
 
   s.add_development_dependency "rake"
 end

data/spec/nyan_cat_formatter_spec.rb

@@ -22,52 +22,52 @@ describe NyanCatFormatter do
   describe 'passed, pending and failed' do
 
     before do
-      @formatter.stub(:tick)
+      allow(@formatter).to receive(:tick)
     end
 
     describe 'example_passed' do
 
       it 'should call the increment method' do
-        @formatter.should_receive :tick
+        expect(@formatter).to receive(:tick)
         @formatter.example_passed(@example)
       end
 
       it 'should relax Nyan Cat' do
         @formatter.example_passed(@example)
-        @formatter.nyan_cat.should == [
+        expect(@formatter.nyan_cat).to eq([
           '_,------,   ',
           '_|  /\_/\ ',
           '~|_( ^ .^)  ',
           ' ""  "" '
-        ].join("\n")
+        ].join("\n"))
       end
 
       it 'should update the scoreboard' do
-        @formatter.scoreboard.size.should == 4
+        expect(@formatter.scoreboard.size).to eq(4)
       end
-
     end
 
     describe 'example_pending' do
 
       it 'should call the tick method' do
-        @formatter.should_receive :tick
+        expect(@formatter).to receive(:tick)
         @formatter.example_pending(@example)
       end
 
       it 'should increment the pending count' do
-        lambda { @formatter.example_pending(@example)}.
-          should change(@formatter, :pending_count).by(1)
+        expect {
+          @formatter.example_pending(@example)
+        }.to change(@formatter, :pending_count).by(1)
       end
 
       it 'should alert Nyan Cat' do
         @formatter.example_pending(@example)
-        @formatter.nyan_cat.should == [
+        expect(@formatter.nyan_cat).to eq([
           '_,------,   ',
           '_|  /\_/\ ',
           '~|_( o .o)  ',
           ' ""  "" '
-        ].join("\n")
+        ].join("\n"))
       end
 
     end
@@ -75,34 +75,35 @@ describe NyanCatFormatter do
     describe 'example_failed' do
 
       it 'should call the increment method' do
-        @formatter.should_receive :tick
+        expect(@formatter).to receive(:tick)
         @formatter.example_failed(@example)
       end
 
       it 'should increment the failure count' do
-        lambda { @formatter.example_failed(@example)}.
-          should change(@formatter, :failure_count).by(1)
+        expect {
+          @formatter.example_failed(@example)
+        }.to change(@formatter, :failure_count).by(1)
       end
 
       it 'should alert Nyan Cat' do
         @formatter.example_failed(@example)
-        @formatter.nyan_cat.should == [
+        expect(@formatter.nyan_cat).to eq([
           '_,------,   ',
           '_|  /\_/\ ',
           '~|_( o .o)  ',
           ' ""  "" '
-        ].join("\n")
+        ].join("\n"))
       end
 
       it 'should kill nyan if the specs are finished' do
         @formatter.example_failed(@example)
-        @formatter.stub(:finished?).and_return(true)
-        @formatter.nyan_cat.should == [
+        allow(@formatter).to receive(:finished?).and_return(true)
+        expect(@formatter.nyan_cat).to eq([
           '_,------,   ',
           '_|  /\_/\ ',
           '~|_( x .x)  ',
           ' ""  "" '
-        ].join("\n")
+        ].join("\n"))
       end
 
     end
@@ -111,17 +112,17 @@ describe NyanCatFormatter do
   describe 'tick' do
 
     before do
-      @formatter.stub(:current).and_return(1)
-      @formatter.stub(:example_count).and_return(2)
+      allow(@formatter).to receive(:current).and_return(1)
+      allow(@formatter).to receive(:example_count).and_return(2)
       @formatter.tick
     end
 
     it 'should increment the current' do
-      @formatter.current.should == 1
+      expect(@formatter.current).to eql(1)
     end
 
     it 'should store the marks in an array' do
-      @formatter.example_results.should include('=')
+      expect(@formatter.example_results).to include('=')
     end
 
   end
@@ -129,7 +130,9 @@ describe NyanCatFormatter do
   describe 'rainbowify' do
 
     it 'should increment the color index count' do
-      lambda { @formatter.rainbowify('=') }.should change(@formatter, :color_index).by(1)
+      expect {
+        @formatter.rainbowify('=')
+      }.to change(@formatter, :color_index).by(1)
     end
 
   end
@@ -137,15 +140,15 @@ describe NyanCatFormatter do
   describe 'highlight' do
 
     it 'should rainbowify passing examples' do
-      @formatter.highlight('=').should == "\e[38;5;154m-\e[0m"
+      expect(@formatter.highlight('=')).to eq("\e[38;5;154m-\e[0m")
     end
 
     it 'should mark failing examples as red' do
-      @formatter.highlight('*').should == "\e[31m*\e[0m"
+      expect(@formatter.highlight('*')).to eq("\e[31m*\e[0m")
     end
 
     it 'should mark pending examples as yellow' do
-      @formatter.highlight('!').should == "\e[33m!\e[0m"
+      expect(@formatter.highlight('!')).to eq("\e[33m!\e[0m")
     end
 
   end
@@ -153,34 +156,34 @@ describe NyanCatFormatter do
   describe 'start' do
 
     it 'should set the total amount of specs' do
-      @formatter.example_count.should == 2
+      expect(@formatter.example_count).to eq(2)
     end
 
     it 'should set the current to 0' do
-      @formatter.current.should == 0
+      expect(@formatter.current).to eq(0)
     end
 
   end
 
   describe "#format_duration" do
     it "should return just seconds for sub 60 seconds" do
-      @formatter.format_duration(5.3).should eq("5.3 seconds")
+      expect(@formatter.format_duration(5.3)).to eq("5.3 seconds")
     end
 
     it "should remove that extra zero if it is not needed" do
-      @formatter.format_duration(1.0).should eq("1 second")
+      expect(@formatter.format_duration(1.0)).to eq("1 second")
     end
 
     it "should plurlaize seconds" do
-      @formatter.format_duration(1.1).should eq("1.1 seconds")
+      expect(@formatter.format_duration(1.1)).to eq("1.1 seconds")
     end
 
     it "add a minute if it is just over 60 seconds" do
-      @formatter.format_duration(63.2543456456).should eq("1 minute and 3.25 seconds")
+      expect(@formatter.format_duration(63.2543456456)).to eq("1 minute and 3.25 seconds")
     end
 
     it "should pluralize minutes" do
-      @formatter.format_duration(987.34).should eq("16 minutes and 27.34 seconds")
+      expect(@formatter.format_duration(987.34)).to eq("16 minutes and 27.34 seconds")
     end
   end
 
@@ -195,7 +198,7 @@ describe NyanCatFormatter do
 
           context "when in example #{i}" do
             it "should return 1 as the example width" do
-              @formatter.example_width.should == 1
+              expect(@formatter.example_width).to eq(1)
             end
           end
         end

data/spec/nyan_cat_music_formatter_spec.rb

@@ -22,37 +22,37 @@ describe NyanCatMusicFormatter do
 
   describe 'kernel' do
     it 'defaults to Kernel' do
-      described_class.new(stdout).kernel.should == Kernel
+      expect(described_class.new(stdout).kernel).to eq(Kernel)
     end
 
     it 'can be set' do
       formatter = described_class.new stdout
       formatter.kernel = 'something else'
-      formatter.kernel.should == 'something else'
+      expect(formatter.kernel).to eq('something else')
     end
   end
 
   describe 'platform' do
     it 'defaults to RUBY_PLATFORM' do
-      described_class.new(stdout).platform.should eq RUBY_PLATFORM
+      expect(described_class.new(stdout).platform).to eq(RUBY_PLATFORM)
     end
 
     it 'can be set' do
       formatter = described_class.new stdout
       formatter.platform = 'something else'
-      formatter.platform.should == 'something else'
+      expect(formatter.platform).to eql('something else')
     end
   end
 
   describe 'start' do
     it 'sets the total amount of specs' do
       formatter.start 3
-      formatter.example_count.should == 3
+      expect(formatter.example_count).to eql(3)
     end
 
     it 'sets the current to 0' do
       formatter.start 3
-      formatter.current.should == 0
+      expect(formatter.current).to eql(0)
     end
 
     context 'when on OS X' do
@@ -60,7 +60,7 @@ describe NyanCatMusicFormatter do
 
       it 'plays the song in the background' do
         formatter.start 3
-        mock_kernel.seen.should include "afplay #{path_to_mp3} &"
+        expect(mock_kernel.seen).to include("afplay #{path_to_mp3} &")
       end
     end
 
@@ -68,8 +68,12 @@ describe NyanCatMusicFormatter do
       before { formatter.platform = 'linux'}
       it 'plays the song for linux too' do
         formatter.start 10
-        mock_kernel.seen.any? { |entry| entry. end_with? "mpg321 #{path_to_mp3} &>/dev/null &" }.should be
-        mock_kernel.seen.any? { |entry| entry. end_with? "mpg123 #{path_to_mp3} &>/dev/null &" }.should 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
 
@@ -78,7 +82,7 @@ describe NyanCatMusicFormatter do
 
       it 'does not play the song' do
         formatter.start 4
-        mock_kernel.seen.should be_empty
+        expect(mock_kernel.seen).to be_empty
       end
     end
   end

data/spec/nyan_cat_wide_formatter_spec.rb

@@ -10,8 +10,8 @@ describe NyanCatWideFormatter do
 
   describe "cat situation" do
     before do
-      @formatter.stub(:terminal_width).and_return(100)
-      @formatter.stub(:cat_length).and_return(11)
+      allow(@formatter).to receive(:terminal_width).and_return(100)
+      allow(@formatter).to receive(:cat_length).and_return(11)
       @whole_net_width = 100 - 2*2 - 6 - 11
     end
 
@@ -21,11 +21,11 @@ describe NyanCatWideFormatter do
       end
 
       it "should calculate the net width for example 3" do
-        @formatter.net_width_for(3).should == (@whole_net_width * 3.0 / 35.0).round
+        expect(@formatter.net_width_for(3)).to eql((@whole_net_width * 3.0 / 35.0).round)
       end
 
       it "should calculate the net width for example 30" do
-        @formatter.net_width_for(5).should == (@whole_net_width * 5.0 / 35.0).round
+        expect(@formatter.net_width_for(5)).to eql((@whole_net_width * 5.0 / 35.0).round)
       end
     end
 
@@ -33,11 +33,11 @@ describe NyanCatWideFormatter do
       before { @formatter.start(50) }
 
       it "should calculate the net width for example 1" do
-        @formatter.net_width_for(1).should == (@whole_net_width * 1.0 / 50.0).round
+        expect(@formatter.net_width_for(1)).to eql((@whole_net_width * 1.0 / 50.0).round)
       end
 
       it "should calculate the net width for example 25" do
-        @formatter.net_width_for(25).should == (@whole_net_width * 25.0 / 50.0).round
+        expect(@formatter.net_width_for(25)).to eql((@whole_net_width * 25.0 / 50.0).round)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyan-cat-formatter
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,7 +18,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 2.14.2
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.99.0.beta1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +32,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: 2.14.2
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.99.0.beta1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,11 +73,15 @@ files:
 - Rakefile
 - data/nyan-cat.mp3
 - demo.rb
+- gemfiles/rspec1
+- gemfiles/rspec2
 - lib/nyan_cat_format/music.rb
 - lib/nyan_cat_format/wide.rb
 - lib/nyan_cat_formatter.rb
+- lib/nyan_cat_formatter/common.rb
 - lib/nyan_cat_formatter/rspec1.rb
 - lib/nyan_cat_formatter/rspec2.rb
+- lib/nyan_cat_formatter/rspec3.rb
 - lib/nyan_cat_music_formatter.rb
 - lib/nyan_cat_wide_formatter.rb
 - lib/nyan_cat_wide_music_formatter.rb
@@ -104,3 +120,4 @@ test_files:
 - spec/nyan_cat_music_formatter_spec.rb
 - spec/nyan_cat_wide_formatter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: