spotify-dbus 0.2 → 0.3

data/bin/spotify-dbus

@@ -1,13 +1,23 @@
 #!/usr/bin/env ruby
-#require 'spotify-dbus'
-require File.join(File.dirname(__FILE__), '../lib/spotify-dbus.rb')
+require 'spotify-dbus'
 
+def error msg
+  puts msg
+  exit false
+end
 
-cmd = ARGV.pop
-
-begin
-  Spotify.player.send(cmd) if Spotify.player.methods[cmd]
-rescue
-  puts "Spotify is not running!"
+if ARGV.size > 0
+  begin
+    cmd = ARGV.pop
+    if Spotify.player.methods[cmd]
+      Spotify.player.send(cmd) 
+    else
+      error "Invalid command!"
+    end
+  rescue
+    error "Spotify is not running!"
+  end
+else
+  error "No command given!"
 end
 

data/lib/spotify-dbus.rb

@@ -1,13 +1,13 @@
 require 'dbus'
 
 module Spotify
-  def player
+  def self.player
     @player ||= player_object
   end
     
   protected
   
-  def player_object
+  def self.player_object
     dbus = DBus::SessionBus.instance
     service = dbus.service('org.mpris.MediaPlayer2.spotify')
     object = service.object('/org/mpris/MediaPlayer2')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify-dbus
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
-  requirement: &19886080 !ruby/object:Gem::Requirement
+  requirement: &24723220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *19886080
+  version_requirements: *24723220
 description: Simple module and bin for Spotify DBus interfacing
 email: mikeycgto@gmail.com
 executables: