jimmy_jukebox 0.6.7 → 0.6.8

data/lib/jimmy_jukebox/jukebox.rb

@@ -8,28 +8,30 @@ module JimmyJukebox
     class NoNewSongException < Exception; end
     class NoCurrentSongException < Exception; end
     class NoPreviousSongException < Exception; end
-    class NotRunningXWindowsException < Exception; end
 
     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]
+      if JimmyJukebox::RUNNING_X_WINDOWS
+        xsettings = `xset q`
+        xsettings.match(/DPMS is (.*)/)[1]
+      end
     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'
+      if JimmyJukebox::RUNNING_X_WINDOWS
+        puts "*** Restoring DPMS state to 'Enabled' ***"
+        `xset +dpms` if initial_dpms_state == 'Enabled'
+      end
     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`
+      if 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
     end
 
     def initialize(new_user_config = UserConfig.new, continuous_play = true)

data/lib/jimmy_jukebox/user_config.rb

@@ -20,9 +20,11 @@ module JimmyJukebox
     end
   end
 
+  HOST_OS = RbConfig::CONFIG['host_os']
+  RUNNING_OSX = HOST_OS =~ /darwin/i || HOST_OS =~ /mac os/i
   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
+  RUNNING_LINUX = HOST_OS =~ /linux/i
+  RUNNING_X_WINDOWS = !RUNNING_OSX && running_x_windows
 
   class UserConfig
 

data/lib/jimmy_jukebox/version.rb

@@ -1,4 +1,4 @@
 module JimmyJukebox
-  VERSION = '0.6.7'
-  DATE = '2013-10-20'
+  VERSION = '0.6.8'
+  DATE = '2013-10-21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimmy_jukebox
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec