nyan-cat-formatter 0.8.0 → 0.9.0

data/.travis.yml

@@ -4,7 +4,6 @@ before_script:
 
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.1.0
   - ree

data/lib/nyan_cat_format/music.rb

@@ -1,8 +1,6 @@
 module NyanCatFormat
   module Music
 
-    MUSIC_LENGTH = 27.06 # seconds
-
     def osx?
       platform.downcase.include?("darwin")
     end
@@ -33,30 +31,8 @@ module NyanCatFormat
 
     def start input
       super
-      t = Thread.new do
-        loop do
-          if osx?
-            kernel.system("afplay #{nyan_mp3} &")
-          elsif linux?
-            play_on_linux
-          end
-          Thread.current["started_playing"] ||= true
-          sleep MUSIC_LENGTH
-        end
-      end
-      until t["started_playing"]
-        sleep 0.001
-      end
-    end
-
-    def kill_music
-      if File.exists? nyan_mp3
-        if osx?
-          system("killall -9 afplay &>/dev/null")
-        elsif linux?
-          kill_music_on_linux
-        end
-      end
+      @music_thread = Thread.new { start_music_or_kill(Thread.current) }
+      wait_for_music_to_start(@music_thread)
     end
 
     def dump_summary(*args)
@@ -66,15 +42,42 @@ module NyanCatFormat
 
     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')
+    def kill_music
+      if @music_thread && @music_thread['music_pid']
+        @music_thread.kill
+        Process.kill('KILL', @music_thread['music_pid'])
+      end
     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")
+    def linux_player
+      %w{mpg321 mpg123}.find {|player|
+        kernel.system("which #{ player } &>/dev/null && type #{ player } &>/dev/null")
+      }
     end
 
+    def music_command
+      # this isn't really threadsafe but it'll work if we're careful
+      return @music_command if @music_command
+      if osx?
+        @music_command = "afplay #{nyan_mp3}"
+      elsif linux? && linux_player
+        @music_command = "#{ linux_player } #{ nyan_mp3 } &>/dev/null"
+      end
+    end
+
+    def start_music_or_kill(thread)
+      thread.exit unless File.exists?(nyan_mp3) && music_command
+      loop do
+        thread['music_pid'] = kernel.spawn(music_command)
+        thread["started_playing"] ||= true
+        Process.wait(thread['music_pid'])
+      end
+    end
+
+    def wait_for_music_to_start(music_thread)
+      while !music_thread["started_playing"] && music_thread.status
+        sleep 0.001
+      end
+    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.8.0"
+  s.version     = "0.9.0"
   s.authors     = ["Matt Sears"]
   s.email       = ["matt@mattsears.com"]
   s.homepage    = "https://github.com/mattsears/nyan-cat-formatter"

data/spec/nyan_cat_music_formatter_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'stringio'
+require 'fileutils'
 require 'nyan_cat_music_formatter'
 
 class MockKernel
@@ -7,6 +8,11 @@ class MockKernel
     seen << string
   end
 
+  def spawn(string)
+    seen << string
+    rand(10000)
+  end
+
   def seen
     @seen ||= []
   end
@@ -45,6 +51,11 @@ describe NyanCatMusicFormatter do
   end
 
   describe 'start' do
+    before do
+      allow(Process).to receive(:wait) { sleep 1 }
+      allow(Process).to receive(:kill).and_return(true)
+    end
+
     it 'sets the total amount of specs' do
       formatter.start 3
       expect(formatter.example_count).to eql(3)
@@ -60,20 +71,29 @@ describe NyanCatMusicFormatter do
 
       it 'plays the song in the background' do
         formatter.start 3
-        expect(mock_kernel.seen).to include("afplay #{path_to_mp3} &")
+        expect(mock_kernel.seen).to include("afplay #{path_to_mp3}")
       end
     end
 
     context 'when on linux' do
       before { formatter.platform = 'linux'}
-      it 'plays the song for linux too' do
+
+      it 'plays the song for linux too with mpg123 when available' do
+        allow(mock_kernel).to receive(:system).with(match(/which mpg123/)).and_return(true)
+        allow(mock_kernel).to receive(:system).with(match(/which mpg321/)).and_return(false)
+        formatter.start 10
+        expect(mock_kernel.seen.any? { |entry| entry. end_with? "mpg123 #{path_to_mp3} &>/dev/null" }).to be
+      end
+
+      it 'plays the song for linux too with mpg321 when available' do
+        allow(mock_kernel).to receive(:system).with(match(/which mpg321/)).and_return(true)
+        allow(mock_kernel).to receive(:system).with(match(/which mpg123/)).and_return(false)
         formatter.start 10
-        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
+        expect(mock_kernel.seen.any? { |entry| entry. end_with? "mpg321 #{path_to_mp3} &>/dev/null" }).to be
       end
     end
 
-    context 'when not on OS X' do
+    context 'when on Windows' do
       before { formatter.platform = 'windows' }
 
       it 'does not play the song' do
@@ -81,5 +101,20 @@ describe NyanCatMusicFormatter do
         expect(mock_kernel.seen).to be_empty
       end
     end
+
+    context 'when the music file does not exist' do
+      before do
+        FileUtils.mv path_to_mp3, "#{ path_to_mp3 }.tmp"
+      end
+
+      after do
+        FileUtils.mv "#{ path_to_mp3 }.tmp", path_to_mp3
+      end
+
+      it "won't try to play anything" do
+        formatter.start 42
+        expect(mock_kernel.seen).to be_empty
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyan-cat-formatter
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec