nyan-cat-formatter 0.1.0 → 0.2.0

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/lib/nyan_cat_formatter/rspec1.rb

@@ -40,7 +40,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

@@ -28,7 +28,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

data/lib/nyan_cat_music_formatter.rb

@@ -33,13 +33,26 @@ NyanCatMusicFormatter = Class.new(NyanCatFormatter) do
   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        = "nyan-cat-formatter"
-  s.version     = "0.1.0"
+  s.version     = "0.2.0"
   s.authors     = ["Matt Sears"]
   s.email       = ["matt@mattsears.com"]
   s.homepage    = "http://mtts.rs/nyancat"

data/spec/nyan_cat_music_formatter_spec.rb

@@ -69,6 +69,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
 

metadata

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