ruby-mpd 0.1.5 → 0.1.7

data/lib/ruby-mpd/exceptions.rb

@@ -0,0 +1,33 @@
+class MPD
+  # Standard MPD error.
+  class Error < StandardError; end
+  # When something goes wrong with the connection
+  class ConnectionError < Error; end
+
+  # When the server returns an error. Superclass. Used for ACK_ERROR_UNKNOWN too.
+  class ServerError < Error;  end
+
+  class NotListError < ServerError; end # ACK_ERROR_NOT_LIST <-- unused?
+  # ACK_ERROR_ARG - There was an error with one of the arguments.
+  class ServerArgumentError < ServerError; end
+  # MPD server password incorrect - ACK_ERROR_PASSWORD
+  class IncorrectPassword < ServerError; end
+  # ACK_ERROR_PERMISSION - not permitted to use the command. 
+  # (Mostly, the solution is to connect via UNIX domain socket)
+  class PermissionError < ServerError; end
+
+  # ACK_ERROR_NO_EXIST - The requested resource was not found
+  class NotFound < ServerError; end
+  # ACK_ERROR_PLAYLIST_MAX - Playlist is at the max size
+  class PlaylistMaxError < ServerError; end
+  # ACK_ERROR_SYSTEM - One of the systems has errored.
+  class SystemError < ServerError; end
+  # ACK_ERROR_PLAYLIST_LOAD - unused?
+  class PlaylistLoadError < ServerError; end
+  # ACK_ERROR_UPDATE_ALREADY - Already updating the DB.
+  class AlreadyUpdating < ServerError; end
+  # ACK_ERROR_PLAYER_SYNC - not playing.
+  class NotPlaying < ServerError; end
+  # ACK_ERROR_EXIST - the resource already exists.
+  class AlreadyExists < ServerError; end
+end

data/lib/ruby-mpd/parser.rb

@@ -11,11 +11,13 @@ class MPD
         if word.is_a?(TrueClass) || word.is_a?(FalseClass)
           word ? '1' : '0' # convert bool to 1 or 0
         elsif word.is_a?(Range)
-          if word.end == -1 #negative means to end of range
+          if word.end == -1 # negative means to end of range
             "#{word.begin}:"
           else
             "#{word.begin}:#{word.end + (word.exclude_end? ? 0 : 1)}"
           end
+        elsif word.is_a?(MPD::Song)
+          word.file
         else
           # escape any strings with space (wrap in double quotes)
           word = word.to_s
@@ -36,9 +38,14 @@ class MPD
     FLOAT_KEYS = [:mixrampdb, :elapsed]
     BOOL_KEYS = [:repeat, :random, :single, :consume, :outputenabled]
 
-    # Parses key-value pairs into correct class
-    # @todo special parsing of playlist, it's a int in :status and a string in :listplaylists
 
+    # Commands, where it makes sense to always explicitly return an array.
+    RETURN_ARRAY = [:channels, :outputs, :readmessages, :list, :listall, 
+      :listallinfo, :find, :search, :listplaylists, :listplaylist, :playlistfind,
+      :playlistsearch, :plchanges, :tagtypes, :commands, :notcommands, :urlhandlers,
+      :decoders, :listplaylistinfo]
+
+    # Parses key-value pairs into correct class.
     def parse_key key, value
       if INT_KEYS.include? key
         value.to_i
@@ -113,11 +120,21 @@ class MPD
       end
     end
 
+    # Parses the response, determining per-command on what parsing logic
+    # to use (build_response vs build_grouped_response). 
+    #
+    # @return [Array<Hash>, Array<String>, String, Integer] Parsed response.
+    def parse_response(command, string)
+      # return explicit array if needed
+      return RETURN_ARRAY.include?(command) ? [] : true if string.is_a?(TrueClass)
+      command == :listall ? build_grouped_response(string) : build_response(command, string)
+    end
+
     # Parses the response into appropriate objects (either a single object,
     # or an array of objects or an array of hashes).
     #
     # @return [Array<Hash>, Array<String>, String, Integer] Parsed response.
-    def build_response(string)
+    def build_response(command, string)
       return [] if string.nil? || !string.is_a?(String)
 
       chunks = make_chunks(string)
@@ -128,15 +145,15 @@ class MPD
         result << (is_hash ? build_hash(chunk) : parse_line(chunk))
       end
 
-      # if list has only one element, return it, else return array
-      result = list.length == 1 ? list.first : list
+      # if list has only one element and not set to explicit array, return it, else return array
+      result = (list.length == 1 && !RETURN_ARRAY.include?(command)) ? list.first : list
       return result
     end
 
     # Parse the response into groups that have the same key (used for file lists,
     # groups together files, directories and playlists).
     # @return [Hash<Array>] A hash of key groups.
-    def build_groups(string)
+    def build_grouped_response(string)
       return [] if string.nil? || !string.is_a?(String)
 
       string.split("\n").each_with_object({}) do |line, hash|

data/lib/ruby-mpd/playlist.rb

@@ -9,15 +9,12 @@ class MPD
   # plugins instead of the hard-coded simple m3u parser. They can access
   # playlists in the music directory (relative path including the suffix) or
   # remote playlists (absolute URI with a supported scheme).
-  #
-  # Changes: rm -> destroy. listplaylistinfo -> songs. Playlist prefixes
-  # dropped also of course. Listplaylist not used, kinda inferior to listplaylistinfo
   class Playlist
 
     attr_accessor :name
 
     def initialize(mpd, options)
-      @name = options[:playlist]
+      @name = options.is_a?(Hash) ? options[:playlist] : options.to_s
       @mpd = mpd
       #@last_modified = options[:'last-modified']
     end
@@ -25,7 +22,9 @@ class MPD
     # Lists the songs in the playlist. Playlist plugins are supported.
     # @return [Array<MPD::Song>] songs in the playlist.
     def songs
-      mpd.build_songs_list @mpd.send_command(:listplaylistinfo, @name)
+      @mpd.send_command(:listplaylistinfo, @name).map {|hash| Song.new(hash) }
+    rescue NotFound
+      return [] # we rescue in the case the playlist doesn't exist.
     end
 
     # Loads the playlist into the current queue. Playlist plugins are supported.
@@ -51,7 +50,7 @@ class MPD
     #   and +:any+ to match against all available tags.
     # @macro returnraise
     def searchadd(type, what)
-      send_command :searchaddpl, @name, type, what
+      @mpd.send_command :searchaddpl, @name, type, what
     end
 
     # Clears the playlist.

data/lib/ruby-mpd/plugins/channels.rb

@@ -1,4 +1,5 @@
 class MPD
+  # This namespace contains "plugins", which get included into the main class.
   module Plugins
     # = Client to client commands
     #
@@ -30,9 +31,7 @@ class MPD
       end
 
       # Obtain a list of all channels.
-      # @return [Array<String>]
-      # @return [String] if only one channel exists.
-      # @return [true] if no channels exist.
+      # @return [Array<String>] a list of channels
       def channels
         send_command :channels
       end
@@ -40,8 +39,6 @@ class MPD
       # Reads messages for this client. The response is an array of
       # hashes with +:channel+ and +:message+ keys or true if no messages.
       # @return [Array<Hash>] Messages recieved.
-      # @return [Hash] if only one message recieved
-      # @return [true] if no messages.
       def readmessages
         send_command :readmessages
       end

data/lib/ruby-mpd/plugins/controls.rb

@@ -1,8 +1,6 @@
 class MPD
   module Plugins
-    # Commands for controlling playback. Changes have been made to {#seek},
-    # command maps to +seekcur+ from MPD and the original seek command is
-    # {#seekpos} here.
+    # Commands for controlling playback.
     module Controls
       # Plays the next song in the playlist.
       # @macro returnraise
@@ -11,7 +9,6 @@ class MPD
       end
 
       # Resume/pause playback.
-      # @note The use of pause without an argument is deprecated in MPD.
       # @macro returnraise
       def pause=(toggle)
         send_command :pause, toggle
@@ -46,7 +43,7 @@ class MPD
       # @since MPD 0.17
       # @param [Integer, String] time Position within the current song.
       # @param [Hash] options Either +:id+ or +:pos+ can be specified.
-      # Returns true if successful,
+      # @macro returnraise
       def seek(time, options = {})
         if options[:id]
           send_command :seekid, options[:id], time

data/lib/ruby-mpd/plugins/database.rb

@@ -1,9 +1,6 @@
 class MPD
   module Plugins
     # Commands for interacting with the music database.
-    #
-    # Changes: listallinfo -> songs, searchaddpl in MPD::Playlist#searchadd.
-    # search merges search, find, searchadd and findadd
     module Database
 
       # Counts the number of songs and their total playtime
@@ -22,7 +19,13 @@ class MPD
         send_command :list, type, arg
       end
 
-      # listall
+      # List all of the files in the database, starting at path.
+      # If path isn't specified, the root of the database is used.
+      #
+      # @return [Hash<String>] hash with array keys :file, :directory and :playlist.
+      def files(path = nil)
+        send_command :listall, path
+      end
 
       # List all of the songs in the database starting at path.
       # If path isn't specified, the root of the database is used
@@ -32,7 +35,8 @@ class MPD
         build_songs_list send_command(:listallinfo, path)
       end
 
-      # lsinfo
+      # lsinfo - Clients that are connected via UNIX domain socket may use this
+      # command to read the tags of an arbitrary local file (URI beginning with "file:///").
 
       # Searches for any song that contains +what+ in the +type+ field.
       # Searches are case insensitive by default, however you can enable
@@ -68,11 +72,45 @@ class MPD
 
       # Same as {#update}, but also rescans unmodified files.
       #
-      # @return [Integer] Update job ID
+      # @return (see #update)
       def rescan(path = nil)
         send_command :rescan, path
       end
 
+      # unofficial
+
+      # List all of the directories in the database, starting at path.
+      # If path isn't specified, the root of the database is used.
+      #
+      # @return [Array<String>] Array of directory names
+      def directories(path = nil)
+        response = send_command(:listall, path)
+        return response[:directory]
+      end
+
+      # Lists all of the albums in the database.
+      # The optional argument is for specifying an artist to list
+      # the albums for
+      #
+      # @return [Array<String>] An array of album names.
+      def albums(artist = nil)
+        list :album, artist
+      end
+
+      # Lists all of the artists in the database.
+      #
+      # @return [Array<String>] An array of artist names.
+      def artists
+        list :artist
+      end
+
+      # List all of the songs by an artist.
+      #
+      # @return [Array<MPD::Song>]
+      def songs_by_artist(artist)
+        search :artist, artist
+      end
+      
     end
   end
 end

data/lib/ruby-mpd/plugins/information.rb

@@ -14,8 +14,11 @@ class MPD
       # Get the currently playing song
       #
       # @return [MPD::Song]
+      # @return [nil] if there is no song playing
       def current_song
-        Song.new send_command :currentsong
+        hash = send_command :currentsong
+        # if there is no current song (we get true, then return nil)
+        hash.is_a?(TrueClass) ? nil : Song.new(hash)
       end
 
       # Waits until there is a noteworthy change in one or more of MPD's subsystems.
@@ -41,9 +44,9 @@ class MPD
       #
       # @since MPD 0.14
       # @param [Symbol] masks A list of subsystems we want to be notified on.
-      def idle(*masks)
-        send_command(:idle, *masks)
-      end
+      #def idle(*masks)
+      #  send_command(:idle, *masks)
+      #end
 
       # MPD status: volume, time, modes...
       # * *volume*: 0-100

data/lib/ruby-mpd/plugins/playback_options.rb

@@ -1,8 +1,6 @@
 class MPD
   module Plugins
     # Commands related to setting various aspects and modes of playback.
-    #
-    # Changes: setvol -> volume.
     module PlaybackOptions
 
       # Enable/disable consume mode.
@@ -26,6 +24,7 @@ class MPD
       # volume so use negative values, I prefer -17dB. In the absence of mixramp
       # tags crossfading will be used. See http://sourceforge.net/projects/mixramp
       # @param [Float] decibels Maximum volume level in decibels.
+      # @macro returnraise
       def mixrampdb=(decibels)
         send_command :mixrampdb, decibels
       end
@@ -33,6 +32,7 @@ class MPD
       # Additional time subtracted from the overlap calculated by mixrampdb.
       # A value of "nan" or Float::NAN disables MixRamp overlapping and falls
       # back to crossfading.
+      # @macro returnraise
       def mixrampdelay=(seconds)
         send_command :mixrampdelay, seconds
       end
@@ -51,7 +51,7 @@ class MPD
 
       # Sets the volume level. (Maps to MPD's +setvol+)
       # @param [Integer] vol Volume level between 0 and 100.
-      # @macro returnraise
+      # @return [Integer] The new volume level.
       def volume=(vol)
         send_command :setvol, vol
       end

data/lib/ruby-mpd/plugins/playlists.rb

@@ -1,13 +1,11 @@
 class MPD
   module Plugins
     # These commands manipulate stored playlists.
-    #
-    # Changes: listplaylists -> playlists.
     module Playlists
 
       # List all of the playlists in the database
       #
-      # @return [Array<Hash>] Array of playlists
+      # @return [Array<MPD::Playlist>] Array of playlists
       def playlists
         send_command(:listplaylists).map {|opt| MPD::Playlist.new(self, opt)}
       end

data/lib/ruby-mpd/plugins/queue.rb

@@ -2,17 +2,14 @@ class MPD
   module Plugins
     # These commands manipulate the current playlist, what's playing now.
     # For a distinction between this and other playlists, this is called
-    # queue. 
-    # Changes: playlistinfo -> queue, plchanges -> queue_changes,
-    #  playlistid -> song_with_id, playlistfind -> queue_find,
-    #  playlistsearch -> queue_search, prio -> song_priority.
+    # queue.
     module Queue
 
       # List the current playlist/queue.
       # An Integer or Range can be used to limit the information returned
       # to a specific subset.
       #
-      # @return [MPD::Song, Array<MPD::Song>] Array of songs in the queue
+      # @return [Array<MPD::Song>] Array of songs in the queue
       # or a single song.
       def queue(limit=nil)
         build_songs_list send_command(:playlistinfo, limit)
@@ -27,6 +24,7 @@ class MPD
 
       # Adds a song to the queue (*non-recursive*) and returns the song id.
       # Optionally, one can specify the position on which to add the song (since MPD 0.14).
+      # @return [Integer] id of the song that was added.
       def addid(path, pos=nil)
         send_command :addid, pos
       end

data/lib/ruby-mpd/plugins/reflection.rb

@@ -1,8 +1,6 @@
 class MPD
   module Plugins
     # Informational commands regarding MPD's internals and config.
-    #
-    # Changes: tagtypes was mapped to tags and gets fetched only once.
     module Reflection
       # Returns the config of MPD (currently only music_directory).
       # Only works if connected trough an UNIX domain socket.
@@ -36,7 +34,9 @@ class MPD
         send_command :decoders
       end
 
-      # Get a list of available song metadata.
+      # Get a list of available song metadata fields. This gets only
+      # mapped once per-connect (it gets remapped if you connect and
+      # disconnect).
       # @return [Array] An array of tags.
       def tags
         @tags ||= send_command(:tagtypes).map {|tag| tag.downcase }

data/lib/ruby-mpd/song.rb

@@ -1,11 +1,15 @@
 class MPD; end
 
-# This class is a glorified Hash used to represent a song.
+# Object representation of a song.
 #
 # If the field doesn't exist or isn't set, nil will be returned
 class MPD::Song
+  # length in seconds
+  attr_accessor :time
+
   def initialize(options)
-    @data = {}
+    @data = {} #allowed fields are @types + :file
+    @time = options.delete(:time).first #HAXX for array return
     @data.merge! options
   end
 
@@ -14,10 +18,12 @@ class MPD::Song
     self.file == another.file
   end
 
+  # @return [String] A formatted representation of the song length ("1:02")
   def length
-    return "#{(@data.time / 60)}:#{"%02d" % (@data.time % 60)}"
+    return "#{(@time / 60)}:#{"%02d" % (@time % 60)}"
   end
 
+  # Pass any unknown calls over to the data hash.
   def method_missing(m, *a)
     key = m #.to_s
     if key =~ /=$/

data/ruby-mpd.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = 'ruby-mpd'
-  s.version       = '0.1.5'
+  s.version       = '0.1.7'
   s.homepage      = 'https://github.com/archSeer/ruby-mpd'
   s.authors       = ["Blaž Hrastnik"]
   s.email         = ['speed.the.bboy@gmail.com']

data/{tests → test}/libtests.rb

@@ -1,35 +1,24 @@
 #
-# Unit tests for librmpd
+# Unit tests for ruby-mpd
 #
-# This uses the included mpdserver.rb test server
 
-require '../lib/librmpd'
-require '../lib/mpdserver'
+require '../lib/ruby-mpd'
 require 'test/unit'
 
 class MPDTester < Test::Unit::TestCase
 
   def setup
     begin
-      @port = 93932
-      @server = MPDTestServer.new @port
-      @server.start
-    rescue Errno::EADDRINUSE
-      @port = 94942
-      @server = MPDTestServer.new @port
-      @server.start
-    end
-    @mpd = MPD.new 'localhost', @port
+    @mpd = MPD.new 'localhost', 94942
   end
 
   def teardown
     @mpd.disconnect
-    @server.stop
   end
 
   def test_connect
     ret = @mpd.connect
-    assert_match /OK MPD [0-9.]*\n/, ret
+    assert ret
   end
 
   def test_connected?
@@ -73,10 +62,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Are You Shpongled?', pls[0].album
     assert_equal 'Shpongle Falls', pls[0].title
 
-    assert_raise(MPD::MPDError) {@mpd.add('Does/Not/Exist')}
+    assert_raise(MPD::ServerError) {@mpd.add('Does/Not/Exist')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.add('Shpongle')}
+    assert_raise(MPD::ServerError) {@mpd.add('Shpongle')}
   end
 
   def test_clear
@@ -94,7 +83,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 0, pls.size
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.clear}
+    assert_raise(MPD::ServerError) {@mpd.clear}
   end
 
   def test_clearerror
@@ -104,7 +93,7 @@ class MPDTester < Test::Unit::TestCase
     assert @mpd.clearerror
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.clearerror}
+    assert_raise(MPD::ServerError) {@mpd.clearerror}
   end
 
   def test_crossfade
@@ -116,8 +105,8 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '40', @mpd.status['xfade']
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.crossfade = 20}
-    assert_raise(MPD::MPDError) {@mpd.crossfade}
+    assert_raise(MPD::ServerError) {@mpd.crossfade = 20}
+    assert_raise(MPD::ServerError) {@mpd.crossfade}
   end
 
   def test_current_song
@@ -155,7 +144,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '1', s.track
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.current_song}
+    assert_raise(MPD::ServerError) {@mpd.current_song}
   end
 
   def test_delete
@@ -171,10 +160,10 @@ class MPDTester < Test::Unit::TestCase
       assert_not_equal 'No On Ever Dreams', song.title
     end
 
-    assert_raise(MPD::MPDError) {@mpd.delete(999)}
+    assert_raise(MPD::ServerError) {@mpd.delete(999)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.delete(3)}
+    assert_raise(MPD::ServerError) {@mpd.delete(3)}
   end
 
   def test_deleteid
@@ -190,10 +179,10 @@ class MPDTester < Test::Unit::TestCase
       assert_not_equal 'No One Ever Dreams', song.title
     end
 
-    assert_raise(MPD::MPDError) {@mpd.deleteid(999)}
+    assert_raise(MPD::ServerError) {@mpd.deleteid(999)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.deleteid(11)}
+    assert_raise(MPD::ServerError) {@mpd.deleteid(11)}
   end
 
   def test_find
@@ -230,10 +219,10 @@ class MPDTester < Test::Unit::TestCase
     d = @mpd.find 'artist', 'no artist'
     assert_equal 0, d.size
 
-    assert_raise(MPD::MPDError) {@mpd.find('error', 'no-such')}
+    assert_raise(MPD::ServerError) {@mpd.find('error', 'no-such')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.find('album', 'Are You Shpongled')}
+    assert_raise(MPD::ServerError) {@mpd.find('album', 'Are You Shpongled')}
   end
 
   def test_kill
@@ -243,7 +232,7 @@ class MPDTester < Test::Unit::TestCase
 
     assert !@mpd.connected?
 
-    assert_raise(MPD::MPDError) {@mpd.kill}
+    assert_raise(MPD::ServerError) {@mpd.kill}
   end
 
   def test_albums
@@ -264,7 +253,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Nothing Lasts... But Nothing Is Lost', sh[1]
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.albums}
+    assert_raise(MPD::ServerError) {@mpd.albums}
   end
 
   def test_artists
@@ -278,7 +267,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Shpongle', artists[2]
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.artists}
+    assert_raise(MPD::ServerError) {@mpd.artists}
   end
 
   def test_list
@@ -305,11 +294,11 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Are You Shpongled?', arg[0]
     assert_equal 'Nothing Lasts... But Nothing Is Lost', arg[1]
 
-    assert_raise(MPD::MPDError) {@mpd.list('fail')}
-    assert_raise(MPD::MPDError) {@mpd.list('fail', 'Shpongle')}
+    assert_raise(MPD::ServerError) {@mpd.list('fail')}
+    assert_raise(MPD::ServerError) {@mpd.list('fail', 'Shpongle')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.artists}
+    assert_raise(MPD::ServerError) {@mpd.artists}
   end
 
   def test_directories
@@ -333,10 +322,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Shpongle/Are_You_Shpongled', shpongle[1]
     assert_equal 'Shpongle/Nothing_Lasts..._But_Nothing_Is_Lost', shpongle[2]
 
-    assert_raise(MPD::MPDError) {@mpd.directories('no-dirs')}
+    assert_raise(MPD::ServerError) {@mpd.directories('no-dirs')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.directories}
+    assert_raise(MPD::ServerError) {@mpd.directories}
   end
 
   def test_files
@@ -364,10 +353,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Shpongle/Nothing_Lasts..._But_Nothing_Is_Lost/01.Botanical_Dimensions.ogg', sh[7]
     assert_equal 'Shpongle/Nothing_Lasts..._But_Nothing_Is_Lost/20.Falling_Awake.ogg', sh[26]
 
-    assert_raise(MPD::MPDError) {@mpd.files('no-files')}
+    assert_raise(MPD::ServerError) {@mpd.files('no-files')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.files}
+    assert_raise(MPD::ServerError) {@mpd.files}
   end
 
   def test_playlists
@@ -381,7 +370,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Astral_Projection_-_Dancing_Galaxy', pls[1]
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.playlists}
+    assert_raise(MPD::ServerError) {@mpd.playlists}
   end
 
   def test_songs
@@ -413,10 +402,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Botanical Dimensions', sh[7].title
     assert_equal 'Falling Awake', sh[26].title
 
-    assert_raise(MPD::MPDError) {@mpd.songs('no-songs')}
+    assert_raise(MPD::ServerError) {@mpd.songs('no-songs')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.songs}
+    assert_raise(MPD::ServerError) {@mpd.songs}
   end
 
   def test_songs_by_artist
@@ -439,7 +428,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 0, songs.size
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.songs_by_artist('Shpongle')}
+    assert_raise(MPD::ServerError) {@mpd.songs_by_artist('Shpongle')}
   end
 
   def test_load
@@ -465,10 +454,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Liquid Sun', pls[6].title
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', pls[7].title
 
-    assert_raise(MPD::MPDError) {@mpd.load('No-PLS')}
+    assert_raise(MPD::ServerError) {@mpd.load('No-PLS')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.load('Astral_Projection_-_Dancing_Galaxy')}
+    assert_raise(MPD::ServerError) {@mpd.load('Astral_Projection_-_Dancing_Galaxy')}
   end
 
   def test_move
@@ -495,10 +484,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', pls[6].title
     assert_equal 'Soundform', pls[7].title
 
-    assert_raise(MPD::MPDError) {@mpd.move(999,1)}
+    assert_raise(MPD::ServerError) {@mpd.move(999,1)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.move(3,1)}
+    assert_raise(MPD::ServerError) {@mpd.move(3,1)}
   end
 
   def test_moveid
@@ -525,10 +514,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', pls[6].title
     assert_equal 'Soundform', pls[7].title
 
-    assert_raise(MPD::MPDError) {@mpd.moveid(999,1)}
+    assert_raise(MPD::ServerError) {@mpd.moveid(999,1)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.moveid(10,1)}
+    assert_raise(MPD::ServerError) {@mpd.moveid(10,1)}
 
   end
 
@@ -546,7 +535,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal pos + 1, @mpd.status['song'].to_i
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.next}
+    assert_raise(MPD::ServerError) {@mpd.next}
   end
 
   def test_pause
@@ -573,19 +562,19 @@ class MPDTester < Test::Unit::TestCase
     assert !@mpd.paused?
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.pause = true}
-    assert_raise(MPD::MPDError) {@mpd.paused?}
+    assert_raise(MPD::ServerError) {@mpd.pause = true}
+    assert_raise(MPD::ServerError) {@mpd.paused?}
   end
 
   def test_password
     @mpd.connect
 
-    assert_raise(MPD::MPDError) {@mpd.password('wrong')}
+    assert_raise(MPD::ServerError) {@mpd.password('wrong')}
 
     assert @mpd.password('test')
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.password('test')}
+    assert_raise(MPD::ServerError) {@mpd.password('test')}
   end
 
   def test_ping
@@ -594,7 +583,7 @@ class MPDTester < Test::Unit::TestCase
     assert @mpd.ping
     
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.ping}
+    assert_raise(MPD::ServerError) {@mpd.ping}
   end
 
   def test_play
@@ -624,8 +613,8 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Flying Into A Star', song.title
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.play}
-    assert_raise(MPD::MPDError) {@mpd.playing?}
+    assert_raise(MPD::ServerError) {@mpd.play}
+    assert_raise(MPD::ServerError) {@mpd.playing?}
   end
 
   def test_playid
@@ -655,8 +644,8 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Flying Into A Star', song.title
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.playid}
-    assert_raise(MPD::MPDError) {@mpd.playing?}
+    assert_raise(MPD::ServerError) {@mpd.playid}
+    assert_raise(MPD::ServerError) {@mpd.playing?}
 
   end
 
@@ -674,7 +663,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 9, ver
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.playlist_version}
+    assert_raise(MPD::ServerError) {@mpd.playlist_version}
   end
 
   def test_playlist
@@ -700,7 +689,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', pls[7].title
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.playlist}
+    assert_raise(MPD::ServerError) {@mpd.playlist}
   end
 
   def test_song_at_pos
@@ -717,10 +706,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Liquid Sun', @mpd.song_at_pos(6).title
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', @mpd.song_at_pos(7).title
 
-    assert_raise(MPD::MPDError) {@mpd.song_at_pos(999)}
+    assert_raise(MPD::ServerError) {@mpd.song_at_pos(999)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.song_at_pos(0)}
+    assert_raise(MPD::ServerError) {@mpd.song_at_pos(0)}
   end
 
   def test_song_with_id
@@ -737,10 +726,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Liquid Sun', @mpd.song_with_id(13).title
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', @mpd.song_with_id(14).title
 
-    assert_raise(MPD::MPDError) {@mpd.song_with_id(999)}
+    assert_raise(MPD::ServerError) {@mpd.song_with_id(999)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.song_with_id(10)}
+    assert_raise(MPD::ServerError) {@mpd.song_with_id(10)}
   end
 
   def test_playlist_changes
@@ -770,7 +759,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 8, changes.size
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.playlist_changes(9)}
+    assert_raise(MPD::ServerError) {@mpd.playlist_changes(9)}
   end
 
   def test_previous
@@ -791,7 +780,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal pos - 1, @mpd.status['song'].to_i
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.previous}
+    assert_raise(MPD::ServerError) {@mpd.previous}
   end
 
   def test_random
@@ -804,8 +793,8 @@ class MPDTester < Test::Unit::TestCase
     assert !@mpd.random?
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.random = false}
-    assert_raise(MPD::MPDError) {@mpd.random?}
+    assert_raise(MPD::ServerError) {@mpd.random = false}
+    assert_raise(MPD::ServerError) {@mpd.random?}
   end
 
   def test_repeat
@@ -818,8 +807,8 @@ class MPDTester < Test::Unit::TestCase
     assert !@mpd.repeat?
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.repeat = false}
-    assert_raise(MPD::MPDError) {@mpd.repeat?}
+    assert_raise(MPD::ServerError) {@mpd.repeat = false}
+    assert_raise(MPD::ServerError) {@mpd.repeat?}
   end
 
   def test_rm
@@ -833,10 +822,10 @@ class MPDTester < Test::Unit::TestCase
 
     assert_equal 'Shpongle_-_Are_You_Shpongled', pls[0]
 
-    assert_raise(MPD::MPDError) {@mpd.rm('Not-Exist')}
+    assert_raise(MPD::ServerError) {@mpd.rm('Not-Exist')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.rm('Astral_Projection_-_Dancing_Galaxy')}
+    assert_raise(MPD::ServerError) {@mpd.rm('Astral_Projection_-_Dancing_Galaxy')}
   end
 
   def test_save
@@ -872,7 +861,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '... and the Day Turned to Night', pls[14].title
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.save('test')}
+    assert_raise(MPD::ServerError) {@mpd.save('test')}
   end
 
   def test_search
@@ -908,10 +897,10 @@ class MPDTester < Test::Unit::TestCase
     z = @mpd.search 'title', 'no-title'
     assert_equal 0, z.size
 
-    assert_raise(MPD::MPDError) {@mpd.search('error', 'nosuch')}
+    assert_raise(MPD::ServerError) {@mpd.search('error', 'nosuch')}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.search('artist','searching')}
+    assert_raise(MPD::ServerError) {@mpd.search('artist','searching')}
   end
 
   def test_seek
@@ -940,7 +929,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '200:585', status['time']
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.seek(1, 100)}
+    assert_raise(MPD::ServerError) {@mpd.seek(1, 100)}
   end
 
   def test_seekid
@@ -969,7 +958,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '200:585', status['time']
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.seekid(1, 100)}
+    assert_raise(MPD::ServerError) {@mpd.seekid(1, 100)}
   end
 
   def test_volume
@@ -984,8 +973,8 @@ class MPDTester < Test::Unit::TestCase
     assert_equal vol, @mpd.volume
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.volume = 10}
-    assert_raise(MPD::MPDError) {@mpd.volume}
+    assert_raise(MPD::ServerError) {@mpd.volume = 10}
+    assert_raise(MPD::ServerError) {@mpd.volume}
   end
 
   def test_shuffle
@@ -1001,7 +990,7 @@ class MPDTester < Test::Unit::TestCase
     assert_not_equal 'Dancing Galaxy', pls[0].title
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.shuffle}
+    assert_raise(MPD::ServerError) {@mpd.shuffle}
   end
 
   def test_stats
@@ -1015,7 +1004,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '500', stats['uptime']
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.stats}
+    assert_raise(MPD::ServerError) {@mpd.stats}
   end
 
   def test_status
@@ -1028,7 +1017,7 @@ class MPDTester < Test::Unit::TestCase
     assert_equal '0', status['random']
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.status}
+    assert_raise(MPD::ServerError) {@mpd.status}
   end
 
   def test_stop
@@ -1046,8 +1035,8 @@ class MPDTester < Test::Unit::TestCase
     assert !@mpd.playing?
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.stop}
-    assert_raise(MPD::MPDError) {@mpd.stopped?}
+    assert_raise(MPD::ServerError) {@mpd.stop}
+    assert_raise(MPD::ServerError) {@mpd.stopped?}
   end
 
   def test_swap
@@ -1081,10 +1070,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Liquid Sun', pls[6].title
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', pls[1].title
 
-    assert_raise(MPD::MPDError) {@mpd.swap(999,1)}
+    assert_raise(MPD::ServerError) {@mpd.swap(999,1)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.swap(2, 5)}
+    assert_raise(MPD::ServerError) {@mpd.swap(2, 5)}
   end
 
   def test_swapid
@@ -1118,10 +1107,10 @@ class MPDTester < Test::Unit::TestCase
     assert_equal 'Liquid Sun', pls[6].title
     assert_equal 'Ambient Galaxy (Disco Valley Mix)', pls[1].title
 
-    assert_raise(MPD::MPDError) {@mpd.swapid(999,8)}
+    assert_raise(MPD::ServerError) {@mpd.swapid(999,8)}
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.swapid(9, 12)}
+    assert_raise(MPD::ServerError) {@mpd.swapid(9, 12)}
   end
 
   def test_update
@@ -1140,6 +1129,6 @@ class MPDTester < Test::Unit::TestCase
     assert_nil status['updating_db']
 
     @mpd.disconnect
-    assert_raise(MPD::MPDError) {@mpd.update}
+    assert_raise(MPD::ServerError) {@mpd.update}
   end
 end