jimmy_jukebox 0.5.2 → 0.5.3

data/lib/jimmy_jukebox/artists.rb

@@ -8,7 +8,7 @@ module Artists
     bh:   { genre: 'JAZZ', name: "billie_holiday"},
     bb:   { genre: 'JAZZ', name: "bix_beiderbecke"},
     bm:   { genre: 'JAZZ', name: "bennie_moten"},
-    c:    { genre: 'CLASSICAL', name: "chopin"},
+    fc:   { genre: 'CLASSICAL', name: "chopin"},
     cc:   { genre: 'JAZZ', name: "charlie_christian"},
     cp:   { genre: 'JAZZ', name: "charlie_parker"},
     ch:   { genre: 'JAZZ', name: "coleman_hawkins"},

data/lib/jimmy_jukebox/display_options.rb

@@ -0,0 +1,18 @@
+module JimmyJukebox
+
+  module DisplayOptions
+    
+    def display_options
+      puts "'p' = (un)pause, 'q' = quit, 'r' = replay previous song, 's' = skip this song, 'e' = erase this song"
+    end
+
+    def display_options_after_delay
+      # pause to let song display song info and begin playing before displaying user options
+      sleep 1
+      display_options
+    end
+
+  end
+
+end
+

data/lib/jimmy_jukebox/song.rb

@@ -1,7 +1,11 @@
+require_relative "display_options"
+
 module JimmyJukebox
 
   class Song
 
+    include JimmyJukebox::DisplayOptions
+
     class InvalidSongFormatException < Exception; end
     class NoPlayingPidException < Exception; end
     class UnsupportedSongFormatException < Exception; end
@@ -121,9 +125,9 @@ module JimmyJukebox
     end
 
     def play_with_player
-      puts "Now playing '#{music_file}'"
-      puts "Press Ctrl-C to stop the music and exit this program"
       run_command(player, music_file)
+      puts "Now playing '#{music_file}'"
+      display_options_after_delay
       Process.waitpid(playing_pid) # Waits for a child process to exit, returns its process id, and sets $? to a Process::Status object
       $? # return Process::Status object with instance methods .stopped?, .exited?, .exitstatus
     end

data/lib/jimmy_jukebox/user_config.rb

@@ -141,9 +141,9 @@ module JimmyJukebox
       # puts "ARGV: " + ARGV.inspect + " (" + ARGV.class.to_s + ")"
       if ARGV.empty?
         music_directories << default_music_dir
-      elsif ARGV[0].strip =~ /^jazz$/i
+      elsif ARGV[0].strip =~ /^j$/i || ARGV[0].strip =~ /^jazz$/i
         music_directories << jazz_dir
-      elsif ARGV[0].strip =~ /^classical$/i
+      elsif ARGV[0].strip =~ /^c$/i || ARGV[0].strip =~ /^classical$/i
         music_directories << classical_dir
       elsif ARTISTS.keys.include?(ARGV[0].to_sym)
         music_directories << default_music_dir + artist_key_to_subdir_name(ARGV[0].to_sym)

data/lib/jimmy_jukebox/user_interface.rb

@@ -18,21 +18,10 @@ end
 
 user_input_thread = Thread.new do
   
-  def display_options
-    puts "'p' = (un)pause, 'q' = quit, 'r' = replay previous song, 's' = skip this song, 'e' = erase this song"
-  end
-
-  def display_options_after_delay
-    # pause to let song display song info and begin playing before displaying user options
-    sleep 1
-    display_options
-  end
-
   class NoPlayLoopThreadException < Exception; end
 
   begin
     loop do
-      display_options_after_delay
       if $running_jruby
         char = STDIN.getch
       else

data/lib/jimmy_jukebox/version.rb

@@ -1,4 +1,4 @@
 module JimmyJukebox
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
   DATE = '2013-03-01'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,7 @@ files:
 - lib/jimmy_jukebox/artists.rb
 - lib/jimmy_jukebox/song.rb
 - lib/jimmy_jukebox/jukebox.rb
+- lib/jimmy_jukebox/display_options.rb
 - lib/jimmy_jukebox/user_config.rb
 - lib/jimmy_jukebox/user_interface.rb
 - lib/jimmy_jukebox/song_loader.rb