jimmy_jukebox 0.5.6 → 0.5.7

data/lib/jimmy_jukebox/artists.rb

@@ -10,6 +10,7 @@ module Artists
     bm:   { genre: 'JAZZ', name: "bennie_moten"},
     fc:   { genre: 'CLASSICAL', name: "chopin"},
     ca:   { genre: 'JAZZ', name: "cannonball_adderley"},
+    berry: { genre: 'ROCK', name: "chuck_berry"},
     cc:   { genre: 'JAZZ', name: "charlie_christian"},
     cp:   { genre: 'JAZZ', name: "charlie_parker"},
     ch:   { genre: 'JAZZ', name: "coleman_hawkins"},

data/lib/jimmy_jukebox/songs/ChuckBerry.yml

@@ -0,0 +1,128 @@
+---
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-21Blues.mp3
+- http://archive.org/download/ChuckBerry45RipThirtyDays1955Orig.mp3/ChuckBerry45RipThirtyDays1955Orig.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ADeuce.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-AintThatJustLikeAWoman.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-AlmostGrown1959.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-AnthonyBoy.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-AroundAndAround.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-BackInTheUsa.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-BackToMemphis.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-BeautifulDelilah.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-BeerDrinkingWoman.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-BettyJean.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-Bio.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-DownInStLouis.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-BlueFeeling1957.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-BonsoirCherie.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-BrendaLee.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-BrokenArrow.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-BrownEyedHandsomeMan.mp3
+- http://archive.org/download/ChuckBerry-01-03--ClassicRecordings/ChuckBerry-BrownEyedHandsomeMan.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-ByeByeJohnny1972.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ByeByeJohnny.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-California.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-Carol1972.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-Carol.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-CcRiderSlow.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-CestLaVie1972.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-CheckMeOut.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ChildhoodSweetheart.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ChucksBeat.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ComeOn.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ConfessinTheBlues.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-CountyLine.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-CrazyArms.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-CryingSteel.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-DearDad.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-DontYouLieToMe.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-DownTheRoadAPiece.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-DownboundTrain.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-DriftingHeart.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-DuckWalk.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-GetYourKicksOnRoute66.mp3
+- http://archive.org/download/ChuckBerry-01-13/ChuckBerry-GoJohnnyGo.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-GoodGollyMissMolly.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-GoodnightSweetheartWellItsTimeToGo.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-GuitarBoogie.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-HailHailRockRoll.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-HavanaMoon.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-HaveMercyJudge.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-HoochieCoochieMan.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-HouseOfBlueLights.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-IGotToFindMyBaby.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-IWantToBeYourDriver.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ImJustALuckySoAndSo.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ImTalkingAboutYou.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ItWasntMe.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ItsMyOwnBusiness.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-IveChanged.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-JaguarAndThunderbird.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-JoJoGunne.mp3
+- http://archive.org/download/ChuckBerry/JohnnyBGood.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-JohnnyB.Goodelive.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-JohnnyBGoode.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-JohnnyBGood.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-LetItRock.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-LetItRock1972.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-LetItRock1988.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-LittleMarie.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-LittleQueenie.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-LittleQueenielive-1.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-LittleQueenielive2.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-LiverpoolDrive.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-LouieLouie.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-Maybellene.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-MeanOldWorld.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-MeanOldWorld1986.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-MemphisTennessee.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerryJohnLennonYokoOno-MemphisTennessee.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-MerryChristmasBaby.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-Misery.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-Mona1960.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-MumsTheWord.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-MyDream.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-MyMustangFord.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-Nadine.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-NoMoneyDown.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-NoParticularPlaceToGo.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-OhBabyDoll.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-PassAway1986.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-PromisedLand.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-RamonaSayYes.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ReelinAndRockin.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ReelinAndRockinlive.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-ReelinAndRockin1972.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-Remember.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-RidingAlongInMyAutomobile.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-RockRollMusic.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-RockNRollMusic.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-RockinAtThePhilharmonic.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-RockinRobin.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-RollOverBeethovenlive.mp3
+- http://archive.org/download/ChuckBerry-01-03--ClassicRecordings/ChuckBerry-RollOverBeethoven.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-Route66.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-RunRunRudolph.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-SadDayLongNight.mp3
+- http://archive.org/download/ChuckBerry-01-03--ClassicRecordings/ChuckBerry-SchoolDays.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-ShakeRattleAndRoll.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-St.LouisBlues.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-SweetLittleRockRoller.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-SweetLittleSixteen.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-TheBlues.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-TheLittleGirlfromCentral.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-ThePromisedLand1965.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-TheThingsIUsedToDo.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ThirteenQuestionMethod.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-ThirtyDays.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-TimeWas.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-TooMuchMonkeyBusiness.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-TooPoopedToPop.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-Tulane.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-VivaVivaRockRoll.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-WeeWeeHours.mp3
+- http://archive.org/download/ChuckBerry-31-52/ChuckBerry-Woodpecker.mp3
+- http://archive.org/download/ChuckBerry-21-30/ChuckBerry-YouCantCatchMe1956.mp3
+- http://archive.org/download/ChuckBerry-01-20/ChuckBerry-YouNeverCanTell1964.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-YouNeverCanTell1972.mp3
+- http://archive.org/download/ChuckBerry-53-150/ChuckBerry-YouTwo.mp3

data/lib/jimmy_jukebox/user_config.rb

@@ -39,6 +39,17 @@ module JimmyJukebox
       generate_song_list
     end
 
+    def shortcuts
+      { /^b$/i         => bluegrass_dir,
+        /^bluegrass$/i => bluegrass_dir,
+        /^c$/i         => classical_dir,
+        /^classical$/i => classical_dir,
+        /^j$/i         => jazz_dir,
+        /^jazz$/i      => jazz_dir,
+        /^r$/i         => rock_dir,
+        /^rock$/i      => rock_dir }
+    end
+
     def default_music_dir
       File.expand_path(File.join("~","Music"))
     end
@@ -51,6 +62,10 @@ module JimmyJukebox
       default_music_dir + '/JAZZ'
     end
 
+    def rock_dir
+      default_music_dir + '/ROCK'
+    end
+
     def classical_dir
       default_music_dir + '/CLASSICAL'
     end
@@ -153,17 +168,21 @@ module JimmyJukebox
       @music_directories ||= []
     end
 
+    def shortcut_to_dir(user_input)
+      reg_ex = shortcuts.keys.detect { |re| re =~ user_input }
+      reg_ex ? shortcuts[reg_ex] : nil
+    end
+
     def generate_directories_list
-      # ARGV[0] can be "jazz.txt" (a file holding directory names), "~/Music/JAZZ" (a directory path) or nil
-      # puts "ARGV: " + ARGV.inspect + " (" + ARGV.class.to_s + ")"
+      # ARGV[0] 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 ARGV[0].strip =~ /^b$/i || ARGV[0].strip =~ /^bluegrass$/i
-        music_directories << bluegrass_dir
-      elsif ARGV[0].strip =~ /^j$/i || ARGV[0].strip =~ /^jazz$/i
-        music_directories << jazz_dir
-      elsif ARGV[0].strip =~ /^c$/i || ARGV[0].strip =~ /^classical$/i
-        music_directories << classical_dir
+      elsif dir = shortcut_to_dir(ARGV[0].strip)
+        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])

data/lib/jimmy_jukebox/version.rb

@@ -1,4 +1,4 @@
 module JimmyJukebox
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
   DATE = '2013-03-13'
 end

data/spec/user_config_spec.rb

@@ -24,6 +24,22 @@ describe UserConfig do
   #
   #end
 
+  describe "#shortcuts" do
+
+    it "finds dirs based on regex keys" do
+      UserConfig.new().shortcuts[/^bluegrass$/i] == UserConfig.new().bluegrass_dir
+    end
+
+  end
+
+  describe "#shortcut_to_dir" do
+    
+    it "knows 'r' means rock-and-roll" do
+      UserConfig.new().shortcut_to_dir('r') == UserConfig.new().rock_dir
+    end
+
+  end
+
   describe "#top_music_dir" do
 
     it "should parse '~/Music'" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -153,6 +153,7 @@ files:
 - lib/jimmy_jukebox/songs/ArtieShaw.yml
 - lib/jimmy_jukebox/songs/MilesDavis.yml
 - lib/jimmy_jukebox/songs/BudPowell.yml
+- lib/jimmy_jukebox/songs/ChuckBerry.yml
 - lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml
 - lib/jimmy_jukebox/songs/CannonballAdderley.yml
 - lib/jimmy_jukebox/songs/DizzyGillespie.yml