jimmy_jukebox 0.5.9 → 0.6.0

data/lib/jimmy_jukebox/constants.rb

@@ -0,0 +1,9 @@
+module JimmyJukebox
+
+  AUDIO_FORMATS = {/\.mp3$/i => 'mp3',
+                   /\.ogg$/i => 'ogg',
+                   /\.wav$/i => 'wav',
+                   /.flac$/i => 'flac'}
+
+end
+

data/lib/jimmy_jukebox/handle_load_jukebox_input.rb

@@ -0,0 +1,64 @@
+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"
+      exit
+    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."
+      exit
+    end
+
+    def valid_artist?(arg)
+      ARTISTS.has_key?(arg.to_sym)
+    end
+
+    def valid_genre?(arg)
+      # probably shouldn't hardcode these
+      valid_genres = [/^JAZZ$/i, /^CLASSICAL$/i, /^BLUEGRASS$/i, /^BANJO$/i, /^ROCK$/i]
+      valid_genres.any? { |g| g =~ arg }
+    end
+
+    def artist_name(arg)
+      ARTISTS[arg.to_sym][:name]
+    end
+
+    def valid_integer?(arg)
+      arg && arg.to_i.is_a?(Integer) && arg.to_i > 0
+    end
+
+    def process_artist
+      if valid_integer?(ARGV[1])
+        JimmyJukebox::SongLoader.new.send(artist_name(ARGV[0]), ARGV[1].to_i)
+      else
+        JimmyJukebox::SongLoader.new.send(artist_name(ARGV[0]))
+      end
+    end
+
+    def process_sample
+      if ARGV[1].nil?
+        JimmyJukebox::SongLoader.new.download_sample_genre(1)
+      elsif valid_integer?(ARGV[1]) && valid_genre?(ARGV[2])
+        JimmyJukebox::SongLoader.new.download_sample_genre(ARGV[1].to_i, ARGV[2].upcase)
+      elsif valid_genre?(ARGV[1]) && valid_integer?(ARGV[2])
+        JimmyJukebox::SongLoader.new.download_sample_genre(ARGV[2].to_i, ARGV[1].upcase)
+      elsif valid_integer?(ARGV[1])
+        JimmyJukebox::SongLoader.new.download_sample_genre(ARGV[1].to_i)
+      elsif valid_genre?(ARGV[1])
+        JimmyJukebox::SongLoader.new.download_sample_genre(1, ARGV[1].upcase)
+      else
+        JimmyJukebox::SongLoader.new.download_sample_genre(1)
+      end
+    end
+
+  end
+
+end

data/lib/jimmy_jukebox/load_jukebox_code.rb

@@ -5,39 +5,16 @@ require 'jimmy_jukebox/song_loader'
 require 'jimmy_jukebox/artists'
 include Artists
 
-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"
-  exit
-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."
-  exit
-end
-
-def valid_artist?(arg)
-  ARTISTS.has_key?(arg.to_sym)
-end
-
-def artist_name(arg)
-  ARTISTS[arg.to_sym][:name]
-end
-
-def valid_integer?(arg)
-  arg && arg.to_i.is_a?(Integer)
-end
+require 'jimmy_jukebox/handle_load_jukebox_input'
+include HandleLoadJukeboxInput
 
 no_argv0 unless ARGV[0]
 
-invalid_artist unless valid_artist?(ARGV[0])
-
-if valid_integer?(ARGV[1])
-  JimmyJukebox::SongLoader.new.send(artist_name(ARGV[0]), ARGV[1].to_i)
+if ARGV[0] =~ /sample/i
+  process_sample
+elsif valid_artist?(ARGV[0])
+  process_artist
 else
-  JimmyJukebox::SongLoader.new.send(artist_name(ARGV[0]))
+  invalid_artist
 end
+

data/lib/jimmy_jukebox/song.rb

@@ -2,11 +2,6 @@ require_relative "display_options"
 
 module JimmyJukebox
 
-  AUDIO_FORMATS = {/\.mp3$/i => 'mp3',
-                   /\.ogg$/i => 'ogg',
-                   /\.wav$/i => 'wav',
-                   /.flac$/i => 'flac'}
-
   class Song
 
     include JimmyJukebox::DisplayOptions

data/lib/jimmy_jukebox/song_loader.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'yaml'
 require 'uri'
 
+require 'jimmy_jukebox/constants'
 require 'jimmy_jukebox/artists'
 include Artists
 
@@ -12,15 +13,32 @@ class Object
   end
 end
 
+class Hash
+  def rand_key
+    keys.at(Random.new.rand(0..(keys.size - 1)))
+  end
+
+  def rand_pair
+    k = rand_key
+    return k, fetch(k)
+  end
+
+  def rand_pair!
+    k,v = rand_pair
+    delete( k )
+    return k,v
+  end
+end
+
 require 'jimmy_jukebox/user_config'
 include JimmyJukebox
 
+require 'jimmy_jukebox/song'
+
 module JimmyJukebox
 
   class SongLoader
 
-    MUSIC_TYPES = /\.mp3$|\.ogg$/i
-
     attr_reader :user_config
 
     def initialize
@@ -31,33 +49,77 @@ module JimmyJukebox
     def define_artist(name)
       metaclass.instance_eval do
         define_method(name) do |max_num = nil|
-          save_dir = user_config.default_music_dir + artist_name_to_subdir_name(name.to_s)
+          save_dir = user_config.root_music_dir + artist_name_to_subdir_name(name.to_s)
           songs = YAML::load_file(File.dirname(__FILE__) + "/songs/#{artist_name_to_yaml_file(name.to_s)}")
           download_num_songs(songs, save_dir, max_num)
         end
       end
     end
 
+    def all_songs(genre = nil) # valid genres: 'JAZZ', 'CLASSICAL', 'BLUEGRASS', 'BANJO', 'ROCK'
+      all_songs = {}
+      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
+          end
+        end
+      end
+      all_songs
+    end
 
-    def sample_jazz(num_songs)
-      # create array of all possible songs
+    def sample_genre(num_songs, genre = nil)
       # loop through array and download num_songs new songs (or until end of array reached)
-      raise "not yet implemented"
+      sample = {}
+      available_songs = all_songs(genre)
+      num_songs.times do
+        unless available_songs.length == 0
+          k, v = available_songs.rand_pair!
+          sample[k] = v
+        end
+      end
+      sample
+    end
+
+    def download_sample_genre(num_songs = 1, genre = nil)
+      sample = sample_genre(num_songs, genre)
+      sample.each do |song_url, artist|
+        save_dir = user_config.root_music_dir + artist_name_to_subdir_name(artist[:name].to_s)
+        download_song(song_url, save_dir)
+      end
     end
 
     def sample_classical(num_songs)
       raise "not yet implemented"
     end
 
+    def valid_music_format_extension?(song_filename)
+      JimmyJukebox::AUDIO_FORMATS.keys.any? { |k|
+        song_filename =~ k
+      }
+    end
+
+    def strip_music_format_extension(song_filename)
+      fn = song_filename.dup
+      JimmyJukebox::AUDIO_FORMATS.keys.each do |k|
+        fn.gsub!(k,"") if fn =~ k
+      end
+      fn
+    end
+
     def version_of_song_in_dir_or_subdir?(song_filename, save_dir)
+      extensionless_song_filename = strip_music_format_extension(song_filename)
       existing_files = all_subdir_music_files_extensionless(save_dir)
-      existing_files.include?(song_filename.gsub(SongLoader::MUSIC_TYPES,"")) # does extensionless song_filename exist in directory?
+      existing_files.include?(extensionless_song_filename) # does extensionless song_filename exist in directory?
     end
 
     def version_of_song_under_specific_dir?(song_filename, save_dir)
-      existing_files = Dir.entries(".").delete_if { |f| !f.match(SongLoader::MUSIC_TYPES) }  # delete unless .mp3 or .ogg
-      existing_files.map! { |f| f.gsub(SongLoader::MUSIC_TYPES,"") }                         # strip extensions
-      existing_files.include?(song_filename.gsub(SongLoader::MUSIC_TYPES,"")) ? true : false # does extensionless song_filename exist in directory?
+      extensionless_song_filename = strip_music_format_extension(song_filename)
+      existing_files = Dir.entries(".").delete_if { |f| !valid_music_format_extension?(f) }  # delete unless valid format
+      existing_files.map! { |f| strip_music_format_extension(f) }  # strip extensions
+      existing_files.include?(extensionless_song_filename) # does extensionless song_filename exist in directory?
     end
 
     def all_subdir_music_files(dir)
@@ -65,12 +127,12 @@ module JimmyJukebox
       if "".respond_to?(:force_encoding)                      # Ruby 1.8 doesn't have string encoding or String#force_encoding
         existing_files.delete_if { |f| !f.force_encoding("UTF-8").valid_encoding? } # avoid "invalid byte sequence in UTF-8 (ArgumentError)"
       end
-      existing_files.delete_if { |f| !f.match(SongLoader::MUSIC_TYPES) }  # delete unless .mp3, .MP3, .ogg or .OGG
+      existing_files.delete_if { |f| !valid_music_format_extension?(f) }  # delete unless valid format
       existing_files.map { |f| File.basename(f) }                        # strip any path info preceding the filename
     end
 
     def all_subdir_music_files_extensionless(dir)
-      all_subdir_music_files(dir).map! { |f| f.gsub(SongLoader::MUSIC_TYPES,"") }      # strip extensions
+      all_subdir_music_files(dir).map! { |f| strip_music_format_extension(f) }      # strip extensions
     end
 
     def create_save_dir(save_dir)
@@ -105,14 +167,14 @@ module JimmyJukebox
     def download_num_songs(song_urls, save_dir, max_num = nil)
       current_songs = all_subdir_music_files(save_dir)
       do_not_have = downloadable(song_urls, current_songs)
-      puts "You already have all songs for this artist" if do_not_have.empty?
+      puts "You already have all #{current_songs.length} songs for this artist" if do_not_have.empty?
       if max_num
         more_songs = max_num - current_songs.length
         if more_songs > 0
           do_not_have = n_random_songs(do_not_have, more_songs)
         else
           puts "You already have #{current_songs.length} songs by this artist and are requesting a maximum of #{max_num} songs"
-          do_not_have = []
+          return nil
         end
       end
       download_songs(do_not_have, save_dir)
@@ -138,6 +200,7 @@ module JimmyJukebox
     end
 
     def download_song(song_url, save_dir)
+      create_save_dir(save_dir) unless File.directory?(save_dir)
       savename = song_savename(song_url)
       return if song_already_exists?(savename, save_dir)
       puts "Downloading #{savename} to #{save_dir}"

data/lib/jimmy_jukebox/user_config.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'forwardable'
+require 'rbconfig'
 
 require 'jimmy_jukebox/artists'
 require 'jimmy_jukebox/song'
@@ -23,10 +24,12 @@ module JimmyJukebox
 
   class UserConfig
 
+    class FileHoldingDirectoriesNotFoundException < Exception; end
+
     extend Forwardable
 
     attr_writer   :music_directories
-    attr_accessor :songs, :music_player_detector
+    attr_accessor :songs, :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"))
@@ -40,6 +43,7 @@ module JimmyJukebox
 
     def initialize
       self.songs = []
+      self.argv0 = ARGV[0]
       set_music_players
       generate_directories_list
       generate_song_list
@@ -56,24 +60,28 @@ module JimmyJukebox
         /^rock$/i      => rock_dir }
     end
 
+    def root_music_dir
+      @root_music_dir || default_music_dir
+    end
+
     def default_music_dir
       File.expand_path(File.join("~","Music"))
     end
 
     def bluegrass_dir
-      default_music_dir + '/BLUEGRASS'
+      root_music_dir + '/BLUEGRASS'
     end
 
     def jazz_dir
-      default_music_dir + '/JAZZ'
+      root_music_dir + '/JAZZ'
     end
 
     def rock_dir
-      default_music_dir + '/ROCK'
+      root_music_dir + '/ROCK'
     end
 
     def classical_dir
-      default_music_dir + '/CLASSICAL'
+      root_music_dir + '/CLASSICAL'
     end
 
     def set_music_players
@@ -94,10 +102,12 @@ module JimmyJukebox
     end
 
     def set_music_directories_from_file
-      if File.exists?(File.expand_path(ARGV[0]))
-        @music_directories_file = File.expand_path(ARGV[0])
-      elsif File.exists?( File.expand_path( File.join(DEFAULT_PLAYLIST_DIR, ARGV[0]) ) )
-        @music_directories_file = File.expand_path(File.join(DEFAULT_PLAYLIST_DIR, ARGV[0]))
+      if File.exists?(File.expand_path(argv0))
+        @music_directories_file = File.expand_path(argv0)
+      elsif File.exists?( File.expand_path( File.join(DEFAULT_PLAYLIST_DIR, argv0) ) )
+        @music_directories_file = File.expand_path(File.join(DEFAULT_PLAYLIST_DIR, argv0))
+      else
+        raise FileHoldingDirectoriesNotFoundException, "Can't find the file #{argv0}"
       end
       load_top_level_directories_from_file
     end
@@ -111,25 +121,29 @@ module JimmyJukebox
       reg_ex ? shortcuts[reg_ex] : nil
     end
 
-    def generate_directories_list
-      # ARGV[0] can be "jazz.txt" (a file holding directory names),
+    def set_top_music_directories
+      # argv0 can be "jazz.txt" (a file holding directory names),
       # a shortcut (like 'j' or 'jazz' for jazz or 'r' or 'rock' for rock),
       # an artist shortcut (like 'bg' for Benny Goodman or 'md' for Miles Davis),
       # a directory path (like "~/Music/JAZZ")
       # or nil
-      if ARGV.empty?
-        music_directories << default_music_dir
-      elsif dir = shortcut_to_dir(ARGV[0].strip)
+      if argv0.nil?
+        music_directories << root_music_dir
+      elsif dir = shortcut_to_dir(argv0)
         music_directories << dir
-      elsif ARTISTS.keys.include?(ARGV[0].to_sym)
-        music_directories << default_music_dir + artist_key_to_subdir_name(ARGV[0].to_sym)
-      elsif is_a_txt_file?(ARGV[0].strip)
+      elsif ARTISTS.keys.include?(argv0.to_sym)
+        music_directories << root_music_dir + artist_key_to_subdir_name(argv0.to_sym)
+      elsif is_a_txt_file?(argv0)
         set_music_directories_from_file
-      elsif is_a_directory?(ARGV[0].strip)
-        music_directories << File.expand_path(ARGV[0].strip)
+      elsif is_a_directory?(argv0)
+        music_directories << File.expand_path(argv0)
       else
-        music_directories << default_music_dir
+        music_directories << root_music_dir
       end
+    end
+
+    def generate_directories_list
+      set_top_music_directories
       create_nonexistent_music_directories
       add_all_subdirectories
     end
@@ -147,7 +161,7 @@ module JimmyJukebox
 
     def is_a_directory?(whatever)
       return false unless whatever
-      File.directory?(File.expand_path(whatever)) ? true : false
+      File.directory?(File.expand_path(whatever))
     end
 
     def load_top_level_directories_from_file
@@ -176,8 +190,8 @@ module JimmyJukebox
     def generate_song_list
       music_directories.each do |music_dir|
         files = Dir.entries(File.expand_path(music_dir))
-        if "".respond_to?(:force_encoding)                                  # Ruby 1.8 doesn't have string encoding or String#force_encoding
-         files.delete_if { |f| !f.force_encoding("UTF-8").valid_encoding? } # avoid "invalid byte sequence in UTF-8 (ArgumentError)"
+        if "".respond_to?(:force_encoding)  # Ruby 1.8 doesn't have string encoding or String#force_encoding
+          files.delete_if { |f| !f.force_encoding("UTF-8").valid_encoding? } # avoid "invalid byte sequence in UTF-8 (ArgumentError)"
         end
         files.delete_if { |f| AUDIO_FORMATS.keys.all? { |re| !f.match(re) } }
         files.map! { |f| File.expand_path(music_dir) + '/' + f }

data/lib/jimmy_jukebox/user_interface.rb

@@ -1,4 +1,9 @@
-require 'io/console'
+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

data/lib/jimmy_jukebox/version.rb

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

data/lib/jimmy_jukebox.rb

@@ -1,3 +1,4 @@
+require 'jimmy_jukebox/constants'
 require 'jimmy_jukebox/user_config'
 require 'jimmy_jukebox/song'
 require 'jimmy_jukebox/jukebox'

data/spec/load_jukebox_code_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require_relative '../lib/jimmy_jukebox/handle_load_jukebox_input'
+
+include JimmyJukebox::HandleLoadJukeboxInput
+
+describe "#valid_genre?" do
+  
+  before do
+    ARGV.clear
+    ARGV[0] = 'sample'
+  end
+
+  it "should recognize 'jazz' as a valid genre" do
+    valid_genre?('jazz').should be_true
+  end
+
+  it "should recognize 'bluegrass' as a valid genre" do
+    valid_genre?('jazz').should be_true
+  end
+
+  it "should recognize 'banjo' as a valid genre" do
+    valid_genre?('jazz').should be_true
+  end
+
+  it "should recognize 'rock' as a valid genre" do
+    valid_genre?('jazz').should be_true
+  end
+
+  it "should recognize 'classical' as a valid genre" do
+    valid_genre?('classical').should be_true
+  end
+
+  it "should recognize 'JAZZ' as a valid genre" do
+    valid_genre?('JAZZ').should be_true
+  end
+
+  it "should not recognize 'invalid' as a valid genre" do
+    valid_genre?('invalid').should_not be_true
+  end
+
+end

data/spec/song_loader_spec.rb

@@ -7,10 +7,107 @@ require 'fakefs/safe'
 require 'jimmy_jukebox/song'
 require 'jimmy_jukebox/song_loader'
 
-describe "SongLoader" do
+describe SongLoader do
+
+  # WARNING: This section does NOT use FakeFS::SpecHelpers
+
+  describe "#download_sample_genre" do
+    
+    before(:each) do
+      ARGV.clear
+      @sl = JimmyJukebox::SongLoader.new
+    end
+
+    context "no genre or num specified" do
+
+      it "downloads one song" do
+        @sl.should_receive(:download_song).once
+        @sl.download_sample_genre
+      end
+
+    end
+
+    context "genre 'JAZZ' and num 10 specified" do
+
+      it "downloads 10 songs" do
+        @sl.should_receive(:download_song).exactly(10).times
+        @sl.download_sample_genre(10, 'JAZZ')
+      end
+
+    end
+
+    context "genre 'CLASSICAL' and num 1 specified" do
+
+      it "downloads one song" do
+        @sl.should_receive(:download_song).once
+        @sl.download_sample_genre(1, 'CLASSICAL')
+      end
+
+    end
+
+  end
+
+  describe "#sample_genre" do
+
+    context "genre is nil" do
+      let(:sampled_songs) { SongLoader.new.sample_genre(13) }
+
+      it "should select the indicated # of songs" do
+        sampled_songs.length.should == 13
+      end
+
+    end
+
+    context "genre == 'JAZZ'" do
+      let(:sampled_songs) { SongLoader.new.sample_genre(10, 'JAZZ') }
+
+      it "should select the indicated # of jazz songs" do
+        sampled_songs.length.should == 10
+        sampled_songs.values.each do |artist|
+          artist[:genre].should == 'JAZZ'
+        end
+      end
+
+    end
+
+    context "genre == 'CLASSICAL'" do
+      let(:sampled_songs) { SongLoader.new.sample_genre(12, 'CLASSICAL') }
+
+      it "should select the indicated # of classical songs" do
+        sampled_songs.length.should == 12
+        sampled_songs.values.each do |artist|
+          artist[:genre].should == 'CLASSICAL'
+        end
+      end
+
+    end
+
+  end
+
+  describe "#all_songs" do
+
+    context "no genre specified" do
+
+      let(:all_songs) { SongLoader.new.all_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"
+      end
+
+    end
+
+    context "genre 'JAZZ' specified" do
+
+      let(:all_songs) { SongLoader.new.all_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"
+      end
+
+    end
 
-  it "should have a SUPPORTED_MUSIC_TYPES of '/\.mp3$|\.ogg$/i'" do
-    SongLoader::MUSIC_TYPES.should == /\.mp3$|\.ogg$/i
   end
 
 end

data/spec/user_config_spec.rb

@@ -20,10 +20,143 @@ describe UserConfig do
   #  end
   #end
 
-  #describe "#set_default_mp3_dir" do
-  #
-  #
-  #end
+  describe "#initialize" do
+    let(:user_config) { UserConfig.new }
+
+    describe "blank ARGV" do
+
+      it "uses the default directory" do
+        user_config.music_directories.first.should == UserConfig.new.default_music_dir
+        user_config.music_directories.length.should == 1
+      end
+
+    end
+
+    describe "non-standard dir ARGV" do
+      let(:nonstd_dir) { "~/my_music_dir" }
+
+      it "uses the non-standard directory" do
+        full_dir = File.expand_path(nonstd_dir)
+        FileUtils.mkdir_p(full_dir)
+        ARGV[0] = nonstd_dir
+        user_config.music_directories.first.should == full_dir
+        user_config.music_directories.length.should == 1
+        ARGV[0] = nil
+      end
+
+    end
+
+    describe "artist dir ARGV" do
+      let(:artist_param) { 'jrm' }
+
+      it "uses the artist directory" do
+        artist_dir = File.expand_path("~/Music/JAZZ/Jelly_Roll_Morton")
+        FileUtils.mkdir_p(artist_dir)
+        ARGV[0] = artist_param
+        user_config.music_directories.first.should == artist_dir
+        user_config.music_directories.length.should == 1
+        ARGV[0] = nil
+      end
+
+    end
+
+    describe "shortcut 'j' ARGV" do
+      let(:shortcut_param) { 'j' }
+
+      it "finds all the jazz directories" do
+        at_dir = File.expand_path("~/Music/JAZZ/Art_Tatum")
+        de_dir = File.expand_path("~/Music/JAZZ/Duke_Ellington")
+        FileUtils.mkdir_p(at_dir)
+        FileUtils.mkdir_p(de_dir)
+        ARGV[0] = shortcut_param
+        user_config.music_directories.should include at_dir
+        user_config.music_directories.should include de_dir
+        user_config.music_directories.length.should == 3
+        ARGV[0] = nil
+      end
+
+    end
+
+    describe "(playlist) file as ARGV" do
+      let(:dir1) { '~/path2/artist1' }
+      let(:dir2) { '~/path3/artist2' }
+      let(:d1) { File.expand_path(dir1) }
+      let(:d2) { File.expand_path(dir2) }
+
+      before(:each) do
+        FileUtils.mkdir_p(d1)
+        FileUtils.mkdir_p(d2)
+      end
+
+      context "full filepath given" do
+        let(:file_param) { '~/path/my_music_dirs.txt' }
+        let(:d0) { File.expand_path('~/path') }
+      
+        it "uses the file's directories" do
+          FileUtils.mkdir_p(d0)
+          File.open(File.expand_path(file_param), "w") { |f| 
+            f.puts dir1
+            f.puts dir2
+          }
+          ARGV[0] = file_param 
+          user_config.music_directories.should include d1
+          user_config.music_directories.should include d2
+          ARGV[0] = nil
+        end
+
+      end
+
+      context "only filename given" do
+        let(:file_param) { 'my_music_dirs.txt' }
+        let(:d0) { File.expand_path('~/.jimmy_jukebox') }
+      
+        it "uses the file's directories" do
+          FileUtils.mkdir_p(d0)
+          File.open(File.expand_path(d0 + '/' + file_param), "w") { |f| 
+            f.puts dir1
+            f.puts dir2
+          }
+          ARGV[0] = file_param 
+          user_config.music_directories.should include d1
+          user_config.music_directories.should include d2
+          ARGV[0] = nil
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "#files" do
+    let(:user_config) { UserConfig.new }
+    let(:dir1) { '~/Music/artist1' }
+    let(:dir2) { '~/Music/artist2' }
+    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'
+    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
+    end
+
+  end
 
   describe "#is_a_directory?" do
     it "accepts relative paths" do
@@ -36,7 +169,7 @@ describe UserConfig do
   describe "#shortcuts" do
 
     it "finds dirs based on regex keys" do
-      UserConfig.new().shortcuts[/^bluegrass$/i] == UserConfig.new().bluegrass_dir
+      UserConfig.new.shortcuts[/^bluegrass$/i] == UserConfig.new().bluegrass_dir
     end
 
   end
@@ -44,7 +177,7 @@ describe UserConfig do
   describe "#shortcut_to_dir" do
     
     it "knows 'r' means rock-and-roll" do
-      UserConfig.new().shortcut_to_dir('r') == UserConfig.new().rock_dir
+      UserConfig.new.shortcut_to_dir('r') == UserConfig.new().rock_dir
     end
 
   end

metadata

@@ -1,125 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.5.9
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - James Lavin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        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)
+        version: '0'
+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
@@ -130,111 +119,109 @@ files:
 - roadmap.txt
 - LICENSE.txt
 - lib/jimmy_jukebox.rb
-- lib/jimmy_jukebox/version.rb
-- lib/jimmy_jukebox/artists.rb
-- lib/jimmy_jukebox/song.rb
-- lib/jimmy_jukebox/jukebox.rb
+- lib/jimmy_jukebox/handle_load_jukebox_input.rb
 - lib/jimmy_jukebox/display_options.rb
 - lib/jimmy_jukebox/music_player_detector.rb
-- lib/jimmy_jukebox/user_config.rb
+- lib/jimmy_jukebox/load_jukebox_code.rb
 - lib/jimmy_jukebox/user_interface.rb
+- lib/jimmy_jukebox/user_config.rb
+- lib/jimmy_jukebox/jukebox.rb
+- lib/jimmy_jukebox/constants.rb
+- lib/jimmy_jukebox/song.rb
+- lib/jimmy_jukebox/version.rb
 - lib/jimmy_jukebox/song_loader.rb
-- lib/jimmy_jukebox/load_jukebox_code.rb
-- lib/jimmy_jukebox/songs/BillieHoliday.yml
+- lib/jimmy_jukebox/artists.rb
+- lib/jimmy_jukebox/songs/Mozart.yml
+- lib/jimmy_jukebox/songs/JellyRollMorton.yml
+- lib/jimmy_jukebox/songs/DizzyGillespie.yml
+- lib/jimmy_jukebox/songs/SidneyBechet.yml
+- lib/jimmy_jukebox/songs/Haydn.yml
 - lib/jimmy_jukebox/songs/ModernJazzQuartet.yml
-- lib/jimmy_jukebox/songs/CharlieParker.yml
-- lib/jimmy_jukebox/songs/JohannesBrahms.yml
+- lib/jimmy_jukebox/songs/LesBrown.yml
 - lib/jimmy_jukebox/songs/FranzSchubert.yml
-- lib/jimmy_jukebox/songs/CharlieChristian.yml
-- lib/jimmy_jukebox/songs/BennieMoten.yml
-- lib/jimmy_jukebox/songs/FletcherHenderson.yml
-- lib/jimmy_jukebox/songs/ColemanHawkins.yml
+- lib/jimmy_jukebox/songs/EarlHines.yml
+- lib/jimmy_jukebox/songs/CharlieParker.yml
+- lib/jimmy_jukebox/songs/EarlScruggs.yml
 - lib/jimmy_jukebox/songs/JazzMedleys.yml
+- lib/jimmy_jukebox/songs/FletcherHenderson.yml
 - lib/jimmy_jukebox/songs/KingOliver.yml
-- lib/jimmy_jukebox/songs/JohnColtrane.yml
-- lib/jimmy_jukebox/songs/OriginalDixielandJazzBand.yml
+- lib/jimmy_jukebox/songs/DukeEllington.yml
+- lib/jimmy_jukebox/songs/ArtTatum.yml
+- lib/jimmy_jukebox/songs/BixBeiderbecke.yml
+- lib/jimmy_jukebox/songs/BennyGoodman.yml
+- lib/jimmy_jukebox/songs/ColemanHawkins.yml
 - lib/jimmy_jukebox/songs/OscarPeterson.yml
-- lib/jimmy_jukebox/songs/Dixieland.yml
-- lib/jimmy_jukebox/songs/LouisArmstrong.yml
+- lib/jimmy_jukebox/songs/OriginalDixielandJazzBand.yml
+- lib/jimmy_jukebox/songs/JohnColtrane.yml
 - lib/jimmy_jukebox/songs/DjangoReinhardt.yml
-- lib/jimmy_jukebox/songs/RedNorvo.yml
-- lib/jimmy_jukebox/songs/Mendelssohn.yml
+- lib/jimmy_jukebox/songs/JohannesBrahms.yml
+- lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml
 - lib/jimmy_jukebox/songs/ScottJoplin.yml
-- lib/jimmy_jukebox/songs/LionelHampton.yml
-- lib/jimmy_jukebox/songs/ArtTatum.yml
-- lib/jimmy_jukebox/songs/BixBeiderbecke.yml
+- lib/jimmy_jukebox/songs/Vivaldi.yml
+- lib/jimmy_jukebox/songs/BillieHoliday.yml
+- lib/jimmy_jukebox/songs/MauriceRavel.yml
+- lib/jimmy_jukebox/songs/Beethoven.yml
+- lib/jimmy_jukebox/songs/Ragtime.yml
 - lib/jimmy_jukebox/songs/ArtieShaw.yml
+- lib/jimmy_jukebox/songs/Dixieland.yml
 - lib/jimmy_jukebox/songs/MilesDavis.yml
-- lib/jimmy_jukebox/songs/HoraceSilver.yml
-- lib/jimmy_jukebox/songs/BudPowell.yml
-- lib/jimmy_jukebox/songs/ChuckBerry.yml
-- lib/jimmy_jukebox/songs/PaulWhiteman.yml
-- lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml
+- lib/jimmy_jukebox/songs/LionelHampton.yml
 - lib/jimmy_jukebox/songs/GlennMiller.yml
-- lib/jimmy_jukebox/songs/LesBrown.yml
-- lib/jimmy_jukebox/songs/CannonballAdderley.yml
-- lib/jimmy_jukebox/songs/DizzyGillespie.yml
-- lib/jimmy_jukebox/songs/DukeEllington.yml
-- lib/jimmy_jukebox/songs/BillEvans.yml
-- lib/jimmy_jukebox/songs/BennyGoodman.yml
-- lib/jimmy_jukebox/songs/CountBasie.yml
+- lib/jimmy_jukebox/songs/LouisArmstrong.yml
+- lib/jimmy_jukebox/songs/BillMonroe.yml
 - lib/jimmy_jukebox/songs/Bach.yml
+- lib/jimmy_jukebox/songs/BennieMoten.yml
+- lib/jimmy_jukebox/songs/CharlieChristian.yml
+- lib/jimmy_jukebox/songs/RedNorvo.yml
+- lib/jimmy_jukebox/songs/Chopin.yml
+- lib/jimmy_jukebox/songs/Mendelssohn.yml
+- lib/jimmy_jukebox/songs/CountBasie.yml
 - lib/jimmy_jukebox/songs/ArchibaldCampBanjo.yml
-- lib/jimmy_jukebox/songs/Mozart.yml
-- lib/jimmy_jukebox/songs/Haydn.yml
-- lib/jimmy_jukebox/songs/SidneyBechet.yml
-- lib/jimmy_jukebox/songs/Vivaldi.yml
-- lib/jimmy_jukebox/songs/Beethoven.yml
+- lib/jimmy_jukebox/songs/ChuckBerry.yml
+- lib/jimmy_jukebox/songs/CannonballAdderley.yml
 - lib/jimmy_jukebox/songs/JamesPJohnson.yml
-- lib/jimmy_jukebox/songs/CecilTaylor.yml
-- lib/jimmy_jukebox/songs/JellyRollMorton.yml
-- lib/jimmy_jukebox/songs/Chopin.yml
-- lib/jimmy_jukebox/songs/Ragtime.yml
-- lib/jimmy_jukebox/songs/Monk.yml
-- lib/jimmy_jukebox/songs/EarlHines.yml
-- lib/jimmy_jukebox/songs/EarlScruggs.yml
-- lib/jimmy_jukebox/songs/BillMonroe.yml
-- lib/jimmy_jukebox/songs/MauriceRavel.yml
-- spec/jimmy_jukebox_spec.rb
-- spec/song_loader_spec.rb
 - spec/user_config_spec.rb
 - spec/artists_spec.rb
-- spec/music_player_detector_spec.rb
 - spec/song_spec.rb
+- spec/music_player_detector_spec.rb
 - spec/spec_helper.rb
+- spec/song_loader_spec.rb
+- spec/load_jukebox_code_spec.rb
+- spec/jimmy_jukebox_spec.rb
 - bin/play_jukebox
 - 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: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: jimmy_jukebox
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: plays your MP3 & OGG files and lets you easily download music
 test_files:
-- spec/jimmy_jukebox_spec.rb
-- spec/song_loader_spec.rb
 - spec/user_config_spec.rb
 - spec/artists_spec.rb
-- spec/music_player_detector_spec.rb
 - spec/song_spec.rb
+- spec/music_player_detector_spec.rb
 - spec/spec_helper.rb
+- spec/song_loader_spec.rb
+- spec/load_jukebox_code_spec.rb
+- spec/jimmy_jukebox_spec.rb
+has_rdoc: 

data/lib/jimmy_jukebox/songs/BillEvans.yml

@@ -1,3 +0,0 @@
----
-- http://archive.org/download/BillEvansTrio-GloriasSteptake2/01.GloriasSteptake2.mp3
-- http://archive.org/download/BlueInGreen/03-BlueInGreen.mp3

data/lib/jimmy_jukebox/songs/BudPowell.yml

@@ -1,3 +0,0 @@
----
-- http://archive.org/download/BudPowell-UnPocoLoco/14.Track14.mp3
-- http://archive.org/download/BudPowell-SomebodyLovesMe/BudPowell-SomebodyLovesMe.mp3

data/lib/jimmy_jukebox/songs/CecilTaylor.yml

@@ -1,3 +0,0 @@
----
-- http://archive.org/download/CecilTaylor-Conquistador/01-Conquistador.mp3
-- http://archive.org/download/OtekiCaz27.05.2012/OtekiCaz20120527.

data/lib/jimmy_jukebox/songs/HoraceSilver.yml

@@ -1,2 +0,0 @@
----
-- http://archive.org/download/JazzInspirationHoraceSilver/345678.mp3

data/lib/jimmy_jukebox/songs/Monk.yml

@@ -1,3 +0,0 @@
----
-- http://archive.org/download/JustAGigolo/TheloniousMonk-02-JustAGigolotake1.mp3
-- 

data/lib/jimmy_jukebox/songs/PaulWhiteman.yml

@@ -1,5 +0,0 @@
----
-- http://archive.org/download/PaulWhiteman-4UneditedWavFiles-TwoUncommon/InaBoat.wav
-- http://archive.org/download/PaulWhiteman-4UneditedWavFiles-TwoUncommon/Sweetheart.wav
-- http://archive.org/download/PaulWhiteman-4UneditedWavFiles-TwoUncommon/TheJapaneseSandman.wav
-- http://archive.org/download/PaulWhiteman-4UneditedWavFiles-TwoUncommon/Whispering.wav