jimmy_jukebox 0.6.0 → 0.6.1

data/bin/play_jukebox

@@ -1,33 +1,8 @@
 #!/usr/bin/env ruby
 
-$running_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || RUBY_PLATFORM == 'java'
-
-if $running_jruby
-  begin
-    require 'spoon'
-  rescue LoadError => e
-    if e.message =~ /spoon/
-      puts "*** You must run 'gem install spoon' before using JimmyJukebox on JRuby ***"
-      exit
-    else
-      raise
-    end
-  end
-else
-  begin
-    require 'posix/spawn'
-  rescue LoadError => e
-    if e.message =~ /posix/ || e.message =~ /spawn/
-      puts "*** You must run 'gem install posix-spawn' before using JimmyJukebox in Ruby ***"
-      exit
-    else
-      raise
-    end
-  end
-end
-
 lib = File.expand_path('../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+require 'jimmy_jukebox/check_gems'
 require 'jimmy_jukebox'
 include JimmyJukebox
 

data/lib/jimmy_jukebox/artists.rb

@@ -85,4 +85,9 @@ module Artists
     name.to_s.split("_").map! { |name_component| name_component.capitalize }.join("") + '.yml'
   end
 
+  def prettified_artist_name(name)
+    return name.to_s.capitalize unless name.to_s.match(/_/)
+    name.to_s.split("_").map! { |name_component| name_component.capitalize }.join(" ")
+  end
+
 end

data/lib/jimmy_jukebox/check_gems.rb

@@ -0,0 +1,25 @@
+$running_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || RUBY_PLATFORM == 'java'
+
+if $running_jruby
+  begin
+    require 'spoon'
+  rescue LoadError => e
+    if e.message =~ /spoon/
+      puts "*** You must run 'gem install spoon' before using JimmyJukebox on JRuby ***"
+      exit
+    else
+      raise
+    end
+  end
+else
+  begin
+    require 'posix/spawn'
+  rescue LoadError => e
+    if e.message =~ /posix/ || e.message =~ /spawn/
+      puts "*** You must run 'gem install posix-spawn' before using JimmyJukebox in Ruby ***"
+      exit
+    else
+      raise
+    end
+  end
+end

data/lib/jimmy_jukebox/check_io_console.rb

@@ -0,0 +1,6 @@
+begin
+  require 'io/console'
+rescue LoadError
+  puts "*** JimmyJukebox uses io/console, which is built into Ruby 1.9.3. I recommend running JimmyJukebox on 1.9.3. You could instead install the 'io-console' gem, but the most recent version works only with 1.9.3, so try \"gem install io-console -v '0.3'\" ***"
+  exit
+end

data/lib/jimmy_jukebox/check_jruby.rb

@@ -0,0 +1,9 @@
+if JimmyJukebox::RUNNING_JRUBY
+  class IO
+    def getch
+      raw do
+        getc
+      end
+    end
+  end
+end

data/lib/jimmy_jukebox/display_options.rb

@@ -8,7 +8,7 @@ module JimmyJukebox
 
     def display_options_after_delay
       # pause to let song display song info and begin playing before displaying user options
-      sleep 1
+      sleep 0.4
       display_options
     end
 

data/lib/jimmy_jukebox/handle_load_jukebox_input.rb

@@ -1,19 +1,49 @@
+require 'jimmy_jukebox/artists'
+
 module JimmyJukebox
 
   module HandleLoadJukeboxInput
 
     def no_argv0
-      puts "You must select an artist to use 'load_jukebox'."
-      puts "For example: 'load_jukebox at' to load Art Tatum"
-      puts "Another example: 'load_jukebox dr' to load Django Reinhardt"
+      display_template {
+        puts "    You must select an artist or genre to use 'load_jukebox'.\n\n"
+        puts "    Examples:\n\n"
+        puts "         load_jukebox at            (to download Art Tatum)\n\n"
+        puts "         load_jukebox dr            (to download Django Reinhardt)\n\n"
+        puts "         load_jukebox bluegrass     (to download bluegrass)\n\n"
+        puts "         load_jukebox classical     (to download classical)\n\n"
+        puts "         load_jukebox jazz          (to download jazz)\n\n"
+      }
       exit
     end
 
+    def list_artists
+      display_template {
+        puts "    Artist symbol = Artist name (Genre)\n\n"
+        ARTISTS.each do |k,v|
+          puts "            " + k.to_s.rjust(5) + ' = ' + prettified_artist_name(v[:name]) + ' (' + v[:genre].capitalize + ')'
+        end
+        puts "\n"
+      }
+    end
+
     def invalid_artist
-      puts "No action taken in response to your command 'load_jukebox #{ARGV[0]}'."
-      puts "JimmyJukebox does not recognize '#{ARGV[0]}'. You must select a valid artist."
-      puts "For example, valid artists include: 'bh' for Billie Holiday, 'cb' for Count Basie, and 'lh' for Lionel Hampton"
-      puts "Please see the README for a complete list of valid artists."
+      display_template {
+        puts "    No action taken in response to your command 'load_jukebox #{ARGV[0]}'.\n\n"
+        puts "    JimmyJukebox does not recognize '#{ARGV[0]}'.\n\n"
+        puts "    You must select a valid artist or genre.\n\n"
+        puts "    Valid genres:\n\n"
+        puts "         'bluegrass'"
+        puts "         'banjo'"
+        puts "         'classical'"
+        puts "         'jazz'"
+        puts "         'rock'\n\n"
+        puts "    Valid artists include:\n\n"
+        puts "         'bh' for Billie Holiday"
+        puts "         'cb' for Count Basie"
+        puts "         'lh' for Lionel Hampton.\n\n"
+        puts "    Please visit the link below for a complete list of valid artists.\n\n"
+      }
       exit
     end
 
@@ -35,6 +65,11 @@ module JimmyJukebox
       arg && arg.to_i.is_a?(Integer) && arg.to_i > 0
     end
 
+    def play_radio
+      require 'jimmy_jukebox/check_gems'
+      require 'jimmy_jukebox/user_interface'
+    end
+
     def process_artist
       if valid_integer?(ARGV[1])
         JimmyJukebox::SongLoader.new.send(artist_name(ARGV[0]), ARGV[1].to_i)
@@ -43,6 +78,31 @@ module JimmyJukebox
       end
     end
 
+    def process_genre
+      if valid_integer?(ARGV[1])
+        JimmyJukebox::SongLoader.new.download_sample_genre(ARGV[1].to_i, ARGV[0].upcase)
+      else
+        display_genre_download_requires_n_message
+      end
+    end
+
+    def display_template(&msg)
+      puts "    ------------------------------------------------------------------------"
+      puts "                     JimmyJukebox usage help\n\n"
+      msg.call if msg
+      puts "    Full instructions: https://github.com/JamesLavin/jimmy_jukebox"
+      puts "    ------------------------------------------------------------------------"
+    end
+
+    def display_genre_download_requires_n_message
+      display_template {
+        puts "    You requested a sample of #{ARGV[0]} songs without specifying how many.\n\n"
+        puts "    Please try again but specify how many songs you wish to download.\n\n"
+        puts "    For example, to download 10 #{ARGV[0]} songs, type:\n\n"
+        puts "         load_jukebox #{ARGV[0]} 10"
+      }
+    end
+
     def process_sample
       if ARGV[1].nil?
         JimmyJukebox::SongLoader.new.download_sample_genre(1)

data/lib/jimmy_jukebox/jukebox.rb

@@ -36,7 +36,7 @@ module JimmyJukebox
       disable_monitor_powerdown if JimmyJukebox::RUNNING_X_WINDOWS
       self.user_config = new_user_config
       self.continuous_play = continuous_play
-      raise NoSongsException if songs.empty?
+      raise NoSongsException if downloaded_song_paths.empty?
     end
 
     def play_loop
@@ -49,10 +49,13 @@ module JimmyJukebox
       end
     end
 
+    def next_song?
+      @next_song
+    end
+
     def next_song
       # reset @next_song each time it's accessed
-      current_next_song = @next_song ? @next_song : random_song
-      @next_song = random_song
+      current_next_song, @next_song = [@next_song || random_song, random_song]
       current_next_song
     end
 
@@ -62,7 +65,7 @@ module JimmyJukebox
 
     def quit
       disable_continuous_play
-      terminate_current_song
+      terminate_current_song if current_song
     end
 
     def playing?
@@ -126,15 +129,23 @@ module JimmyJukebox
       current_song.unpause
     end
 
-    def songs
-      user_config.songs
+    def downloaded_song_paths
+      user_config.song_paths
     end
 
+    #def undownloaded_songs
+    #  user_config.undownloaded_songs
+    #end
+
     def random_song
-      raise NoNewSongException, "JimmyJukebox can't find any songs to play!" if songs.length == 0
-      Song.new( songs[rand(songs.length)] )
+      raise NoNewSongException, "JimmyJukebox can't find any songs to play!" if downloaded_song_paths.length == 0
+      Song.new( downloaded_song_paths[rand(downloaded_song_paths.length)] )
     end
 
+    #def play_random_undownloaded_song
+    #  play_song(random_undownloaded_song)
+    #end
+
     def play_random_song
       play_song(random_song)
     end

data/lib/jimmy_jukebox/load_jukebox_code.rb

@@ -12,6 +12,12 @@ no_argv0 unless ARGV[0]
 
 if ARGV[0] =~ /sample/i
   process_sample
+elsif ARGV[0] =~ /artists/i
+  list_artists
+elsif ARGV[0] =~ /radio/i
+  play_radio
+elsif valid_genre?(ARGV[0])
+  process_genre
 elsif valid_artist?(ARGV[0])
   process_artist
 else

data/lib/jimmy_jukebox/song.rb

@@ -55,10 +55,12 @@ module JimmyJukebox
 
     def pause
       self.paused = true
-      if grandchild_pid
-        `kill -s STOP #{grandchild_pid}`
-      elsif playing_pid
-        `kill -s STOP #{playing_pid}`
+      if playing_pid
+        if grandchild_pid
+          `kill -s STOP #{grandchild_pid}`
+        else
+          `kill -s STOP #{playing_pid}`
+        end
       else
         raise NoPlayingPidException, "*** Can't pause song because can't find playing_pid #{playing_pid} ***"
       end
@@ -66,21 +68,21 @@ module JimmyJukebox
 
     def unpause
       self.paused = false
-      if grandchild_pid
-        `kill -s CONT #{grandchild_pid}`
-      elsif playing_pid
+      if playing_pid
+        if grandchild_pid
+          `kill -s CONT #{grandchild_pid}`
+        else playing_pid
         `kill -s CONT #{playing_pid}`
+        end
       else
         raise NoPlayingPidException, "*** Can't unpause song because can't find playing_pid #{playing_pid} ***"
       end
     end
 
     def kill_playing_pid_and_children
+      return nil unless playpid = playing_pid
       grandpid = grandchild_pid
-      playpid = playing_pid
-      if grandpid
-        `kill #{grandpid}`
-      end
+      `kill #{grandpid}` if grandpid
       `kill #{playpid}`
     end
 

data/lib/jimmy_jukebox/song_loader.rb

@@ -41,8 +41,8 @@ module JimmyJukebox
 
     attr_reader :user_config
 
-    def initialize
-      @user_config = UserConfig.new
+    def initialize(user_config = nil)
+      @user_config = user_config || UserConfig.new
       ARTISTS.values.each { |artist| define_artist artist[:name].to_sym }
     end
 
@@ -56,24 +56,24 @@ module JimmyJukebox
       end
     end
 
-    def all_songs(genre = nil) # valid genres: 'JAZZ', 'CLASSICAL', 'BLUEGRASS', 'BANJO', 'ROCK'
-      all_songs = {}
+    def all_downloadable_songs(genre = nil) # valid genres: 'JAZZ', 'CLASSICAL', 'BLUEGRASS', 'BANJO', 'ROCK'
+      result = {}
       ARTISTS.values.each do |artist|
         next if genre && artist[:genre] != genre
         fn = File.dirname(__FILE__) + "/songs/#{artist_name_to_yaml_file(artist[:name].to_s)}"
         if File.exists?(fn)
           YAML::load_file(fn).each do |song|
-            all_songs[song] = artist
+            result[song] = artist
           end
         end
       end
-      all_songs
+      result
     end
 
     def sample_genre(num_songs, genre = nil)
       # loop through array and download num_songs new songs (or until end of array reached)
       sample = {}
-      available_songs = all_songs(genre)
+      available_songs = all_downloadable_songs(genre)
       num_songs.times do
         unless available_songs.length == 0
           k, v = available_songs.rand_pair!

data/lib/jimmy_jukebox/user_config.rb

@@ -2,8 +2,10 @@ require 'fileutils'
 require 'forwardable'
 require 'rbconfig'
 
+require 'jimmy_jukebox/constants'
 require 'jimmy_jukebox/artists'
 require 'jimmy_jukebox/song'
+require 'jimmy_jukebox/song_loader'
 require 'jimmy_jukebox/music_player_detector'
 include Artists
 
@@ -29,7 +31,7 @@ module JimmyJukebox
     extend Forwardable
 
     attr_writer   :music_directories
-    attr_accessor :songs, :music_player_detector, :argv0
+    attr_accessor :song_paths, :music_player_detector, :argv0
     def_delegators :@music_player_detector, :ogg_player, :mp3_player, :wav_player, :flac_player
 
     DEFAULT_PLAYLIST_DIR = File.expand_path(File.join("~",".jimmy_jukebox"))
@@ -42,7 +44,7 @@ module JimmyJukebox
     end
 
     def initialize
-      self.songs = []
+      self.song_paths = []
       self.argv0 = ARGV[0]
       set_music_players
       generate_directories_list
@@ -195,11 +197,21 @@ module JimmyJukebox
         end
         files.delete_if { |f| AUDIO_FORMATS.keys.all? { |re| !f.match(re) } }
         files.map! { |f| File.expand_path(music_dir) + '/' + f }
-        files.each { |f| songs << f }
+        files.each { |f| song_paths << f }
       end
-      puts "WARNING: JimmyJukebox could not find any songs" unless songs.length > 0
-      #songs = ["~/Music/Artie_Shaw/Georgia On My Mind 1941.mp3",
-      #         "~/Music/Jelly_Roll_Morton/High Society 1939.mp3"]
+      puts "WARNING: JimmyJukebox could not find any songs" unless song_paths.length > 0
+      #song_paths = ["/home/xxx/Music/Artie_Shaw/Georgia On My Mind 1941.mp3",
+      #              "/home/xxx/Music/Jelly_Roll_Morton/High Society 1939.mp3"]
+    end
+
+    def undownloaded_songs
+      result = {}
+      JimmyJukebox::SongLoader.new(self).all_downloadable_songs.each do |url, artist|
+        save_path = root_music_dir + artist_name_to_subdir_name(artist[:name]) + '/' + File.basename(url)
+        next if song_paths.include?(save_path)
+        result[url] = artist
+      end
+      result
     end
 
   end

data/lib/jimmy_jukebox/user_input_handler.rb

@@ -0,0 +1,68 @@
+require 'jimmy_jukebox/check_io_console'
+require 'jimmy_jukebox/jukebox'
+require 'jimmy_jukebox/check_jruby'
+
+module JimmyJukebox
+
+  class UserInputHandler
+  
+    class NoPlayLoopThreadException < Exception; end
+    
+    attr_accessor :jukebox
+
+    def initialize(jukebox)
+      self.jukebox = jukebox
+    end
+
+    def set_get_char_method
+      @get_char_method = if JimmyJukebox::RUNNING_JRUBY
+                           lambda { STDIN.getch }
+                         else
+                           lambda {
+                             begin
+                               stty_state = `stty -g`
+                               system("stty raw opost -echo -icanon isig")
+                               STDIN.getc.chr
+                             ensure
+                               `stty #{stty_state}`
+                             end
+                           }
+                         end
+    end
+
+    def get_char
+      @get_char_method.call
+    end
+  
+    def repl
+      set_get_char_method
+      loop do
+        case char = get_char
+        when "q", "Q"
+          raise Interrupt
+        when "e", "E"
+          jukebox.erase_song
+        when "p", "P"
+          if jukebox.current_song.paused?
+            jukebox.unpause_current_song
+          else
+            puts "Pausing. To unpause, enter 'p' again"
+            jukebox.pause_current_song
+          end
+        when "r", "R"
+          jukebox.replay_previous_song
+        when "s", "S"
+          jukebox.skip_song
+        else
+          puts "#{char.strip} is not a valid response" if char
+        end
+      end
+    rescue Interrupt, SystemExit => e
+      puts "JimmyJukebox closed by user request. Bye!"
+      jukebox.quit
+      exit
+    end
+
+  end
+
+end

data/lib/jimmy_jukebox/user_interface.rb

@@ -1,19 +1,4 @@
-begin
-  require 'io/console'
-rescue LoadError
-  puts "*** JimmyJukebox uses io/console, which is built into Ruby 1.9.3. I recommend running JimmyJukebox on 1.9.3. You could instead install the 'io-console' gem, but the most recent version works only with 1.9.3, so try \"gem install io-console -v '0.3'\" ***"
-  exit
-end
-
-if JimmyJukebox::RUNNING_JRUBY
-  class IO
-    def getch
-      raw do
-        getc
-      end
-    end
-  end
-end
+require 'jimmy_jukebox/user_input_handler'
 
 jj = Jukebox.new
 
@@ -22,49 +7,13 @@ play_loop_thread = Thread.new do
   jj.play_loop
 end
 
+uih = UserInputHandler.new(jj)
+
 user_input_thread = Thread.new do
   
-  class NoPlayLoopThreadException < Exception; end
+  raise NoPlayLoopThreadException, "Can't find play_loop_thread" unless play_loop_thread
+  uih.repl
 
-  begin
-    loop do
-      if JimmyJukebox::RUNNING_JRUBY
-        char = STDIN.getch
-      else
-        begin
-          stty_state = `stty -g`
-          system("stty raw opost -echo -icanon isig")
-          char = STDIN.getc.chr
-        ensure
-          `stty #{stty_state}`
-        end
-      end
-      case char
-      when "q", "Q"
-        raise Interrupt
-      when "e", "E"
-        jj.erase_song
-      when "p", "P"
-        raise NoPlayLoopThreadException, "Can't find play_loop_thread" unless play_loop_thread
-        if jj.current_song.paused?
-          jj.unpause_current_song
-        else
-          puts "Pausing. To unpause, enter 'p' again"
-          jj.pause_current_song
-        end
-      when "r", "R"
-        jj.replay_previous_song
-      when "s", "S"
-        jj.skip_song
-      else
-        puts "#{char.strip} is not a valid response" if char
-      end
-    end
-  rescue Interrupt, SystemExit => e
-    puts "JimmyJukebox closed by user request. Bye!"
-    jj.quit
-    exit
-  end
 end
 
 play_loop_thread.join

data/lib/jimmy_jukebox/version.rb

@@ -1,4 +1,4 @@
 module JimmyJukebox
-  VERSION = '0.6.0'
-  DATE = '2013-03-26'
+  VERSION = '0.6.1'
+  DATE = '2013-03-28'
 end

data/spec/jimmy_jukebox_spec.rb

@@ -48,6 +48,7 @@ describe Jukebox do
       let(:song2_path) { File.expand_path('~/Music/Rock/Beatles/Sgt_Pepper.mp3') }
       let(:song3_path) { File.expand_path('~/Music/Rock/Eagles/Hotel_California.ogg') }
       let(:jb) { Jukebox.new(uc) }
+      let(:downloaded) { jb.downloaded_song_paths }
 
       before do
         [song1_path, song2_path, song3_path].each do |song|
@@ -59,10 +60,10 @@ describe Jukebox do
       end
 
       it "generates a non-empty song list" do
-        jb.songs.should_not be_nil
-        jb.songs.should_not be_empty
-        jb.songs.length.should == 3
-        jb.songs.grep(/Abbey_Road.mp3/).length.should == 1
+        downloaded.should_not be_nil
+        downloaded.should_not be_empty
+        downloaded.length.should == 3
+        downloaded.grep(/Abbey_Road.mp3/).length.should == 1
       end
 
       it "can quit" do
@@ -72,9 +73,8 @@ describe Jukebox do
         play_loop_thread = Thread.new do
           jb.play_loop
         end
-        sleep 0.5
+        sleep 0.1
         jb.playing?.should be_true
-        p jb.current_song
         jb.quit
       end
 

data/spec/song_loader_spec.rb

@@ -84,26 +84,26 @@ describe SongLoader do
 
   end
 
-  describe "#all_songs" do
+  describe "#all_downloadable_songs" do
 
     context "no genre specified" do
 
-      let(:all_songs) { SongLoader.new.all_songs }
+      let(:all_downloadable_songs) { SongLoader.new.all_downloadable_songs }
 
       it "should include songs from artist lists" do
-        all_songs.keys.should include "http://archive.org/download/MozartSinfoniaConcertanteK.364spivakovMintz/02Mozart_SinfoniaConcertanteInEFlatK364-2.Andante.mp3"
-        all_songs.keys.should include "http://archive.org/download/WinnerRagtimeBand-TheTurkeyTrot1912/WinnerRagtimeBand-TurkeyTrot1912.mp3"
+        all_downloadable_songs.keys.should include "http://archive.org/download/MozartSinfoniaConcertanteK.364spivakovMintz/02Mozart_SinfoniaConcertanteInEFlatK364-2.Andante.mp3"
+        all_downloadable_songs.keys.should include "http://archive.org/download/WinnerRagtimeBand-TheTurkeyTrot1912/WinnerRagtimeBand-TurkeyTrot1912.mp3"
       end
 
     end
 
     context "genre 'JAZZ' specified" do
 
-      let(:all_songs) { SongLoader.new.all_songs('JAZZ') }
+      let(:all_downloadable_songs) { SongLoader.new.all_downloadable_songs('JAZZ') }
 
       it "should include only songs from jazz artist lists" do
-        all_songs.keys.should_not include "http://archive.org/download/MozartSinfoniaConcertanteK.364spivakovMintz/02Mozart_SinfoniaConcertanteInEFlatK364-2.Andante.mp3"
-        all_songs.keys.should include "http://archive.org/download/WinnerRagtimeBand-TheTurkeyTrot1912/WinnerRagtimeBand-TurkeyTrot1912.mp3"
+        all_downloadable_songs.keys.should_not include "http://archive.org/download/MozartSinfoniaConcertanteK.364spivakovMintz/02Mozart_SinfoniaConcertanteInEFlatK364-2.Andante.mp3"
+        all_downloadable_songs.keys.should include "http://archive.org/download/WinnerRagtimeBand-TheTurkeyTrot1912/WinnerRagtimeBand-TurkeyTrot1912.mp3"
       end
 
     end

data/spec/song_spec.rb

@@ -11,10 +11,12 @@ module JimmyJukebox
     def spawn_method
       if JimmyJukebox::RUNNING_JRUBY
         require 'spoon'
-        lambda { |command, arg| Spoon.spawnp('sleep 2') }
+        lambda { |command, arg| Spoon.spawnp('sleep 5') }
       else
         require 'posix/spawn'
-        lambda { |command, arg| POSIX::Spawn::spawn('sleep 2') }
+        # no idea why ';boguscommand' works, but tests fail without it
+        #lambda { |command, arg| POSIX::Spawn::spawn('sleep 2; boguscommand') }
+        lambda { |command, arg| POSIX::Spawn::spawn('sleep 5') }
       end
     end
   end
@@ -28,16 +30,28 @@ describe Song do
       expect {Song.new}.to raise_error
     end
 
-    it "fails if parameter does not end in .mp3 or .ogg" do
-      expect {Song.new("/home/bill/music_file")}.to raise_error
+    it "fails if parameter does not have file extension" do
+      expect {Song.new(File.expand_path("~/music_file"))}.to raise_error
     end
 
     it "accepts a parameter ending in .mp3" do
-      Song.new("/home/bill/music_file.mp3").is_a?(Song)
+      Song.new(File.expand_path("~/music_file.mp3")).is_a?(Song)
     end
 
     it "accepts a parameter ending in .ogg" do
-      Song.new("/home/bill/music_file.ogg").is_a?(Song)
+      Song.new(File.expand_path("~/music_file.ogg")).is_a?(Song)
+    end
+
+    it "accepts a parameter ending in .flac" do
+      Song.new(File.expand_path("~/music_file.flac")).is_a?(Song)
+    end
+
+    it "accepts a parameter ending in .wav" do
+      Song.new(File.expand_path("~/music_file.wav")).is_a?(Song)
+    end
+
+    it "handles uppercase file extensions" do
+      Song.new(File.expand_path("~/music_file.WAV")).is_a?(Song)
     end
 
     it "sets a music file" do
@@ -46,6 +60,12 @@ describe Song do
       song.music_file.should == mf
     end
 
+    it "sets a music file when passed with ~" do
+      mf = "~/Music/JAZZ/billie_holiday.ogg"
+      song = Song.new(mf)
+      song.music_file.should == File.expand_path(mf)
+    end
+
   end
 
   describe "#paused?" do
@@ -53,26 +73,41 @@ describe Song do
     before(:each) do
       @uc = UserConfig.new
       @jj = Jukebox.new(@uc, false)
-      @song = Song.new("~/Music/JAZZ/art_tatum.mp3")
     end
 
     it "is initially not paused" do
-      @jj.play_song(@song)
-      @song.paused?.should be_false
+      Thread.new do
+        song = Song.new("~/Music/JAZZ/art_tatum.mp3")
+        @jj.play_song(song)
+      end
+      sleep 0.1
+      @jj.should be_playing
+      @jj.current_song.paused?.should be_false
+      @jj.quit
     end
 
     it "is paused after calling #pause" do
-      @jj.play_song(@song)
+      Thread.new do
+        song = Song.new("~/Music/JAZZ/art_tatum.mp3")
+        @jj.play_song(song)
+      end
+      sleep 0.1
       @jj.pause_current_song
-      @song.paused?.should be_true
+      @jj.current_song.paused?.should be_true
+      @jj.quit
     end
 
     it "is unpaused after calling #pause and #unpause" do
-      @jj.play_song(@song)
-      @song.pause
-      @song.paused?.should be_true
-      @song.unpause
-      @song.paused?.should be_false
+      Thread.new do
+        song = Song.new("~/Music/JAZZ/art_tatum.mp3")
+        @jj.play_song(song)
+      end
+      sleep 0.1
+      @jj.current_song.pause
+      @jj.current_song.paused?.should be_true
+      @jj.current_song.unpause
+      @jj.current_song.paused?.should be_false
+      @jj.quit
     end
 
   end
@@ -82,37 +117,61 @@ describe Song do
     before(:each) do
       @uc = UserConfig.new
       @jj = Jukebox.new(@uc, false)
-      @song = Song.new("~/Music/JAZZ/art_tatum.mp3")
-    end
-
-    it "is initially not paused" do
-      @jj.play_song(@song)
-      @song.playing_pid.should be_kind_of(Integer)
-      @jj.skip_song
-      @song.playing_pid.should be_nil
+      @jj.stub(:downloaded_song_paths).and_return(['~/Music/JAZZ/Duke_Ellington/song1.ogg','~/Music/CLASSICAL/Bach/song2.mp3'])
+      #@song = Song.new("~/Music/JAZZ/art_tatum.mp3")
     end
 
   end
 
-  describe "#play_loop" do
+  describe "#play_loop & #skip_song" do
 
     before(:each) do
       @uc = UserConfig.new
-      #FileUtils.mkdir_p(File.expand_path("~/Music/JAZZ"))
-      @song = Song.new("~/Music/JAZZ/art_tatum.mp3")
-      Jukebox.any_instance.stub(:songs).and_return([@song])
-      Jukebox.any_instance.stub(:next_song).and_return(@song)
-    end
-
-    it "should automatically play the first song" do
+      @song1 = "~/Music/JAZZ/art_tatum.mp3"
+      @song2 = "~/Music/JAZZ/dizzy.mp3"
+      @song3 = "~/Music/JAZZ/earl_hines.mp3"
+      @song4 = "~/Music/CLASSICAL/beethoven.mp3"
       @jj = Jukebox.new(@uc)
-      play_loop_thread = Thread.new do
+      @jj.stub(:downloaded_song_paths).and_return([@song1, @song2, @song3, @song4])
+      @play_loop_thread = Thread.new do
         @jj.play_loop
       end
       sleep 0.1
-      @jj.playing?.should be_true
-      play_loop_thread.exit
     end
+
+    describe "#play_loop" do
+
+      it "should automatically play the first song" do
+        @jj.should be_playing
+        @jj.downloaded_song_paths.map { |f| File.expand_path(f) }.should include @jj.current_song.music_file
+        @play_loop_thread.exit
+      end
+
+    end
+
+    describe "#skip_song" do
+
+      it "is initially not paused" do
+        test_thread = Thread.new do
+          @jj.should be_playing
+          puts @jj.current_song.playing_pid
+          puts @jj.current_song.music_file
+          first_song_pid = @jj.current_song.playing_pid
+          sleep 0.5
+          @jj.skip_song
+          puts @jj.current_song.playing_pid
+          puts @jj.current_song.music_file
+          @jj.current_song.playing_pid.should_not == first_song_pid
+          @jj.should be_playing
+        end
+        [@play_loop_thread, test_thread].each do |t|
+          t.join
+        end
+        @play_loop_thread.exit
+      end
+
+    end
+
   end
 
 end

data/spec/user_config_spec.rb

@@ -128,32 +128,60 @@ describe UserConfig do
 
   end
 
-  describe "#files" do
+  describe "#song_paths and #undownloaded_songs" do
     let(:user_config) { UserConfig.new }
-    let(:dir1) { '~/Music/artist1' }
-    let(:dir2) { '~/Music/artist2' }
+    let(:dir1) { '~/Music/JAZZ/John_Coltrane' }
+    let(:dir2) { '~/Music/CLASSICAL/Vivaldi' }
     let(:d1) { File.expand_path(dir1) }
     let(:d2) { File.expand_path(dir2) }
 
     before(:each) do
       FileUtils.mkdir_p(d1)
-      FileUtils.mkdir_p(d1 + '/subdir')
       FileUtils.mkdir_p(d2)
-      FileUtils.touch d1 + '/song1.mp3'
-      FileUtils.touch d1 + '/subdir/song2.ogg'
-      FileUtils.touch d1 + '/subdir/song5.afdsdf'
-      FileUtils.touch d2 + '/song3.flac'
-      FileUtils.touch d2 + '/song4.wav'
-      FileUtils.touch d2 + '/song5.WAV'
+      FileUtils.touch d1 + '/a_love_supreme.mp3'
+      FileUtils.touch d1 + '/my_funny_valentine.ogg'
+      FileUtils.touch d1 + '/song5.afdsdf'
+      FileUtils.touch d2 + '/four_seasons.flac'
+      FileUtils.touch d2 + '/spring.wav'
+      FileUtils.touch d2 + '/Summer.WAV'
     end
 
-    it "generates a complete song list" do
-      user_config.songs.should include File.expand_path(d1 + '/song1.mp3')
-      user_config.songs.should include File.expand_path(d1 + '/subdir/song2.ogg')
-      user_config.songs.should include File.expand_path(d2 + '/song3.flac')
-      user_config.songs.should include File.expand_path(d2 + '/song4.wav')
-      user_config.songs.should include File.expand_path(d2 + '/song5.WAV')
-      user_config.songs.length.should == 5
+    describe "#song_paths" do
+
+      it "generates a complete song list" do
+        user_config.song_paths.should include File.expand_path(d1 + '/a_love_supreme.mp3')
+        user_config.song_paths.should include File.expand_path(d1 + '/my_funny_valentine.ogg')
+        user_config.song_paths.should include File.expand_path(d2 + '/four_seasons.flac')
+        user_config.song_paths.should include File.expand_path(d2 + '/spring.wav')
+        user_config.song_paths.should include File.expand_path(d2 + '/Summer.WAV')
+        user_config.song_paths.length.should == 5
+      end
+
+      it "does not include the invalid-formatted song in the list" do
+        user_config.song_paths.should_not include File.expand_path(d1 + '/song5.afdsdf')
+      end
+
+    end
+
+    describe "#undownloaded_songs" do
+   
+      before do
+        @song_hash = {'http://www.mp3.com/a_love_supreme.mp3' => {:genre => 'JAZZ', :name => 'john_coltrane'},
+                      'http://www.flac.net/four_seasons.flac' => {:genre => 'CLASSICAL', :name => 'vivaldi'},
+                      'http://www.wav.com/winter.wav' => {:genre => 'CLASSICAL', :name => 'vivaldi'},
+                      'http://www.ogg.org/maybeline.ogg' => {:genre => 'ROCK', :name => 'chuck_berry'}
+                     }
+      end
+
+      it "correctly generates the list of undownloaded songs" do
+        JimmyJukebox::SongLoader.any_instance.stub(:all_downloadable_songs).and_return(@song_hash)
+        undownloaded_urls = user_config.undownloaded_songs.keys
+        undownloaded_urls.should include 'http://www.wav.com/winter.wav'
+        undownloaded_urls.should include 'http://www.ogg.org/maybeline.ogg'
+        undownloaded_urls.should_not include 'http://www.flac.net/four_seasons.flac'
+        undownloaded_urls.should_not include 'http://www.mp3.com/a_love_supreme.mp3'
+      end
+
     end
 
   end
@@ -214,39 +242,39 @@ describe UserConfig do
 
     let(:uc) { UserConfig.new }
 
-    context "with no songs" do
+    context "with no song_paths" do
 
-      it "finds no songs" do
-        uc.songs.length.should == 0
+      it "finds no song_paths" do
+        uc.song_paths.length.should == 0
       end
 
     end
 
-    context "with songs in ~/Music" do
+    context "with song_paths in ~/Music" do
 
       before(:each) do
         FileUtils.mkdir_p File.expand_path("~/Music")
         FileUtils.touch File.expand_path("~/Music/Yellow_Submarine.mp3")
       end
 
-      it "finds songs" do
-        uc.songs.should_not be_empty
-        uc.songs.length.should == 1
+      it "finds song_paths" do
+        uc.song_paths.should_not be_empty
+        uc.song_paths.length.should == 1
       end
 
     end
 
-    context "with songs in ~/Music subdirectory" do
+    context "with song_paths in ~/Music subdirectory" do
 
       before do
         FileUtils.mkdir_p File.expand_path("~/Music/ROCK/Beatles")
         FileUtils.touch File.expand_path("~/Music/ROCK/Beatles/Yellow_Submarine.mp3")
       end
 
-      it "finds songs" do
+      it "finds song_paths" do
         File.directory?(File.expand_path("~/Music/ROCK/Beatles")).should be_true
-        uc.songs.should_not be_empty
-        uc.songs.length.should == 1
+        uc.song_paths.should_not be_empty
+        uc.song_paths.length.should == 1
       end
 
     end

metadata

@@ -1,114 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  prerelease:
+  version: 0.6.1
 platform: ruby
 authors:
 - James Lavin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: jimmy_jukebox downloads great music and plays random MP3 & OGG songs
-  under a directory (or set of directories)
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+description: jimmy_jukebox downloads great music and plays random MP3 & OGG songs under a directory (or set of directories)
 email: james@jameslavin.com
 executables:
 - play_jukebox
@@ -119,11 +130,15 @@ files:
 - roadmap.txt
 - LICENSE.txt
 - lib/jimmy_jukebox.rb
+- lib/jimmy_jukebox/check_jruby.rb
 - lib/jimmy_jukebox/handle_load_jukebox_input.rb
+- lib/jimmy_jukebox/check_gems.rb
+- lib/jimmy_jukebox/user_input_handler.rb
 - lib/jimmy_jukebox/display_options.rb
 - lib/jimmy_jukebox/music_player_detector.rb
 - lib/jimmy_jukebox/load_jukebox_code.rb
 - lib/jimmy_jukebox/user_interface.rb
+- lib/jimmy_jukebox/check_io_console.rb
 - lib/jimmy_jukebox/user_config.rb
 - lib/jimmy_jukebox/jukebox.rb
 - lib/jimmy_jukebox/constants.rb
@@ -192,27 +207,28 @@ files:
 - bin/load_jukebox
 homepage: https://github.com/JamesLavin/jimmy_jukebox
 licenses: []
-post_install_message: I really hope you enjoy the great jazz, classical, bluegrass,
-  and early rock music downloadable using this gem!
+post_install_message: I really hope you enjoy the great jazz, classical, bluegrass, and early rock music downloadable using this gem!
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: jimmy_jukebox
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: plays your MP3 & OGG files and lets you easily download music
 test_files:
@@ -224,4 +240,3 @@ test_files:
 - spec/song_loader_spec.rb
 - spec/load_jukebox_code_spec.rb
 - spec/jimmy_jukebox_spec.rb
-has_rdoc: