spotify-dbus 0.3 → 0.3.5

data/bin/spotify-dbus

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'spotify-dbus'
 
-def error msg
+def die msg
   puts msg
   exit false
 end
@@ -9,15 +9,20 @@ end
 if ARGV.size > 0
   begin
     cmd = ARGV.pop
-    if Spotify.player.methods[cmd]
-      Spotify.player.send(cmd) 
+    player = SpotifyDBus.player
+    
+    if player.methods[cmd]
+      player.send(cmd)
+      
     else
-      error "Invalid command!"
+      die "Invalid command!"
+      
     end
   rescue
-    error "Spotify is not running!"
+    die "Spotify is not running!"    
   end
+  
 else
-  error "No command given!"
+  die "No command given!"  
 end
 

data/lib/spotify-dbus.rb

@@ -1,18 +1,20 @@
 require 'dbus'
 
-module Spotify
+module SpotifyDBus
   def self.player
-    @player ||= player_object
-  end
+    @player ||= find_dbus_object
+  end    
     
-  protected
-  
-  def self.player_object
-    dbus = DBus::SessionBus.instance
-    service = dbus.service('org.mpris.MediaPlayer2.spotify')
-    object = service.object('/org/mpris/MediaPlayer2')
-    object.introspect
+  class << self
+    def find_dbus_object
+      dbus = DBus::SessionBus.instance
+      service = dbus.service('org.mpris.MediaPlayer2.spotify')
+      object = service.object('/org/mpris/MediaPlayer2')
+      object.introspect
       
-    object['org.mpris.MediaPlayer2.Player']
-  end  
+      object['org.mpris.MediaPlayer2.Player']
+    end
+    
+    protected :find_dbus_object
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify-dbus
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 -04:00
+date: 2011-08-10 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
-  requirement: &24723220 !ruby/object:Gem::Requirement
+  requirement: &7672320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *24723220
+  version_requirements: *7672320
 description: Simple module and bin for Spotify DBus interfacing
 email: mikeycgto@gmail.com
 executables: