jimmy_jukebox 0.5.8 → 0.5.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/lib/jimmy_jukebox/artists.rb +2 -0
  2. data/lib/jimmy_jukebox/music_player_detector.rb +4 -7
  3. data/lib/jimmy_jukebox/song.rb +14 -11
  4. data/lib/jimmy_jukebox/songs/GlennMiller.yml +212 -0
  5. data/lib/jimmy_jukebox/songs/LesBrown.yml +42 -0
  6. data/lib/jimmy_jukebox/songs/Ragtime.yml +1 -0
  7. data/lib/jimmy_jukebox/user_config.rb +8 -7
  8. data/lib/jimmy_jukebox/version.rb +2 -2
  9. metadata +84 -71
data/lib/jimmy_jukebox/artists.rb CHANGED
@@ -23,6 +23,7 @@ module Artists
23
23
  eh: { genre: 'JAZZ', name: "earl_hines"},
24
24
  es: { genre: 'BLUEGRASS', name: "earl_scruggs"},
25
25
  fh: { genre: 'JAZZ', name: "fletcher_henderson"},
26
+ gm: { genre: 'JAZZ', name: "glenn_miller"},
26
27
  h: { genre: 'CLASSICAL', name: 'haydn'},
27
28
  jb: { genre: 'CLASSICAL', name: 'johannes_brahms'},
28
29
  jc: { genre: 'JAZZ', name: "john_coltrane"},
@@ -32,6 +33,7 @@ module Artists
32
33
  jsb: { genre: 'CLASSICAL', name: "bach"},
33
34
  ko: { genre: 'JAZZ', name: "king_oliver"},
34
35
  la: { genre: 'JAZZ', name: "louis_armstrong"},
36
+ lb: { genre: 'JAZZ', name: "les_brown"},
35
37
  lh: { genre: 'JAZZ', name: "lionel_hampton"},
36
38
  lvb: { genre: 'CLASSICAL', name: "beethoven"},
37
39
  m: { genre: 'CLASSICAL', name: "mendelssohn"},
data/lib/jimmy_jukebox/music_player_detector.rb CHANGED
@@ -70,14 +70,11 @@ module JimmyJukebox
70
70
  end
71
71
  end
72
72
 
73
- # can't figure out how to play just one song
74
- def mpc_exists?
75
- `which mpc`.match(/.*\/mpc$/) ? true : false
76
- end
73
+ # other players possibly worth enabling:
74
+ # 1) https://xmms2.org/wiki/Using_the_application
75
+ # 2) cmus-remote -p [filename]
76
+ # 3) mpc: can't figure out how to play just one song
77
77
 
78
- # other players possibly worth enabling
79
- # https://xmms2.org/wiki/Using_the_application
80
-
81
78
  def cvlc_exists?
82
79
  `which cvlc`.match(/.*\/cvlc$/) ? true : false
83
80
  end
data/lib/jimmy_jukebox/song.rb CHANGED
@@ -2,6 +2,11 @@ require_relative "display_options"
2
2
 
3
3
  module JimmyJukebox
4
4
 
5
+ AUDIO_FORMATS = {/\.mp3$/i => 'mp3',
6
+ /\.ogg$/i => 'ogg',
7
+ /\.wav$/i => 'wav',
8
+ /.flac$/i => 'flac'}
9
+
5
10
  class Song
6
11
 
7
12
  include JimmyJukebox::DisplayOptions
@@ -17,7 +22,7 @@ module JimmyJukebox
17
22
  attr_accessor :player, :playing_pid
18
23
 
19
24
  def initialize(in_music_file)
20
- set_music_file(in_music_file)
25
+ self.music_file = in_music_file
21
26
  self.paused = false
22
27
  self.playing_pid = nil
23
28
  end
@@ -30,8 +35,12 @@ module JimmyJukebox
30
35
  music_file <=> other.music_file
31
36
  end
32
37
 
33
- def set_music_file(in_music_file)
34
- if in_music_file =~ /\.mp3$/i || in_music_file =~ /\.ogg$/i || in_music_file =~ /\.wav$/i || in_music_file =~ /.flac$/i
38
+ def valid_audio_format?(music_file)
39
+ AUDIO_FORMATS.keys.any? { |re| re =~ music_file }
40
+ end
41
+
42
+ def music_file=(in_music_file)
43
+ if valid_audio_format?(in_music_file)
35
44
  @music_file = File.expand_path(in_music_file)
36
45
  else
37
46
  raise InvalidSongFormatException, "JimmyJukebox plays only .mp3/.ogg/.flac/.wav files. #{in_music_file} is not valid"
@@ -92,14 +101,8 @@ module JimmyJukebox
92
101
  end
93
102
 
94
103
  def set_player(user_config)
95
- if music_file =~ /\.mp3$/i
96
- self.player = user_config.mp3_player
97
- elsif music_file =~ /\.ogg$/i
98
- self.player = user_config.ogg_player
99
- elsif music_file =~ /\.wav$/i
100
- self.player = user_config.wav_player
101
- elsif music_file =~ /\.flac$/i
102
- self.player = user_config.flac_player
104
+ if regex = AUDIO_FORMATS.keys.detect { |re| music_file =~ re }
105
+ self.player = user_config.send(AUDIO_FORMATS[regex] + '_player')
103
106
  else
104
107
  raise UnsupportedSongFormatException, "Attempted to play a file format this program cannot play"
105
108
  end
data/lib/jimmy_jukebox/songs/GlennMiller.yml ADDED
@@ -0,0 +1,212 @@
1
+ ---
2
+ - http://archive.org/download/GlennMiller_24/19ANightingaleSangInBerkeleySquare.mp3
3
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade40-04-11FirstSong-AHatWithCherries.ogg
4
+ - http://archive.org/download/GlennMillerOrchestra-91-100/GlennMillersArmyAirForceBand-AHotTimeInBerlin1944fromRadio.mp3
5
+ - http://archive.org/download/GlennMillerOrchestra-91-100/GlennMillersArmyAirForceBand-ALovelyWayToSpendAnEvening1944fromRadio.mp3
6
+ - http://archive.org/download/GlennMiller_39/GlennMiller-AStringOfPearls.mp3
7
+ - http://archive.org/download/GlennMiller_39/GlennMiller-ATisketATasket.mp3
8
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVrayEberly-AfterAll.mp3
9
+ - http://archive.org/download/GlennMiller_39/GlennMiller-AintChaCommingOut.mp3
10
+ - http://archive.org/download/GlennMiller_215/AliceBlueGown.mp3
11
+ - http://archive.org/download/VictoryParadeOfSpotlightBands61-70_220/alongTheSanteFeTrailvre.mp3
12
+ - http://archive.org/download/GlennMiller_39/GlennMiller-AmericanPatrol.mp3
13
+ - http://archive.org/download/GlennMiller-AngelChild/GlennMiller-AngelChild.mp3
14
+ - http://archive.org/download/GlennMiller_215/ArmyAirCorpsSong.mp3
15
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade42-08-18FirstSong-AtLast.ogg
16
+ - http://archive.org/download/VictoryParadeOfSpotlightBands61-70_220/atThePresidentsBallvmh.mp3
17
+ - http://archive.org/download/GlennMiller_39/GlennMiller-BabyMe.mp3
18
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-BasketWeaverMan1939.mp3
19
+ - http://archive.org/download/GlennMiller_39/GlennMiller-BeHappy.mp3
20
+ - http://archive.org/download/GlennMiller_39/GlennMiller-BeerBarrelPolka.mp3
21
+ - http://archive.org/download/GlennMillerOrchestra-91-100/GlennMillersArmyAirForceBand-BeginTheBeguinefromAfrs.mp3
22
+ - http://archive.org/download/GlennMiller_39/GlennMiller-BlueChampagne.mp3
23
+ - http://archive.org/download/GlennMiller_39/GlennMiller-BlueEvening.mp3
24
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVrayEberly-BlueRainlive1939.mp3
25
+ - http://archive.org/download/GlennMiller_39/GlennMiller-BlueSkies.mp3
26
+ - http://archive.org/download/GlennMiller_467/GlennMiller-BlueberryHill.mp3
27
+ - http://archive.org/download/GlennMiller_467/GlennMiller-BluebirdsInTheMoonlight.mp3
28
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVmarthaTilton-BobWhite1937.mp3
29
+ - http://archive.org/download/GlennMillerOrchestra-91-100/GlennMillersArmyAirForceBand-BodyAndSoul1944RadioToGermany.mp3
30
+ - http://archive.org/download/GlennMiller_467/GlennMiller-BoogIt.mp3
31
+ - http://archive.org/download/GlennMillerOrchestra-111-120/GlennMillerOrch-TheBoogieWoogiePiggie.mp3
32
+ - http://archive.org/download/GlennMiller_467/GlennMiller-BoomShot.mp3
33
+ - http://archive.org/download/GlennMiller_467/GlennMiller-BoulderBuff.mp3
34
+ - http://archive.org/download/GlennMiller_215/BuckleDownWinsocki.mp3
35
+ - http://archive.org/download/VictoryParadeOfSpotlightBands61-70_220/bugleCallRag.mp3
36
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-BugelCallRaglive1939.mp3
37
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-ByTheWatersOfMinetankalive1939.mp3
38
+ - http://archive.org/download/GlennMiller_215/ByeByeBlues.mp3
39
+ - http://archive.org/download/VictoryParadeOfSpotlightBands61-70_220/CARELESS.mp3
40
+ - http://archive.org/download/GlennMiller_467/GlennMiller-CaribbeanClipper.mp3
41
+ - http://archive.org/download/GlennMiller_24/05ChattanoogaChooChoo.mp3
42
+ - http://archive.org/download/GlennMiller_226/GlennMiller-ChesterfieldChristmasRadioShow.mp3
43
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVrayEberly-Cinderellalive1939.mp3
44
+ - http://archive.org/download/GlennMiller_226/GlennMiller-CommunitySwing.mp3
45
+ - http://archive.org/download/GlennMiller_226/GlennMiller-Daddy-live.mp3
46
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-DamfinoNamelive1939.mp3
47
+ - http://archive.org/download/GlennMiller_24/20DannyBoylondonderryAir.mp3
48
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-DearlyBeloved1942.mp3
49
+ - http://archive.org/download/GlennMiller_226/GlennMiller-DeepInTheHeartOfTexas.mp3
50
+ - http://archive.org/download/GlennMiller_215/DeepPurple.mp3
51
+ - http://archive.org/download/GlennMiller_226/GlennMiller-DingDongTheWitchIsDead.mp3
52
+ - http://archive.org/download/GlennMiller_226/GlennMiller-DipperMouthBlues.mp3
53
+ - http://archive.org/download/GlennMiller_226/GlennMiller-DoinTheJive.mp3
54
+ - http://archive.org/download/GlennMiller_215/DontBeThatWay.mp3
55
+ - http://archive.org/download/GlennMiller_226/GlennMiller-DontSitUnderTheAppleTree.mp3
56
+ - http://archive.org/download/GlennMiller_226/GlennMiller-DownForTheCount.mp3
57
+ - http://archive.org/download/GlennMillerOrchestra-91-100/GlennMillersArmyAirForceBand-DrumSpecial1944fromRadio.mp3
58
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade42-05-06FirstSong-DvoraksLargo.ogg
59
+ - http://archive.org/download/GlennMiller_215/ElCapitan.mp3
60
+ - http://archive.org/download/GlennMiller_226/GlennMiller-ElmersTune.mp3
61
+ - http://archive.org/download/GlennMiller_485/GlennMiller-EverybodyLovesMyBaby.mp3
62
+ - http://archive.org/download/GlennMiller_215/EverybodyLovesMyBabybutMyBabyDontLoveNobodyButMe.mp3
63
+ - http://archive.org/download/VictoryParadeOfSpotlightBands61-70_220/everythingILove.mp3
64
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVrayEberly-FaithfulForever1939.mp3
65
+ - http://archive.org/download/GlennMiller_485/GlennMiller-FanHatStomp.mp3
66
+ - http://archive.org/download/GlennMiller_215/FarewellBlues.mp3
67
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-FarewellBlueslive1939.mp3
68
+ - http://archive.org/download/GlennMiller_485/GlennMiller-FdrJones.mp3
69
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVmarionHuttonTexBeneke-FeelinSorryForOnesSelflive1939.mp3
70
+ - http://archive.org/download/GlennMiller_215/FellowOnAFurlough.mp3
71
+ - http://archive.org/download/GlennMiller_485/GlennMiller-FiveOclockWhistle.mp3
72
+ - http://archive.org/download/GlennMiller_24/03FoolsRushInwhereAngelsFearToTread.mp3
73
+ - http://archive.org/download/GlennMillerOrchestra-101-110/GlennMillersArmyAirForceBand-GetHappy1944RadioToGermany.mp3
74
+ - http://archive.org/download/GlennMiller_215/G.I.Jive.mp3
75
+ - http://archive.org/download/GlennMiller_485/GlennMiller-GiveALittleWhistle.mp3
76
+ - http://archive.org/download/GlennMiller_485/GlennMiller-GlenIslandSpecial.mp3
77
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-GlennMillerSpeaks1939.mp3
78
+ - http://archive.org/download/GlennMiller_485/GlennMiller-HappyInLove-Live.mp3
79
+ - http://archive.org/download/GlennMiller_485/GlennMiller-HereWeGoAgain.mp3
80
+ - http://archive.org/download/GlennMiller-HoldTightlive/GlennMiller-HoldTightlive.flac
81
+ - http://archive.org/download/GlennMiller_215/HolidayForStrings.mp3
82
+ - http://archive.org/download/GlennMiller_215/HoneysuckleRose.mp3
83
+ - http://archive.org/download/GlennMiller_485/GlennMiller-Humoresque.mp3
84
+ - http://archive.org/download/GlennMiller_540/GlennMiller-ICloseMyEyes.mp3
85
+ - http://archive.org/download/GlennMiller_540/GlennMiller-IHearYouScreaming.mp3
86
+ - http://archive.org/download/GlennMillerOrchestra-101-110/GlennMillersArmyAirForceBand-ILotheYou1944fromRadio.mp3
87
+ - http://archive.org/download/GlennMillerOrchestra-51-60/GlennMiller-ILoveYoufromRadio1943.mp3
88
+ - http://archive.org/download/GlennMiller_540/GlennMiller-IWannaHatWithCherries.mp3
89
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade39-07-24FirstSong-IWantToBeHappy.ogg
90
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-IWantToBeHappylive1939.mp3
91
+ - http://archive.org/download/GlennMiller_540/GlennMiller-IWantToBeHappy.mp3
92
+ - http://archive.org/download/GlennMiller_540/GlennMiller-IdaSweetAsAppleCider.mp3
93
+ - http://archive.org/download/GlennMiller_215/InTheGloaming.mp3
94
+ - http://archive.org/download/GlennMiller_540/GlennMiller-InTheMood-live.mp3
95
+ - http://archive.org/download/GlennMiller_24/01InTheMood.mp3
96
+ - http://archive.org/download/GlennMiller_106/GlennMiller-IndianSummer.mp3
97
+ - http://archive.org/download/GlennMiller_106/GlennMiller-IntroductionToAWaltz.mp3
98
+ - http://archive.org/download/GlennMiller_106/GlennMiller-ItMustBeJelly.mp3
99
+ - http://archive.org/download/GlennMiller_106/GlennMiller-IveGotAGalInKalamazoo.mp3
100
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMillerOrchVrayMckinley-IveGotAGalInKalamazoo.mp3
101
+ - http://archive.org/download/GlennMiller_106/GlennMiller-IveGotRhythm.mp3
102
+ - http://archive.org/download/GlennMillerOrchestra-51-60/GlennMiller-IWantToSpendAllMyNightsWithYoufromRadio1943.mp3
103
+ - http://archive.org/download/GlennMillerOrchestra-101-110/GlennMillersArmyAirForceBand-JackAndJill1944fromRadio.mp3
104
+ - http://archive.org/download/GlennMillerOrchestra-101-110/GlennMillersArmyAirForceBand-JeepJockeyJump1944RadioToGermany.mp3
105
+ - http://archive.org/download/GlennMiller_106/GlennMiller-JerseyBounce.mp3
106
+ - http://archive.org/download/GlennMiller_106/GlennMiller-JingleBells.mp3
107
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade41-12-24FirstSong-JingleBellsRebroadcast.ogg
108
+ - http://archive.org/download/GlennMiller_106/GlennMiller-JingleJangleJingle.mp3
109
+ - http://archive.org/download/GlennMiller_106/GlennMiller-JohnsonRag.mp3
110
+ - http://archive.org/download/GlennMiller_106/GlennMiller-JukeboxSaturdayNight.mp3
111
+ - http://archive.org/download/GlennMillerOrchestra-51-60/GlennMiller-JuteboxSaturdayNightfromRadio1943.mp3
112
+ - http://archive.org/download/GlennMiller_136/GlennMiller-JumpinJive.mp3
113
+ - http://archive.org/download/GlennMiller_136/GlennMiller-KingPorterStomp.mp3
114
+ - http://archive.org/download/GlennMiller_136/GlennMiller-LamplightersSeranade-Live.mp3
115
+ - http://archive.org/download/GlennMiller_136/GlennMiller-LittleBrownJug.mp3
116
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-LittleBrownJuglive1939.mp3
117
+ - http://archive.org/download/GlennMiller_136/GlennMiller-LongTallMama.mp3
118
+ - http://archive.org/download/GlennMillerOrchestra-51-60/GlennMiller-LoveLoveLove1944rare.mp3
119
+ - http://archive.org/download/GlennMiller_136/GlennMiller-MakeBelieveBallroom.mp3
120
+ - http://archive.org/download/GlennMiller_136/GlennMiller-Medley-live-bluePrelude.mp3
121
+ - http://archive.org/download/GlennMiller_136/GlennMiller-Medley-live-doesYourHeartBeatForMe.mp3
122
+ - http://archive.org/download/GlennMiller_136/GlennMiller-Medley-live-japaneseSandman.mp3
123
+ - http://archive.org/download/GlennMiller_136/GlennMiller-Medley-live-jimJamJump.mp3
124
+ - http://archive.org/download/GlennMiller_311/GlennMiller-Medley-live-mel.mp3
125
+ - http://archive.org/download/GlennMiller_311/GlennMiller-Medley-live-sirenSong.mp3
126
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade40-11-04FirstSong-MidnightOnTheNile.ogg
127
+ - http://archive.org/download/GlennMiller_215/MissouriWaltz.mp3
128
+ - http://archive.org/download/GlennMiller_215/MoonDreams.mp3
129
+ - http://archive.org/download/GlennMiller_24/06MoonLove.mp3
130
+ - http://archive.org/download/GlennMiller_311/GlennMiller-MoonlightCocktails.mp3
131
+ - http://archive.org/download/GlennMiller_311/GlennMiller-MoonlightSeranade.mp3
132
+ - http://archive.org/download/GlennMillerOrchestra-111-120/GlennMillersArmyAirForceBand-MoonlightSerenade1944fromRadio.mp3
133
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-Moonlovelive1939.mp3
134
+ - http://archive.org/download/GlennMiller_24/17MyBlueHeaven.mp3
135
+ - http://archive.org/download/GlennMiller_215/MyBuddy.mp3
136
+ - http://archive.org/download/GlennMiller_311/GlennMiller-MyHeartBelongsToDaddy.mp3
137
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMiller-MyLastGood-byelive1939.mp3
138
+ - http://archive.org/download/GlennMiller_311/GlennMiller-MyMelencholyAbyb.mp3
139
+ - http://archive.org/download/GlennMiller_311/GlennMiller-OhMaMa.mp3
140
+ - http://archive.org/download/GlennMiller_311/GlennMiller-OhSoGood.mp3
141
+ - http://archive.org/download/GlennMiller_311/GlennMiller-OnALittleStreetInSingapore.mp3
142
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVmarthaTilton-OnceInAwhile.mp3
143
+ - http://archive.org/download/GlennMiller_311/GlennMiller-OneOclockJump.mp3
144
+ - http://archive.org/download/GlennMillersMusic_425/GlennMiller-GlennMillersMusic39-06-19FirstSong-OneOclockJump.mp3
145
+ - http://archive.org/download/GlennMiller_103/GlennMiller-OohWhatYouSaid.mp3
146
+ - http://archive.org/download/OverTheRainbowByGlennMiller/OverTheRainbow.mp3
147
+ - http://archive.org/download/GlennMiller_103/GlennMiller-PaganLoveSong.mp3
148
+ - http://archive.org/download/GlennMiller_215/PassageInterdit.mp3
149
+ - http://archive.org/download/GlennMiller_103/GlennMiller-PegOfMyHeart.mp3
150
+ - http://archive.org/download/GlennMiller_103/GlennMiller-Pennsylvania6-5000.mp3
151
+ - http://archive.org/download/GlennMiller_103/GlennMiller-Perfidia.mp3
152
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade42-06-25FirstSong-PeopleLikeYouAndMe.ogg
153
+ - http://archive.org/download/GlennMiller_215/Poinciana.mp3
154
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade40-05-28FirstSong-PolkaDotsAndMoonbeams.ogg
155
+ - http://archive.org/download/GlennMiller_24/22RhapsodyInBlue.mp3
156
+ - http://archive.org/download/GlennMiller_103/GlennMiller-RugCutlersSwing.mp3
157
+ - http://archive.org/download/GlennMiller_103/GlennMiller-RunningWild.mp3
158
+ - http://archive.org/download/GlennMiller_103/GlennMiller-SerenadeInBlue.mp3
159
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade42-05-14FirstSong-ShhItsAMilitarySecret.ogg
160
+ - http://archive.org/download/GlennMillerOrchestra-61-70/GlennMiller-ShowClosing1944.mp3
161
+ - http://archive.org/download/GlennMiller_103/GlennMiller-SlipHornJive.mp3
162
+ - http://archive.org/download/GlennMillerOrchestra-61-70/GlennMiller-SlipHornJivelive4jan1940.mp3
163
+ - http://archive.org/download/GlennMiller_103/GlennMiller-SlowFreight.mp3
164
+ - http://archive.org/download/GlennMiller_182/GlennMiller-SlumberSong.mp3
165
+ - http://archive.org/download/GlennMillerOrchestra-111-120/GlennMillersArmyAirForceBand-SmokeGetsInYourEyes1944RadioToGermany.mp3
166
+ - http://archive.org/download/GlennMiller_182/GlennMiller-SoldAmerican.mp3
167
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade40-06-13FirstSong-Solitude.ogg
168
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade42-06-23FirstSong-SomethingToRememberYouBy.ogg
169
+ - http://archive.org/download/GlennMiller_182/GlennMiller-SomewhereOverTheRainbow.mp3
170
+ - http://archive.org/download/GlennMiller_215/SongsMyMotherTaughtMe.mp3
171
+ - http://archive.org/download/GlennMiller_182/GlennMiller-StLouisBlues-live.mp3
172
+ - http://archive.org/download/GlennMiller_24/16StairwayToTheStars.mp3
173
+ - http://archive.org/download/GlennMiller_215/Symphony.mp3
174
+ - http://archive.org/download/GlennMiller_182/GlennMiller-Stardust.mp3
175
+ - http://archive.org/download/GlennMiller_215/StealinApples.mp3
176
+ - http://archive.org/download/GlennMiller_215/StormyWeather.mp3
177
+ - http://archive.org/download/GlennMiller_182/GlennMiller-SunValleyJump.mp3
178
+ - http://archive.org/download/GlennMiller_182/GlennMiller-SunriseSerenade.mp3
179
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade42-07-16FirstSong-SweetEloise.ogg
180
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade41-05-06FirstSong-SweeterThanTheSweetest.ogg
181
+ - http://archive.org/download/GlennMillerOrchestra-111-120/GlennMillersArmyAirForceBand-SwingLowSweetChariot1944RadioToGermany.mp3
182
+ - http://archive.org/download/GlennMiller_182/GlennMiller-SwinginAtTheSeance.mp3
183
+ - http://archive.org/download/GlennMillerOrchestra-61-70/GlennMiller-SymponyInHitslive1940.mp3
184
+ - http://archive.org/download/GlennMiller_215/TailEndCharlie.mp3
185
+ - http://archive.org/download/GlennMiller_24/10ThatOldBlackMagic.mp3
186
+ - http://archive.org/download/GlennMiller_182/GlennMiller-TheAnvilChorus.mp3
187
+ - http://archive.org/download/GlennMiller_182/GlennMiller-TheBooglieWoogliePiggyBoy.mp3
188
+ - http://archive.org/download/GlennMiller_394/GlennMiller-TheKissPolka.mp3
189
+ - http://archive.org/download/GlennMiller_394/GlennMiller-TheLittleManWhoWasntThere.mp3
190
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVmarionHutton-TheManWithTheMandolinlive1939.mp3
191
+ - http://archive.org/download/GlennMiller_394/GlennMiller-TheRumbaJumps.mp3
192
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMillerOrch-TheSpiritIsWilling1941.mp3
193
+ - http://archive.org/download/GlennMiller_215/TheSquadronSong.mp3
194
+ - http://archive.org/download/GlennMillerOrchestra-61-70/GlennMiller-TigerRaglive1940.mp3
195
+ - http://archive.org/download/GlennMiller_566/GlennMiller-MoonlightSerenade40-04-03FirstSong-TheWoodpeckerSong.ogg
196
+ - http://archive.org/download/GlennMiller_394/GlennMiller-ThreeLittleFishes.mp3
197
+ - http://archive.org/download/GlennMiller_394/GlennMiller-TigerRag-live.mp3
198
+ - http://archive.org/download/GlennMiller_394/GlennMiller-TuxedoJunction.mp3
199
+ - http://archive.org/download/GlennMiller_394/GlennMiller-UnderBlueCanadianSkies.mp3
200
+ - http://archive.org/download/GlennMiller_394/GlennMiller-VForVictoryHop.mp3
201
+ - http://archive.org/download/GlennMillerOrchestra-31-40/GlennMillerVmarionHutton-WeCanLiveOnLovelive1939.mp3
202
+ - http://archive.org/download/GlennMiller_394/GlennMiller-WeHaventGotAPot.mp3
203
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMillerOrch-WereTheCoupleInTheCastle1941.mp3
204
+ - http://archive.org/download/GlennMiller_9/GlennMiller-Wham-live.mp3
205
+ - http://archive.org/download/GlennMillerOrchestra-01-10/GlennMillerOrch-WhatDoYouDoInTheInfantry.mp3
206
+ - http://archive.org/download/GlennMiller_9/GlennMiller-WhatsTheMatterWithMe.mp3
207
+ - http://archive.org/download/GlennMiller_24/21WhenJohhnyComesMarchingHome.mp3
208
+ - http://archive.org/download/GlennMiller_9/GlennMiller-WhenJohnnyComesMarchingHome.mp3
209
+ - http://archive.org/download/GlennMiller_9/GlennMiller-WhenPawWasCourtingMaw.mp3
210
+ - http://archive.org/download/GlennMiller_215/WhyDream.mp3
211
+ - http://archive.org/download/GlennMiller_24/09WishingwillMakeItSo.mp3
212
+ - http://archive.org/download/GlennMiller_92/GlennMiller-SunsetSerenade41-08-30FirstSong-YouWannaDance.mp3
data/lib/jimmy_jukebox/songs/LesBrown.yml ADDED
@@ -0,0 +1,42 @@
1
+ ---
2
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrchVdorisDay-AKissToRemember.mp3
3
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun/LesBrownAndHisBandOfRenoun-AnvilleChorus1942.mp3
4
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-AutumnLeaves1957.mp3
5
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-BizetHadHisDay.mp3
6
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-BlueDanube.mp3
7
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-HarlemNocturne.mp3
8
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrchVdorisDay-IGotTheSunInTheMorning.mp3
9
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-JoltinJoeDimaggio.mp3
10
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun/LesBrownAndHisBandOfRenounVlenaHorn-JustOneOfThoseThings1942.mp3
11
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-Laura.mp3
12
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-LisbonAntigua.mp3
13
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrownOrchVdorisDay-LostHorizon.mp3
14
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-LoveMeOrLeaveMe.mp3
15
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrchVdorisDayBobHope-LuckyUs.mp3
16
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-MexicanHatDance1941.mp3
17
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-Moonglow.mp3
18
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-OnTheBeachAtWaikiki.mp3
19
+ - http://archive.org/download/LesBrownOrchVjackHaskell-PenthouseSerenade1945/LesBrownOrchVjackHaskell-PenthouseSerenade1945.mp3
20
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrchVjoniJames-PeopleWillSayWereInLove.mp3
21
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-PinkCoats.mp3
22
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-Poinciana.mp3
23
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-RedWing.mp3
24
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-SabreDance.mp3
25
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-SeptemberSong.mp3
26
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-10/LesBrownAndHisBandOfRenounVjohnPizzarelli-SingSingSing.mp3
27
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-SophisticatedSwing.mp3
28
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrownJoStafford-StormyWeather.mp3
29
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrchVdorisDay-sWonderful.mp3
30
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-SweetGeorgiaBrown.mp3
31
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-Tangerine1954.mp3
32
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrchVdorisDay-TeachMeTonight.mp3
33
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-ThatOldBlackMagic.mp3
34
+ - http://archive.org/download/LesBrownOrch-TheBillboardMarch/LesBrownOrch-TheBillboardMarch.mp3
35
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-10/LesBrownAndHisBandOfRenoun-ThemeSong.mp3
36
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun/LesBrownAndHisBandOfRenounVginnySimms-tilILiveAgain1942.mp3
37
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrownDorisDay-TillTheEndOfTime1945.mp3
38
+ - http://archive.org/download/LesBrownOrch-TimeWillTakeCareOfEverything/LesBrownOrch-TimeWillTakeCareOfEverything.mp3
39
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun/LesBrownAndHisBandOfRenoun-TwilightTime1945ver.mp3
40
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-20/LesBrownOrch-WakeTheTownAndTellThePeople1955.mp3
41
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrown-WhatIsThisThingCalledLove.mp3
42
+ - http://archive.org/download/LesBrownAndHisBandOfRenoun-01-14/LesBrownLarryElgart-WoodChoppersBall.mp3
data/lib/jimmy_jukebox/songs/Ragtime.yml CHANGED
@@ -13,3 +13,4 @@
13
13
  - http://archive.org/download/DollyConnolly-TheRagtimeMockingbird1912/DollyConnolly-TheRagtimeMockingbird1912.mp3
14
14
  - http://archive.org/download/OleMissRag/W.c.Handy-oleMissRag_1917_64kb.mp3
15
15
  - http://archive.org/download/Dempsey_Jacks_Pig_Ankle_Rag/Dempsey_Jacks_Pig_Ankle_Rag.mp3
16
+ - http://archive.org/download/EDIS-SRP-0195-07/EDIS-SRP-0195-07.mp3
data/lib/jimmy_jukebox/user_config.rb CHANGED
@@ -1,6 +1,8 @@
1
1
  require 'fileutils'
2
+ require 'forwardable'
2
3
 
3
4
  require 'jimmy_jukebox/artists'
5
+ require 'jimmy_jukebox/song'
4
6
  require 'jimmy_jukebox/music_player_detector'
5
7
  include Artists
6
8
 
@@ -21,8 +23,11 @@ module JimmyJukebox
21
23
 
22
24
  class UserConfig
23
25
 
26
+ extend Forwardable
27
+
24
28
  attr_writer :music_directories
25
- attr_accessor :songs, :ogg_player, :mp3_player, :wav_player, :flac_player
29
+ attr_accessor :songs, :music_player_detector
30
+ def_delegators :@music_player_detector, :ogg_player, :mp3_player, :wav_player, :flac_player
26
31
 
27
32
  DEFAULT_PLAYLIST_DIR = File.expand_path(File.join("~",".jimmy_jukebox"))
28
33
 
@@ -72,11 +77,7 @@ module JimmyJukebox
72
77
  end
73
78
 
74
79
  def set_music_players
75
- detector = MusicPlayerDetector.new
76
- self.ogg_player = detector.ogg_player
77
- self.mp3_player = detector.mp3_player
78
- self.wav_player = detector.wav_player
79
- self.flac_player = detector.flac_player
80
+ self.music_player_detector = MusicPlayerDetector.new
80
81
  no_player_configured unless ogg_player || mp3_player
81
82
  warn_about_partial_functionality if !ogg_player || !mp3_player
82
83
  end
@@ -178,7 +179,7 @@ module JimmyJukebox
178
179
  if "".respond_to?(:force_encoding) # Ruby 1.8 doesn't have string encoding or String#force_encoding
179
180
  files.delete_if { |f| !f.force_encoding("UTF-8").valid_encoding? } # avoid "invalid byte sequence in UTF-8 (ArgumentError)"
180
181
  end
181
- files.delete_if { |f| !f.match(/.*\.mp3/i) && !f.match(/.*\.ogg/i) && !f.match(/.*\.wav/i) && !f.match(/.*\.flac/i) }
182
+ files.delete_if { |f| AUDIO_FORMATS.keys.all? { |re| !f.match(re) } }
182
183
  files.map! { |f| File.expand_path(music_dir) + '/' + f }
183
184
  files.each { |f| songs << f }
184
185
  end
data/lib/jimmy_jukebox/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module JimmyJukebox
2
- VERSION = '0.5.8'
3
- DATE = '2013-03-13'
2
+ VERSION = '0.5.9'
3
+ DATE = '2013-03-18'
4
4
  end
metadata CHANGED
@@ -1,114 +1,125 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jimmy_jukebox
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.8
5
- prerelease:
4
+ prerelease:
5
+ version: 0.5.9
6
6
  platform: ruby
7
7
  authors:
8
8
  - James Lavin
9
- autorequire:
9
+ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-03-13 00:00:00.000000000 Z
12
+ date: 2013-03-18 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: !ruby/object:Gem::Requirement
17
- none: false
16
+ version_requirements: !ruby/object:Gem::Requirement
18
17
  requirements:
19
- - - ! '>='
18
+ - - ">="
20
19
  - !ruby/object:Gem::Version
21
- version: '0'
22
- type: :development
23
- prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
20
+ version: !binary |-
21
+ MA==
25
22
  none: false
23
+ requirement: !ruby/object:Gem::Requirement
26
24
  requirements:
27
- - - ! '>='
25
+ - - ">="
28
26
  - !ruby/object:Gem::Version
29
- version: '0'
27
+ version: !binary |-
28
+ MA==
29
+ none: false
30
+ prerelease: false
31
+ type: :development
30
32
  - !ruby/object:Gem::Dependency
31
33
  name: rspec-core
32
- requirement: !ruby/object:Gem::Requirement
33
- none: false
34
+ version_requirements: !ruby/object:Gem::Requirement
34
35
  requirements:
35
- - - ! '>='
36
+ - - ">="
36
37
  - !ruby/object:Gem::Version
37
- version: '0'
38
- type: :development
39
- prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
38
+ version: !binary |-
39
+ MA==
41
40
  none: false
41
+ requirement: !ruby/object:Gem::Requirement
42
42
  requirements:
43
- - - ! '>='
43
+ - - ">="
44
44
  - !ruby/object:Gem::Version
45
- version: '0'
45
+ version: !binary |-
46
+ MA==
47
+ none: false
48
+ prerelease: false
49
+ type: :development
46
50
  - !ruby/object:Gem::Dependency
47
51
  name: rspec-mocks
48
- requirement: !ruby/object:Gem::Requirement
49
- none: false
52
+ version_requirements: !ruby/object:Gem::Requirement
50
53
  requirements:
51
- - - ! '>='
54
+ - - ">="
52
55
  - !ruby/object:Gem::Version
53
- version: '0'
54
- type: :development
55
- prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
56
+ version: !binary |-
57
+ MA==
57
58
  none: false
59
+ requirement: !ruby/object:Gem::Requirement
58
60
  requirements:
59
- - - ! '>='
61
+ - - ">="
60
62
  - !ruby/object:Gem::Version
61
- version: '0'
63
+ version: !binary |-
64
+ MA==
65
+ none: false
66
+ prerelease: false
67
+ type: :development
62
68
  - !ruby/object:Gem::Dependency
63
69
  name: rspec-expectations
64
- requirement: !ruby/object:Gem::Requirement
65
- none: false
70
+ version_requirements: !ruby/object:Gem::Requirement
66
71
  requirements:
67
- - - ! '>='
72
+ - - ">="
68
73
  - !ruby/object:Gem::Version
69
- version: '0'
70
- type: :development
71
- prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
74
+ version: !binary |-
75
+ MA==
73
76
  none: false
77
+ requirement: !ruby/object:Gem::Requirement
74
78
  requirements:
75
- - - ! '>='
79
+ - - ">="
76
80
  - !ruby/object:Gem::Version
77
- version: '0'
81
+ version: !binary |-
82
+ MA==
83
+ none: false
84
+ prerelease: false
85
+ type: :development
78
86
  - !ruby/object:Gem::Dependency
79
87
  name: fakefs
80
- requirement: !ruby/object:Gem::Requirement
81
- none: false
88
+ version_requirements: !ruby/object:Gem::Requirement
82
89
  requirements:
83
- - - ! '>='
90
+ - - ">="
84
91
  - !ruby/object:Gem::Version
85
- version: '0'
86
- type: :development
87
- prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
92
+ version: !binary |-
93
+ MA==
89
94
  none: false
95
+ requirement: !ruby/object:Gem::Requirement
90
96
  requirements:
91
- - - ! '>='
97
+ - - ">="
92
98
  - !ruby/object:Gem::Version
93
- version: '0'
99
+ version: !binary |-
100
+ MA==
101
+ none: false
102
+ prerelease: false
103
+ type: :development
94
104
  - !ruby/object:Gem::Dependency
95
105
  name: fakeweb
96
- requirement: !ruby/object:Gem::Requirement
97
- none: false
106
+ version_requirements: !ruby/object:Gem::Requirement
98
107
  requirements:
99
- - - ! '>='
108
+ - - ">="
100
109
  - !ruby/object:Gem::Version
101
- version: '0'
102
- type: :development
103
- prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
110
+ version: !binary |-
111
+ MA==
105
112
  none: false
113
+ requirement: !ruby/object:Gem::Requirement
106
114
  requirements:
107
- - - ! '>='
115
+ - - ">="
108
116
  - !ruby/object:Gem::Version
109
- version: '0'
110
- description: jimmy_jukebox downloads great music and plays random MP3 & OGG songs
111
- under a directory (or set of directories)
117
+ version: !binary |-
118
+ MA==
119
+ none: false
120
+ prerelease: false
121
+ type: :development
122
+ description: jimmy_jukebox downloads great music and plays random MP3 & OGG songs under a directory (or set of directories)
112
123
  email: james@jameslavin.com
113
124
  executables:
114
125
  - play_jukebox
@@ -159,6 +170,8 @@ files:
159
170
  - lib/jimmy_jukebox/songs/ChuckBerry.yml
160
171
  - lib/jimmy_jukebox/songs/PaulWhiteman.yml
161
172
  - lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml
173
+ - lib/jimmy_jukebox/songs/GlennMiller.yml
174
+ - lib/jimmy_jukebox/songs/LesBrown.yml
162
175
  - lib/jimmy_jukebox/songs/CannonballAdderley.yml
163
176
  - lib/jimmy_jukebox/songs/DizzyGillespie.yml
164
177
  - lib/jimmy_jukebox/songs/DukeEllington.yml
@@ -193,27 +206,28 @@ files:
193
206
  - bin/load_jukebox
194
207
  homepage: https://github.com/JamesLavin/jimmy_jukebox
195
208
  licenses: []
196
- post_install_message: I really hope you enjoy the great jazz and classical music downloadable
197
- using this gem!
209
+ post_install_message: I really hope you enjoy the great jazz, classical, bluegrass, and early rock music downloadable using this gem!
198
210
  rdoc_options: []
199
211
  require_paths:
200
212
  - lib
201
213
  required_ruby_version: !ruby/object:Gem::Requirement
202
- none: false
203
214
  requirements:
204
- - - ! '>='
215
+ - - ">="
205
216
  - !ruby/object:Gem::Version
206
- version: '0'
207
- required_rubygems_version: !ruby/object:Gem::Requirement
217
+ version: !binary |-
218
+ MA==
208
219
  none: false
220
+ required_rubygems_version: !ruby/object:Gem::Requirement
209
221
  requirements:
210
- - - ! '>='
222
+ - - ">="
211
223
  - !ruby/object:Gem::Version
212
- version: '0'
224
+ version: !binary |-
225
+ MA==
226
+ none: false
213
227
  requirements: []
214
228
  rubyforge_project: jimmy_jukebox
215
- rubygems_version: 1.8.23
216
- signing_key:
229
+ rubygems_version: 1.8.24
230
+ signing_key:
217
231
  specification_version: 3
218
232
  summary: plays your MP3 & OGG files and lets you easily download music
219
233
  test_files:
@@ -224,4 +238,3 @@ test_files:
224
238
  - spec/music_player_detector_spec.rb
225
239
  - spec/song_spec.rb
226
240
  - spec/spec_helper.rb
227
- has_rdoc: