smooth-jazz-nyan-cat-formatter 0.1.1 → 0.1.3

data/README.md

@@ -73,7 +73,7 @@ Make sure your .rspec file in your application's root directory contains the fol
 
 Then run `rspec spec` and enjoy Nyan Cat formatted text output accompanied by the Nyan Cat song by default!
 
-**This currently only works on Mac OS X or on Linux (if you have mpg321 installed).**
+**This currently only works on Mac OS X or on Linux (if you have mpg321 or mpg123 installed).**
 
 Contributing
 ----------

data/demo.rb

@@ -9,8 +9,8 @@ describe NyanCatFormatter do
     @formatter.start(2)
     @example = RSpec::Core::ExampleGroup.describe.example
 
-    @samples = [0,0,0,0,0,0,0,0,0,0,0,1,
-      0]
+    @samples = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
 
     sleep(0.1)  # Just to slow it down a little :-)
   end

data/lib/nyan_cat_formatter.rb

@@ -29,7 +29,7 @@ NyanCatFormatter = Class.new(parent_class) do
               :failure_count, :example_count
               
   def initialize(args)
-    super PaddedStringIO.new(terminal_width)
+    super PaddedStringIO.new
   end
 
   # Increments the example count and displays the current progress
@@ -76,8 +76,9 @@ NyanCatFormatter = Class.new(parent_class) do
   # @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"
+    number_of_lines = (nyan_cat.split("\n").length - 1)
+    move_cursor_up = "\e[1A"
+    number_of_lines > 0 ? format(move_cursor_up * number_of_lines + "\r") : "\r"
   end
 
   # Calculates the current flight length
@@ -96,7 +97,7 @@ NyanCatFormatter = Class.new(parent_class) do
     if defined? JRUBY_VERSION
       default_width = 80
     else
-      default_width = `stty size`.split.map { |x| x.to_i }.reverse.first - 1
+      default_width = `stty size`.split[-1].to_i - 1
     end
     @terminal_width ||= default_width
   end

data/lib/nyan_cat_formatter/padded_string_io.rb

@@ -1,19 +1,17 @@
 class PaddedStringIO
-  def initialize(terminal_size)
+  def initialize
     @output = $stdout
-    @terminal_size = terminal_size
   end
-  
+
   def puts(output_strings = '')
     unless output_strings.is_a?(Array)
       output_strings = [output_strings]
     end
-    output_strings.each do |output_string| 
-      @output.puts output_string.ljust(@terminal_size)
-#      super 'foo'
+    output_strings.each do |output_string|
+      @output.puts output_string + "\e[0K"
     end
   end
-  
+
   def method_missing(*args)
     @output.send(*args)
   end

data/lib/nyan_cat_formatter/rspec1.rb

@@ -43,7 +43,7 @@ module RSpec1
   end
 
   def dump_summary(duration, example_count, failure_count, pending_count)
-    NyanCatMusicFormatter.new(NyanCatFormatter).kill_music if NyanCatMusicFormatter
+    NyanCatMusicFormatter.new(NyanCatFormatter).kill_music if defined?(NyanCatMusicFormatter)
     @output.puts "\nYou've Nyaned for #{format_duration(duration)}\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

data/lib/nyan_cat_formatter/rspec2.rb

@@ -35,7 +35,7 @@ module RSpec2
   end
   
   def dump_summary(duration, example_count, failure_count, pending_count)
-    NyanCatMusicFormatter.new(NyanCatFormatter).kill_music if NyanCatMusicFormatter
+    NyanCatMusicFormatter.new(NyanCatFormatter).kill_music if defined?(NyanCatMusicFormatter)
     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
@@ -49,24 +49,3 @@ module RSpec2
     @instafail ||= RSpec::Instafail.new(output)
   end
 end
-
-=begin
-module RSpec
-  module Core
-    module Formatters
-      class BaseTextFormatter < BaseFormatter
-        def dump_failure(example, index)
-          output.puts "#{short_padding}#{index.next}) #{example.full_description}                                                                      "
-          exception = example.execution_result[:exception]
-          output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}                                                                      "
-          output.puts "#{long_padding}#{red(exception.class.name << ":")}                                                                      " unless exception.class.name =~ /RSpec/
-          exception.message.to_s.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}                                                                      " } if exception.message
-          if shared_group = find_shared_group(example)
-            dump_shared_failure_info(shared_group)
-          end
-        end
-      end
-    end
-  end
-end
-=end

data/lib/nyan_cat_music_formatter.rb

@@ -33,13 +33,26 @@ class NyanCatMusicFormatter < NyanCatFormatter
   def start input
     super
     kernel.system("afplay #{nyan_mp3} &") if osx?
-    kernel.system("[ -e #{nyan_mp3} ] && type mpg321 &>/dev/null && mpg321 #{nyan_mp3} &>/dev/null &") if linux?
+    play_on_linux if linux?
   end
 
   def kill_music
     if File.exists? nyan_mp3
       system("killall -9 afplay &>/dev/null") if osx?
-      system("killall -9 mpg321 &>/dev/null") if linux?
+      kill_music_on_linux if linux?
     end
   end
+
+  private
+    
+  def play_on_linux
+    kernel.system("[ -e #{nyan_mp3} ] && type mpg321 &>/dev/null && mpg321 #{nyan_mp3} &>/dev/null &") if kernel.system('which mpg321 &>/dev/null && type mpg321 &>/dev/null')
+    kernel.system("[ -e #{nyan_mp3} ] && type mpg123 &>/dev/null && mpg123 #{nyan_mp3} &>/dev/null &") if kernel.system('which mpg123 &>/dev/null && type mpg123 &>/dev/null')
+  end
+
+  def kill_music_on_linux 
+    system("killall -9 mpg321 &>/dev/null") if kernel.system("which mpg321 &>/dev/null && type mpg321 &>/dev/null")
+    system("killall -9 mpg123 &>/dev/null") if kernel.system("which mpg123 &>/dev/null && type mpg123 &>/dev/null")
+  end
+
 end

data/nyan-cat-formatter.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "smooth-jazz-nyan-cat-formatter"
-  s.version     = "0.1.1"
+  s.version     = "0.1.3"
   s.authors     = ["Ryan Spore"]
   s.email       = ["ry@nspore.com"]
   s.summary     = %q{Nyan Cat inspired RSpec formatter! Now with more Jazz! }

data/spec/nyan_cat_music_formatter_spec.rb

@@ -59,6 +59,7 @@ describe NyanCatMusicFormatter do
       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
       end
     end
 

data/spec/padded_string_io_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe PaddedStringIO do
+  let(:subject) { PaddedStringIO.new }
+
+  it 'every puts clears the line to the right so no cat parts show up' do
+    arg = "this is a test string"
+    $stdout.should_receive(:puts).with(arg + "\e[0K")
+    subject.puts(arg)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smooth-jazz-nyan-cat-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,6 +89,7 @@ files:
 - nyan-cat-formatter.gemspec
 - spec/nyan_cat_formatter_spec.rb
 - spec/nyan_cat_music_formatter_spec.rb
+- spec/padded_string_io_spec.rb
 - spec/smooth_jazz_nyan_cat_formatter_spec.rb
 - spec/smooth_jazz_nyan_cat_music_formatter_spec.rb
 - spec/spec_helper.rb
@@ -119,6 +120,7 @@ summary: Nyan Cat inspired RSpec formatter! Now with more Jazz!
 test_files:
 - spec/nyan_cat_formatter_spec.rb
 - spec/nyan_cat_music_formatter_spec.rb
+- spec/padded_string_io_spec.rb
 - spec/smooth_jazz_nyan_cat_formatter_spec.rb
 - spec/smooth_jazz_nyan_cat_music_formatter_spec.rb
 - spec/spec_helper.rb