nyan-cat-formatter 0.0.9 → 0.1.0

data/README.md

@@ -47,7 +47,7 @@ If you want to use Nyan Cat as your default formatter, simply put the options in
 --format NyanCatFormatter
 ```
 
-Playing the Nyan Cat song 
+Playing the Nyan Cat song
 -------------------------
 
 You can then enjoy playback in two ways:
@@ -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 OSx.**
+**This currently only works on Mac OS X or on Linux (if you have mpg321 installed).**
 
 Contributing
 ----------

data/lib/nyan_cat_formatter.rb

@@ -41,9 +41,11 @@ NyanCatFormatter = Class.new(parent_class) do
   #
   # @return [String] Nyan Cat
   def nyan_cat
-    if @failure_count.to_i > 0 || @pending_count.to_i > 0
+    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 (@current == @example_count)
+    elsif self.finished?
       ascii_cat('-')[@color_index%2].join("\n") # '~|_(-.-)'
     else
       ascii_cat('^')[@color_index%2].join("\n") # '~|_(^.^)'
@@ -178,12 +180,27 @@ NyanCatFormatter = Class.new(parent_class) do
   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
+
 end
 

data/lib/nyan_cat_formatter/rspec1.rb

@@ -40,7 +40,7 @@ module RSpec1
   end
 
   def dump_summary(duration, example_count, failure_count, pending_count)
-    system("killall -9 afplay") if File.exists?(File.expand_path("~/.nyan-cat.mp3")) && RUBY_PLATFORM.downcase.include?("darwin")
+    NyanCatMusicFormatter.new(NyanCatFormatter).kill_music if 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

@@ -28,8 +28,7 @@ module RSpec2
   end
 
   def dump_summary(duration, example_count, failure_count, pending_count)
-    mp3_file = File.expand_path( File.join( File.dirname(__FILE__), "../../data/nyan-cat.mp3"))
-    system("killall -9 afplay") if File.exists?(mp3_file) && RUBY_PLATFORM.downcase.include?("darwin")
+    NyanCatMusicFormatter.new(NyanCatFormatter).kill_music if 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

data/lib/nyan_cat_music_formatter.rb

@@ -3,7 +3,11 @@ require 'nyan_cat_formatter'
 
 NyanCatMusicFormatter = Class.new(NyanCatFormatter) do
   def osx?
-    platform.include?("darwin")
+    platform.downcase.include?("darwin")
+  end
+
+  def linux?
+    platform.downcase.include?('linux')
   end
 
   def kernel=(kernel)
@@ -22,8 +26,20 @@ NyanCatMusicFormatter = Class.new(NyanCatFormatter) do
     @platform ||= RUBY_PLATFORM
   end
 
+  def nyan_mp3
+    File.expand_path('../../data/nyan-cat.mp3', __FILE__)
+  end
+
   def start input
     super
-    kernel.system("afplay #{File.expand_path('../../data/nyan-cat.mp3', __FILE__)} &") if osx?
+    kernel.system("afplay #{nyan_mp3} &") if osx?
+    kernel.system("[ -e #{nyan_mp3} ] && type mpg321 &>/dev/null && mpg321 #{nyan_mp3} &>/dev/null &") 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?
+    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.0.9"
+  s.version     = "0.1.0"
   s.authors     = ["Matt Sears"]
   s.email       = ["matt@mattsears.com"]
   s.homepage    = "http://mtts.rs/nyancat"

data/spec/nyan_cat_formatter_spec.rb

@@ -94,6 +94,17 @@ describe NyanCatFormatter do
         ].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 == [
+          '_,------,   ',
+          '_|  /\_/\ ',
+          '~|_( x .x)  ',
+          ' ""  "" '
+        ].join("\n")
+      end
+
     end
   end
 
@@ -155,19 +166,19 @@ describe NyanCatFormatter do
     it "should return just seconds for sub 60 seconds" do
       @formatter.format_duration(5.3).should 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")
     end
-    
+
     it "should plurlaize seconds" do
       @formatter.format_duration(1.1).should 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")
     end
-    
+
     it "should pluralize minutes" do
       @formatter.format_duration(987.34).should eq("16 minutes and 27.34 seconds")
     end

data/spec/nyan_cat_music_formatter_spec.rb

@@ -13,10 +13,7 @@ class MockKernel
 end
 
 describe NyanCatMusicFormatter do
-  def path_to_mp3
-    "#{File.expand_path('data/nyan-cat.mp3')}"
-  end
-
+  let(:path_to_mp3) { NyanCatMusicFormatter.new(NyanCatFormatter).nyan_mp3 }
   let(:stdout)      { StringIO.new }
   let(:formatter)   { described_class.new stdout }
   let(:mock_kernel) { MockKernel.new }
@@ -37,7 +34,7 @@ describe NyanCatMusicFormatter do
 
   describe 'platform' do
     it 'defaults to RUBY_PLATFORM' do
-      described_class.new(stdout).platform.should equal RUBY_PLATFORM
+      described_class.new(stdout).platform.should eq RUBY_PLATFORM
     end
 
     it 'can be set' do
@@ -67,6 +64,14 @@ describe NyanCatMusicFormatter do
       end
     end
 
+    context 'when on linux' 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
+      end
+    end
+
     context 'when not on OS X' do
       before { formatter.platform = 'windows' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyan-cat-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake