jimmy_jukebox 0.5.3 → 0.5.4

data/lib/jimmy_jukebox/artists.rb

@@ -9,6 +9,7 @@ module Artists
     bb:   { genre: 'JAZZ', name: "bix_beiderbecke"},
     bm:   { genre: 'JAZZ', name: "bennie_moten"},
     fc:   { genre: 'CLASSICAL', name: "chopin"},
+    ca:   { genre: 'JAZZ', name: "cannonball_adderley"},
     cc:   { genre: 'JAZZ', name: "charlie_christian"},
     cp:   { genre: 'JAZZ', name: "charlie_parker"},
     ch:   { genre: 'JAZZ', name: "coleman_hawkins"},
@@ -22,6 +23,7 @@ module Artists
     fh:   { genre: 'JAZZ', name: "fletcher_henderson"},
     h:    { genre: 'CLASSICAL', name: 'haydn'},
     jj:   { genre: 'JAZZ', name: "james_p_johnson"},
+    jm:   { genre: 'JAZZ', name: "jazz_medleys"},
     jrm:  { genre: 'JAZZ', name: "jelly_roll_morton"},
     jsb:  { genre: 'CLASSICAL', name: "bach"},
     ko:   { genre: 'JAZZ', name: "king_oliver"},

data/lib/jimmy_jukebox/jukebox.rb

@@ -2,19 +2,38 @@ require 'jimmy_jukebox/user_config'
 
 module JimmyJukebox
 
-  RUNNING_JRUBY = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || RUBY_PLATFORM == 'java'
-
   class Jukebox
 
     class NoSongsException < Exception; end
     class NoNewSongException < Exception; end
     class NoCurrentSongException < Exception; end
     class NoPreviousSongException < Exception; end
+    class NotRunningXWindowsException < Exception; end
 
-    attr_accessor :current_song, :continuous_play, :songs_played
+    attr_accessor :current_song, :continuous_play, :songs_played, :initial_dpms_state
     attr_writer   :user_config, :next_song, :playing
 
+    def dpms_state
+      raise NotRunningXWindowsException unless JimmyJukebox::RUNNING_X_WINDOWS
+      xsettings = `xset q`
+      xsettings.match(/DPMS is (.*)/)[1]
+    end
+
+    def restore_dpms_state
+      raise NotRunningXWindowsException unless JimmyJukebox::RUNNING_X_WINDOWS
+      puts "*** Restoring DPMS state to 'Enabled' ***"
+      `xset +dpms` if initial_dpms_state == 'Enabled'
+    end
+
+    def disable_monitor_powerdown
+      raise NotRunningXWindowsException unless JimmyJukebox::RUNNING_X_WINDOWS
+      self.initial_dpms_state = dpms_state
+      puts "*** Disabling DPMS. Will re-enable DPMS on shutdown ***" if initial_dpms_state == 'Enabled'
+      `xset -dpms` #`; xset s off`
+    end
+
     def initialize(new_user_config = UserConfig.new, continuous_play = true)
+      disable_monitor_powerdown if JimmyJukebox::RUNNING_X_WINDOWS
       self.user_config = new_user_config
       self.continuous_play = continuous_play
       raise NoSongsException if songs.empty?

data/lib/jimmy_jukebox/songs/CannonballAdderley.yml

@@ -0,0 +1,8 @@
+---
+- http://archive.org/download/SomethinElse/01-AutumnLeaves10.59.mp3
+- http://archive.org/download/SomethinElse/02-LoveForSale7.06.mp3
+- http://archive.org/download/SomethinElse/03-SomethinElse8.14.mp3
+- http://archive.org/download/SomethinElse/04-OneForDaddy-o8.25.mp3
+- http://archive.org/download/SomethinElse/05-DancingInTheDark4.07.mp3
+- http://archive.org/download/SomethinElse/06-AlisonsUncle5.04.mp3
+- http://archive.org/download/BlueInGreen/03-BlueInGreen.mp3

data/lib/jimmy_jukebox/songs/JazzMedleys.yml

@@ -0,0 +1,14 @@
+---
+- http://archive.org/download/Late1950sJazzSaxophoneGreats/Late1950sSaxophoneGreats.mp3
+- http://archive.org/download/1950sClassicJazzTrumpetGreats/1950sJazzTrumpetGreats.mp3
+- http://archive.org/download/Early1960sJazzSaxophoneGreats/Early60sSaxGreats.mp3
+- http://archive.org/download/HankMobley-HighVoltage/01.highVoltage.mp3
+- http://archive.org/download/TheLastTimeISawParis/01-TheLastTimeISawParis.mp3
+- http://archive.org/download/DexterGordon-Tanya/01-Tanya.mp3
+- http://archive.org/download/DexterGordonQuintetWardellGray-TheChase1947/DexterGordonQuintetWardellGray-TheChase1947.mp3
+- http://archive.org/download/PoolsideJazzPodcast1_0/pj1.mp3
+- http://archive.org/download/PoolsideJazzPodcast2/pj2.mp3
+- http://archive.org/download/PoolsideJazzPodcast3/pj3.mp3
+- http://archive.org/download/PoolsideJazzPodcast4_2/pj4.mp3
+- http://archive.org/download/PoolsideJazzPodcast5/pj5.mp3
+- http://archive.org/download/PoolsideJazzPodcast6/pj6.mp3

data/lib/jimmy_jukebox/user_config.rb

@@ -5,6 +5,19 @@ include Artists
 
 module JimmyJukebox
 
+  def self.running_x_windows
+    xset_location = `which xset`
+    if xset_location
+      !!xset_location.match(/\/xset/)
+    else
+      false
+    end
+  end
+
+  RUNNING_JRUBY = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || RUBY_PLATFORM == 'java'
+  RUNNING_LINUX = RbConfig::CONFIG['host_os'] =~ /linux/i
+  RUNNING_X_WINDOWS = running_x_windows
+
   class UserConfig
 
     attr_writer   :music_directories

data/lib/jimmy_jukebox/user_interface.rb

@@ -1,6 +1,6 @@
 require 'io/console'
 
-if $running_jruby
+if JimmyJukebox::RUNNING_JRUBY
   class IO
     def getch
       raw do
@@ -13,6 +13,7 @@ end
 jj = Jukebox.new
 
 play_loop_thread = Thread.new do
+  at_exit { jj.restore_dpms_state } if JimmyJukebox::RUNNING_LINUX 
   jj.play_loop
 end
 
@@ -22,7 +23,7 @@ user_input_thread = Thread.new do
 
   begin
     loop do
-      if $running_jruby
+      if JimmyJukebox::RUNNING_JRUBY
         char = STDIN.getch
       else
         begin

data/lib/jimmy_jukebox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -135,6 +135,7 @@ files:
 - lib/jimmy_jukebox/songs/BennieMoten.yml
 - lib/jimmy_jukebox/songs/FletcherHenderson.yml
 - lib/jimmy_jukebox/songs/ColemanHawkins.yml
+- lib/jimmy_jukebox/songs/JazzMedleys.yml
 - lib/jimmy_jukebox/songs/KingOliver.yml
 - lib/jimmy_jukebox/songs/OriginalDixielandJazzBand.yml
 - lib/jimmy_jukebox/songs/OscarPeterson.yml
@@ -150,6 +151,7 @@ files:
 - lib/jimmy_jukebox/songs/MilesDavis.yml
 - lib/jimmy_jukebox/songs/BudPowell.yml
 - lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml
+- lib/jimmy_jukebox/songs/CannonballAdderley.yml
 - lib/jimmy_jukebox/songs/DizzyGillespie.yml
 - lib/jimmy_jukebox/songs/DukeEllington.yml
 - lib/jimmy_jukebox/songs/BennyGoodman.yml