rmpd 1.0.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/.rspec

@@ -0,0 +1 @@
+--colour

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in rmpd.gemspec
+gemspec

data/Rakefile

@@ -0,0 +1,14 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require "rspec/core/rake_task"
+#require "cucumber"
+#require "cucumber/rake/task"
+
+
+RSpec::Core::RakeTask.new
+# Cucumber::Rake::Task.new("cucumber") do
+#   puts "No cucumber features defined yet."
+# end
+
+task :default => [:spec] #, :cucumber]

data/lib/rmpd.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), "rmpd/config")
+require File.join(File.dirname(__FILE__), "rmpd/commands")
+require File.join(File.dirname(__FILE__), "rmpd/connection")
+require File.join(File.dirname(__FILE__), "rmpd/multi_response")
+require File.join(File.dirname(__FILE__), "rmpd/response")
+
+module Rmpd
+  ACK_RE = /^ACK \[(\d+)@(\d+)\] \{([^}]*)\} (.*)$/
+  OK_RE = /^OK.*$/
+
+  class MpdError < Exception ; end
+
+  class MpdConnRefusedError < MpdError ; end
+
+  class MpdAckError < MpdError
+    def initialize(regex_match)
+      @error, @command_list_num, @current_command, @message = regex_match.values_at(1..-1)
+    end
+
+    def to_s
+      "ACK [#{@error}@#{@command_list_num}] {#{@current_command}} #{@message}"
+    end
+  end
+
+end

data/lib/rmpd/commands.rb

@@ -0,0 +1,50 @@
+require File.join(File.dirname(__FILE__), "commands/generators")
+require File.join(File.dirname(__FILE__), "commands/admin")
+require File.join(File.dirname(__FILE__), "commands/database")
+require File.join(File.dirname(__FILE__), "commands/miscellaneous")
+require File.join(File.dirname(__FILE__), "commands/playback")
+require File.join(File.dirname(__FILE__), "commands/playlist")
+
+module Rmpd
+  module Commands
+
+    private
+
+    def read_responses(regexp=/(^file: )/i)
+      read_response(MultiResponse, regexp)
+    end
+
+    def receive_server_response
+      lines = []
+      while lines << @socket.readline do
+        puts "recv: #{lines.last.strip} (#{OK_RE === lines.last})" if $DEBUG
+        case lines.last
+        when ACK_RE, OK_RE: break
+        end
+      end
+      return lines.join
+    end
+
+    def send_command(command, *args)
+      tries = 0
+
+      if $DEBUG
+        a = command == "password" ? args.map{|x| "*" * 8} : args
+        Kernel.puts "send: #{command.strip} #{a.join(" ")}".strip
+      end
+
+      begin
+        connect
+        @socket.puts("#{command} #{args.join(" ")}".strip)
+      rescue Errno::EPIPE, EOFError
+        @socket.close
+        if (tries += 1) < 5
+          retry
+        else
+          raise MpdError.new("Retry count exceeded")
+        end
+      end
+    end
+
+  end
+end

data/lib/rmpd/commands/admin.rb

@@ -0,0 +1,21 @@
+module Rmpd
+  module Commands
+
+    complex_command :outputs, :regexp => /(^outputid: )/i
+    complex_command :tagtypes, :regexp => /(^tagtype: )/i, :min_version => [0, 13, 0]
+
+    simple_command :disableoutput
+    simple_command :enableoutput
+    simple_command :update
+
+    def kill
+      send_command("kill")
+      @socket.close
+    end
+
+    alias_method :disable_output, :disableoutput
+    alias_method :tag_types, :tagtypes
+    alias_method :enable_output, :enableoutput
+
+  end
+end

data/lib/rmpd/commands/database.rb

@@ -0,0 +1,17 @@
+module Rmpd
+  module Commands
+
+    complex_command :count, :regexp => /(^songs: )/i
+    complex_command :find, :regexp => /(^file: )/i
+    complex_command :list, :regexp => /(^[^:]+: )/i
+    complex_command :listall, :regexp => /(^[^:]+: )/i
+    complex_command :listallinfo, :regexp => /(^(directory|file): )/i
+    complex_command :lsinfo, :regexp => /(^(directory|file): )/i
+    complex_command :search, :regexp => /(^file: )/i
+
+    alias_method :list_all, :listall
+    alias_method :list_all_info, :listallinfo
+    alias_method :ls_info, :lsinfo
+
+  end
+end

data/lib/rmpd/commands/generators.rb

@@ -0,0 +1,34 @@
+module Rmpd
+  module Commands
+
+    private
+
+    def self.simple_command(name, args={})
+      block = lambda do |*a|
+        if args.include?(:min_version)
+          server_version_at_least(*args[:min_version])
+        end
+        send_command(name.to_s.gsub(/^_*/, ""), *quote(a))
+        read_response unless @in_command_list
+      end
+      send(:define_method, name, &block)
+    end
+
+    def self.complex_command(name, args={})
+      args = {:regexp => /(^file: )/i}.merge(args)
+      block = lambda do |*a|
+        if args.include?(:min_version)
+          server_version_at_least(*args[:min_version])
+        end
+        send_command(name.to_s.gsub(/^_*/, ""), *quote(a))
+        read_responses(args[:regexp]) unless @in_command_list
+      end
+      send(:define_method, name, &block)
+    end
+
+    def quote(args)
+      args.collect {|arg| "\"#{arg.to_s.gsub(/"/, "\\\"")}\""}
+    end
+  end
+
+end

data/lib/rmpd/commands/miscellaneous.rb

@@ -0,0 +1,33 @@
+module Rmpd
+  module Commands
+
+    complex_command :commands, :regexp => /(^command: )/i
+    simple_command :notcommands, :regexp => /(^command: )/i
+
+    simple_command :clearerror
+    simple_command :idle
+    simple_command :noidle
+    simple_command :password
+    simple_command :ping
+    simple_command :stats
+    simple_command :status
+
+    def close
+      send_command("close")
+      @socket.close
+    end
+
+    alias_method :clear_error, :clearerror
+    alias_method :not_commands, :notcommands
+
+    def command_list
+      send_command("command_list_begin")
+      @in_command_list = true
+      yield self
+      send_command("command_list_end")
+      read_response
+    ensure
+      @in_command_list = false
+    end
+  end
+end

data/lib/rmpd/commands/playback.rb

@@ -0,0 +1,30 @@
+module Rmpd
+  module Commands
+
+    simple_command :_volume
+    simple_command :crossfade
+    simple_command :next
+    simple_command :pause
+    simple_command :play
+    simple_command :playid
+    simple_command :previous
+    simple_command :random
+    simple_command :repeat
+    simple_command :seek
+    simple_command :seekid
+    simple_command :setvol
+    simple_command :stop
+
+    def volume(*args)
+      $stderr.puts "volume is deprecated, use setvol instead"
+      _volume(*args)
+    end
+
+    alias_method :cross_fade, :crossfade
+    alias_method :play_id, :playid
+    alias_method :prev, :previous
+    alias_method :seek_id, :seekid
+    alias_method :set_vol, :setvol
+
+  end
+end

data/lib/rmpd/commands/playlist.rb

@@ -0,0 +1,62 @@
+module Rmpd
+  module Commands
+
+    complex_command :listplaylist, :min_version => [0, 13, 0]
+    complex_command :listplaylistinfo, :min_version => [0, 12, 0]
+    complex_command :playlistfind, :min_version => [0, 13, 0]
+    complex_command :playlistid
+    complex_command :playlistinfo
+    complex_command :playlistsearch, :min_version => [0, 13, 0]
+    complex_command :plchanges
+    complex_command :plchangesposid, :regexp => /(^Id: )/i
+
+    simple_command :_playlist
+    simple_command :add # The docs on the wiki don't line up with empirical
+                        # results using 0.13.0
+    simple_command :clear
+    simple_command :currentsong
+    simple_command :delete
+    simple_command :deleteid
+    simple_command :load
+    simple_command :move
+    simple_command :moveid
+    simple_command :playlistadd, :min_version => [0, 13, 0]
+    simple_command :playlistclear, :min_version => [0, 13, 0]
+    simple_command :playlistdelete, :min_version => [0, 13, 0]
+    simple_command :playlistmove, :min_version => [0, 13, 0]
+    simple_command :rename
+    simple_command :rm
+    simple_command :save
+    simple_command :shuffle
+    simple_command :swap
+    simple_command :swapid
+
+
+    # must be a file only, cannot use with a director
+    def addid(path, pos=nil)
+      # pos is only for r7153+, but what version is that?
+      server_version_at_least(0, 14, 0) if pos
+      send_command("addid #{quote(path)} #{pos.to_s}")
+      read_response
+    end
+
+    alias_method :add_id, :addid
+    alias_method :current_song, :currentsong
+    alias_method :delete_id, :deleteid
+    alias_method :list_playlist, :listplaylist
+    alias_method :list_playlist_info, :listplaylistinfo
+    alias_method :move_id, :moveid
+    alias_method :pl_changes, :plchanges
+    alias_method :pl_changes_pos_id, :plchangesposid
+    alias_method :playlist_add, :playlistadd
+    alias_method :playlist_clear, :playlistclear
+    alias_method :playlist_delete, :playlistdelete
+    alias_method :playlist_find, :playlistfind
+    alias_method :playlist_id, :playlistid
+    alias_method :playlist_info, :playlistinfo
+    alias_method :playlist_move, :playlistmove
+    alias_method :playlist_search, :playlistsearch
+    alias_method :swap_id, :swapid
+
+  end
+end

data/lib/rmpd/config.rb

@@ -0,0 +1,77 @@
+require "pathname"
+require "yaml"
+
+module Rmpd
+
+  class Config
+
+    DEFAULT_HOSTNAME = "localhost"
+    DEFAULT_PORT = 6600
+    DEFAULT_PASSWORD = nil
+
+    attr_accessor :hostname, :password, :port
+    alias_method :host, :hostname
+
+    def initialize(config_file=nil)
+      case config_file
+      when String, Pathname
+        config = YAML::load_file(config_file)
+      when File
+        config = YAML::load(config_file)
+      else
+        config = {}
+      end
+      config = config[Rails.env] if defined?(Rails) && config[Rails.env]
+      puts "config: #{config.inspect}" if $DEBUG
+      init_host_and_password(config)
+      init_port(config)
+    end
+
+
+    private
+
+    HOSTNAME_RE = /(.*)@(.*)/
+
+
+    def init_host_and_password(config)
+      if config["hostname"]
+        @hostname = parse_hostname(config["hostname"])
+        @password = parse_password(config["hostname"])
+      elsif ENV["MPD_HOST"]
+        @hostname = parse_hostname(ENV["MPD_HOST"])
+        @password = parse_password(ENV["MPD_HOST"])
+      else
+        @hostname = DEFAULT_HOSTNAME
+        @password = DEFAULT_PASSWORD
+      end
+    end
+
+    def init_port(config)
+      if config["port"]
+        @port = config["port"].to_i
+      elsif ENV["MPD_PORT"]
+        @port = ENV["MPD_PORT"].to_i
+      else
+        @port = DEFAULT_PORT
+      end
+    end
+
+    def parse_hostname(hostname)
+      if HOSTNAME_RE === hostname
+        $~[2]
+      else
+        hostname
+      end
+    end
+
+    def parse_password(hostname)
+      if HOSTNAME_RE === hostname
+        $~[1]
+      else
+        nil
+      end
+    end
+
+  end
+
+end

data/lib/rmpd/connection.rb

@@ -0,0 +1,84 @@
+require "socket"
+
+
+module Rmpd
+  class Connection
+
+    include Rmpd::Commands
+    include Socket::Constants
+
+    attr_reader :error
+
+    def initialize(config_file=nil)
+      @config = Rmpd::Config.new(config_file)
+      @socket = nil
+    end
+
+    def server_version
+      "#{@server_version_major}.#{@server_version_minor}.#{@server_version_patch}"
+    end
+
+    attr_reader :socket
+
+    private
+
+    def authenticate
+      raise "Socket no good!" if (@socket.nil? || @socket.closed?)
+      send_command("password", @config.password)
+      read_response
+      true
+    end
+
+    def connect
+      return unless @socket.nil? || @socket.closed?
+      error = nil
+
+      Socket::getaddrinfo(@config.hostname, @config.port, nil, SOCK_STREAM).each do |info|
+        begin
+          puts "args: #{info.inspect}" if $DEBUG
+          sockaddr = Socket.pack_sockaddr_in(info[1], info[3])
+          @socket = Socket.new(info[4], info[5], 0)
+          @socket.connect(sockaddr)
+        rescue StandardError => error
+          $stderr.puts "Failed to connect to #{info[3]}: #{error}"
+          @socket = nil
+        else
+          break
+        end
+      end
+      raise MpdConnRefusedError.new(error) if @socket.nil?
+
+      parse_server_version(@socket.readline)
+      authenticate if @config.password
+    end
+
+    def parse_server_version(version)
+      /OK MPD (\d+)\.(\d+)\.(\d+)/.match(version.to_s)
+      @server_version_major = $~[1].to_i
+      @server_version_minor = $~[2].to_i
+      @server_version_patch = $~[3].to_i
+    end
+
+    def read_response(klass=Response, *args)
+      x = klass.new(receive_server_response, *args)
+      @error = x.error
+      x
+    end
+
+    def server_version_at_least(major, minor, patch)
+      connect
+      e = MpdError.new("Requires server version #{major}.#{minor}.#{patch}")
+
+      raise e if major > @server_version_major
+      return true if major < @server_version_major
+
+      raise e if minor > @server_version_minor
+      return true if minor < @server_version_minor
+
+      raise e if patch > @server_version_patch
+      return true if patch < @server_version_patch
+      true
+    end
+
+  end
+end

data/lib/rmpd/multi_response.rb

@@ -0,0 +1,43 @@
+require "delegate"
+
+module Rmpd
+
+  class MultiResponse < DelegateClass(Array)
+
+    END_OF_RECORD = "\0x1E" # from ASCII
+
+    def initialize(data, sep)
+      super([])
+      @sep = sep
+      parse(data)
+    end
+
+    def ok?
+      self.all? {|x| x.ok?}
+    end
+
+    def ack?
+      !ok?
+    end
+
+    def error
+      self.find(nil) {|x| x.error}
+    end
+
+
+    private
+
+    def parse(data)
+      data.gsub!(@sep, "#{END_OF_RECORD}\\1")
+      data.split(END_OF_RECORD).each do |datum|
+        if datum.empty?
+          next
+        else
+          r = Response.new(datum)
+        end
+        self << r unless r.keys.size.zero? && r.ok?
+      end
+    end
+  end
+
+end

data/lib/rmpd/response.rb

@@ -0,0 +1,47 @@
+require "delegate"
+
+module Rmpd
+
+  KEY_VALUE_RE = /^([^:]+):\s*(.*)$/
+  KNOWN_INT_FIELDS = [:time, :pos, :id, :track, :playlistlength, :playlist,
+    :xfade, :repeat, :random, :queued, :volume, :song]
+
+  class Response < DelegateClass(Hash)
+
+    attr_reader :error
+
+    def initialize(data)
+      super({})
+      @error = nil
+      parse(data)
+    end
+
+    def ok?
+      @error.nil?
+    end
+
+    def ack?
+      !ok?
+    end
+
+    private
+
+    def register_key_val_pair(r)
+      key, val = r[1].downcase.to_sym, r[2]
+      val = val.to_i if KNOWN_INT_FIELDS.include?(key)
+      self[key] = include?(key) ? ([self[key]] << val).flatten : val
+      self.class.send(:define_method, key) {self[key]}
+    end
+
+    def parse(data)
+      data.split("\n").each do |line|
+        case line
+        when KEY_VALUE_RE: register_key_val_pair($~)
+        when OK_RE: @error = nil
+        when ACK_RE: @error = MpdAckError.new($~.values_at(0..-1))
+        end
+      end
+    end
+
+  end
+end

data/lib/rmpd/version.rb

@@ -0,0 +1,3 @@
+module Rmpd
+  VERSION = "1.0.0"
+end

data/rmpd.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rmpd/version"
+
+Gem::Specification.new do |s|
+  s.name        = "rmpd"
+  s.version     = Rmpd::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Eric Wollesen"]
+  s.email       = ["ericw@xmtp.net"]
+  s.homepage    = ""
+  s.summary     = %q{Music Player Daemon client in Ruby}
+  s.description = %q{Music Player Daemon client in Ruby}
+
+  # s.rubyforge_project = "rmpd"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency("rspec", "~> 2.6.0")
+  s.add_development_dependency("ruby-debug")
+end

data/spec/fixtures/config.yml

@@ -0,0 +1,2 @@
+hostname: juggernaught@test.host
+port: 1234

data/spec/fixtures/config_no_hostname.yml

@@ -0,0 +1 @@
+port: 1234

data/spec/fixtures/config_no_password.yml

@@ -0,0 +1,2 @@
+hostname: test.host
+port: 1234

data/spec/fixtures/config_no_port.yml

@@ -0,0 +1 @@
+hostname: juggernaught@test.host

data/spec/fixtures/config_rails.yml

@@ -0,0 +1,3 @@
+development:
+  hostname: localhost
+  port: 3000

data/spec/models/commands_spec.rb

@@ -0,0 +1,135 @@
+require "spec_helper"
+
+include Rmpd
+
+
+shared_examples_for "a command with a song pos" do
+  it "should pass along the song pos" do
+    @socket.stub!(:readline).and_return(*@responses)
+    @socket.stub!(:puts).and_return(@socket.puts)
+    @socket.stub!(:eof?).and_return(false)
+    @command.call
+  end
+end
+
+describe Rmpd::Commands do
+
+  before(:each) do
+    @socket = mock_socket
+    @config = mock_config
+    @conn = Connection.new
+  end
+
+  def set_password(password="foobar")
+    @config.stub!(:password).and_return(password)
+  end
+
+  it "should handle a closed connection gracefully" do
+    @socket.stub!(:puts).and_raise(EOFError)
+    @socket.stub!(:readline).and_return(*(connect_response + ok))
+    @socket.should_receive(:close).exactly(5).times
+    lambda do
+      @conn.ping
+    end.should raise_error(Rmpd::MpdError, "Retry count exceeded")
+  end
+
+  it "should hide password output when in debug mode" do
+    set_password
+    @socket.stub!(:readline).and_return(*(connect_and_auth_responses + ok))
+    Kernel.should_receive(:puts).with("send: password #{"*"*8}")
+    Kernel.should_receive(:puts).with("send: ping")
+    $DEBUG = 1
+    @conn.ping
+    $DEBUG = nil
+  end
+
+  it "should abort after a limited number of tries against a closed connection" do
+    @socket.stub!(:puts).and_raise(EOFError)
+    @socket.stub!(:readline).and_return(*(connect_response + ok))
+    @socket.should_receive(:close).exactly(5).times
+    lambda do
+      @conn.ping
+    end.should raise_error(MpdError, "Retry count exceeded")
+  end
+
+  describe "close" do
+    it "should close the socket" do
+      @socket.should_receive(:puts).with("close")
+      @socket.stub!(:readline).and_return(*connect_response)
+      @socket.should_receive(:close).once
+      @conn.close
+    end
+  end
+
+  describe "volume" do
+    it "should be deprecated" do
+      set_password
+      @socket.stub!(:readline).and_return(*connect_and_auth_responses)
+      $stderr.should_receive(:puts).with(/deprecated/i)
+      @conn.volume(0)
+    end
+  end
+
+  describe "kill" do
+    before(:each) do
+      set_password
+    end
+
+    it "should kill the daemon" do
+      @socket.should_receive(:puts).with("kill")
+      @socket.stub!(:readline).and_return(*connect_and_auth_responses)
+      @socket.should_receive(:close)
+      @conn.kill
+    end
+  end
+
+  describe "playlistinfo" do
+    before(:each) do
+      set_password
+      @song_id = 1
+      @cmd = "playlistinfo \"#{@song_id}\""
+      @responses = connect_and_auth_responses + ["file: blah\n", "boobies: yay!\n"] + ok
+      @command = Proc.new {@conn.playlistinfo(@song_id)}
+    end
+
+    it_should_behave_like "a command with a song pos"
+  end
+
+  describe "play" do
+    before(:each) do
+      set_password
+      @song_id = 12
+      @cmd = "play \"#{@song_id}\""
+      @responses = connect_and_auth_responses + ok
+      @command = Proc.new {@conn.play(@song_id)}
+    end
+
+    it_should_behave_like "a command with a song pos"
+  end
+
+  describe "delete" do
+    before(:each) do
+      set_password
+      @song_id = 23
+      @cmd = "delete \"#{@song_id}\""
+      @responses = connect_and_auth_responses + ok
+      @command = Proc.new {@conn.delete(@song_id)}
+    end
+
+    it_should_behave_like "a command with a song pos"
+  end
+
+  describe "command_list" do
+    it "shouldn't wait for a response from the first command" do
+      @responses = connect_response + ok
+      @socket.stub!(:readline).and_return(*@responses)
+      @socket.stub!(:puts).and_return(@socket.puts)
+      @socket.stub!(:eof?).and_return(false)
+
+      @conn.command_list do |c|
+        c.status
+        c.stats
+      end
+    end
+  end
+end

data/spec/models/config_spec.rb

@@ -0,0 +1,128 @@
+require "spec_helper"
+
+include Rmpd
+
+
+describe Rmpd::Config do
+
+  before(:each) do
+    @filename = File.join(File.dirname(__FILE__), "../../spec/fixtures/config.yml")
+  end
+
+  describe "initialization" do
+    it "should parse successfully" do
+      lambda do
+        Rmpd::Config.new(@filename)
+      end.should_not raise_error
+    end
+  end
+
+  describe "rails" do
+    before(:each) do
+      class Rails
+        def self.env ; "development" ; end
+      end
+      @filename = File.join(File.dirname(__FILE__), "../../spec/fixtures/config_rails.yml")
+    end
+
+    it "should load the development environment" do
+      lambda do
+        Rmpd::Config.new(@filename)
+      end.should_not raise_error
+    end
+
+    it "should load the development environment" do
+      config = Rmpd::Config.new(@filename)
+      config.hostname.should == "localhost"
+      config.port.should == 3000
+    end
+  end
+
+  describe "operation" do
+    before(:each) do
+      @config = Rmpd::Config.new(@filename)
+    end
+
+    it "should have the correct port" do
+      1234.should == @config.port
+    end
+
+    it "should have the correct hostname" do
+      @config.hostname.should == "test.host"
+    end
+
+    it "should have the correct password" do
+      @config.password.should == "juggernaught"
+    end
+  end
+
+  describe "without password" do
+    before(:each) do
+      @filename = File.join(File.dirname(__FILE__), "../../spec/fixtures/config_no_password.yml")
+      @config = Rmpd::Config.new(@filename)
+    end
+
+    it "should have the default password" do
+      @config.password.should == Rmpd::Config::DEFAULT_PASSWORD
+    end
+  end
+
+  describe "without hostname" do
+    before(:each) do
+      @filename = File.join(File.dirname(__FILE__), "../../spec/fixtures/config_no_hostname.yml")
+      @config = Rmpd::Config.new(@filename)
+    end
+
+    it "should have the default hostname" do
+      @config.hostname.should == Rmpd::Config::DEFAULT_HOSTNAME
+    end
+  end
+
+  describe "without port" do
+    before(:each) do
+      @filename = File.join(File.dirname(__FILE__), "../../spec/fixtures/config_no_port.yml")
+      @config = Rmpd::Config.new(@filename)
+    end
+
+    it "should have the default port" do
+      @config.port.should == Rmpd::Config::DEFAULT_PORT
+    end
+  end
+
+  describe "by default" do
+    before(:each) do
+      @filename = nil
+      ENV["MPD_HOST"] = nil
+      ENV["MPD_PORT"] = nil
+      @config = Rmpd::Config.new(@filename)
+    end
+
+    it "should have the default hostname" do
+      @config.hostname.should == Rmpd::Config::DEFAULT_HOSTNAME
+    end
+
+    it "should have the default port" do
+      @config.port.should == Rmpd::Config::DEFAULT_PORT
+    end
+
+    it "should have the default password" do
+      @config.password.should == Rmpd::Config::DEFAULT_PASSWORD
+    end
+  end
+
+  describe "with environment variables set" do
+    before(:each) do
+      ENV["MPD_HOST"] = "testing:host"
+      ENV["MPD_PORT"] = -1.to_s
+      @config = Rmpd::Config.new
+    end
+
+    it "should pickup the environment's host" do
+      @config.hostname.should == ENV["MPD_HOST"]
+    end
+
+    it "should pickup the environment's port" do
+      @config.port.should == ENV["MPD_PORT"].to_i
+    end
+  end
+end

data/spec/models/connection_spec.rb

@@ -0,0 +1,61 @@
+require "spec_helper"
+
+include Rmpd
+
+
+describe Connection do
+
+  before(:each) do
+    @socket = mock_socket
+    @config = mock_config
+    @conn = Connection.new
+  end
+
+  def set_password(password="foobar")
+    @config.stub!(:password).and_return(password)
+  end
+
+  it "should connect successfully" do
+    responses = connect_response + ok
+    @socket.should_receive(:readline).and_return(*responses)
+    @conn.ping
+  end
+
+  it "should authenticate successfully" do
+    responses = connect_and_auth_responses + ok
+    set_password
+    @socket.should_receive(:readline).and_return(*responses)
+    @conn.ping
+  end
+
+  it "should generate a server version" do
+    version = "0.1.2"
+    responses = connect_response(version) + ok
+    @socket.should_receive(:readline).and_return(*responses)
+    @conn.ping # so we connect, and get the server version
+    @conn.server_version.should == version
+  end
+
+  it "should handle connection failures gracefully" do
+    @socket.stub!(:connect).and_raise(Errno::ECONNREFUSED.new("test"))
+    lambda do
+      @conn.ping
+    end.should raise_error(Rmpd::MpdError)
+  end
+
+  it "should restrict access based on server version" do
+    responses = connect_response("0.1.0")
+    @socket.stub!(:readline).and_return(*responses)
+    @conn.instance_eval do
+      def sval(*args)
+        server_version_at_least(*args)
+      end
+    end
+    lambda do
+      @conn.sval(0, 1, 2)
+    end.should raise_error(MpdError)
+    lambda do
+      @conn.sval(0, 1, 0)
+    end.should_not raise_error(MpdError)
+  end
+end

data/spec/models/generators_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+module Rmpd
+  describe Commands, "Generators" do
+
+    before(:each) do
+      @config = mock_config
+      @socket = mock_socket
+      @conn = Connection.new
+    end
+
+    describe "when version is ok" do
+
+      before(:each) do
+        version = "0.1.1"
+        responses = connect_response(version) + ok
+        @socket.should_receive(:readline).and_return(*responses)
+      end
+
+      describe "simple_command" do
+        it "should allow based on server version" do
+          Commands::simple_command(:test, :min_version => [0, 1, 1])
+          lambda do
+            @conn.test
+          end.should_not raise_error(MpdError)
+        end
+      end
+
+      describe "complex_command" do
+        it "should allow based on server version" do
+          Rmpd::Commands::complex_command(:test, :min_version => [0, 1, 1])
+          lambda do
+            @conn.test
+          end.should_not raise_error(MpdError)
+        end
+      end
+    end
+
+    describe "when version is NOT ok" do
+
+      before(:each) do
+        version = "0.1.1"
+        responses = connect_response(version)
+        @socket.should_receive(:readline).and_return(*responses)
+      end
+
+      describe "simple_command" do
+        it "should disallow based on server version" do
+          Rmpd::Commands::simple_command(:test, :min_version => [0, 1, 2])
+          lambda do
+            @conn.test
+          end.should raise_error(MpdError, /^Requires server version/)
+        end
+      end
+
+      describe "complex_command" do
+        it "should disallow based on server version" do
+          Rmpd::Commands::complex_command(:test, :min_version => [0, 1, 2])
+          lambda do
+            @conn.test
+          end.should raise_error(MpdError, /^Requires server version/)
+        end
+      end
+    end
+  end
+end

data/spec/models/mildred_mpd_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+include Rmpd
+
+describe MpdAckError do
+  before(:each) do
+    @err_msg = "ACK [2@0] {search} too few arguments for \"search\""
+    ACK_RE.match(@err_msg)
+    @error = MpdAckError.new($~)
+  end
+
+  it "should generate a useful string message" do
+    @error.to_s.should == @err_msg
+  end
+end

data/spec/models/multi_response_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+include Rmpd
+
+
+describe Rmpd::MultiResponse do
+  describe "on success" do
+    before(:each) do
+      data = <<-EOF
+foo: cat
+bar: dog
+foo: horse
+bar: giraffe
+OK
+EOF
+      @response = Rmpd::MultiResponse.new(data, /(^foo:)/)
+    end
+
+    it "should have a size of 2" do
+      @response.should have(2).items
+    end
+
+    it "should be OK" do
+      # @response.should be_ok
+      # doesn't work correctly, see rspec bug #11526
+      @response.ok?.should be_true
+    end
+
+    it "should not be ACK" do
+      # @response.should_not be_ack
+      # doesn't work correctly, see rspec bug #11526
+      @response.ack?.should be_false
+    end
+  end
+
+  describe "on error" do
+    before(:each) do
+      @err_msg = "ACK [2@0] {search} too few arguments for \"search\"\n"
+      @response = Rmpd::MultiResponse.new(@err_msg, /(^foo:)/)
+    end
+
+    it "should not be OK" do
+      # @response.should_not be_ok
+      # doesn't work correctly, see rspec bug #11526
+      @response.ok?.should be_false
+    end
+
+    it "should be ACK" do
+      # @response.should be_ack
+      # doesn't work correctly, see rspec bug #11526
+      @response.ack?.should be_true
+    end
+  end
+end

data/spec/models/response_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+include Rmpd
+
+
+describe Rmpd::Response do
+  before(:each) do
+    data = <<-EOF
+foo: bar
+OK
+EOF
+    @response = Rmpd::Response.new(data)
+  end
+
+  it "should have a foo method" do
+    @response.respond_to?(:foo).should be_true
+    @response.foo.should == "bar"
+  end
+
+  it "should have a foo key" do
+    @response.should include(:foo)
+    @response[:foo].should == "bar"
+  end
+
+  it "should be ok" do
+    # @response.should be_ok
+    # doesn't work correctly, see rspec bug #11526
+    @response.ok?.should == true
+  end
+
+  it "should not be ack" do
+    # @response.should_not be_ack
+    # doesn't work correctly, see rspec bug #11526
+    @response.ack?.should_not == true
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,6 @@
+--colour
+--format
+specdoc
+--loadby
+mtime
+--reverse

data/spec/spec_helper.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + "/../lib/rmpd"
+
+
+def mock_socket
+  socket = mock(Socket)
+  socket.stub!(:puts)
+  socket.stub!(:closed?).and_return(false)
+  socket.stub!(:connect)
+  socket.stub!(:eof?).and_return(false)
+  Socket.stub!(:pack_sockaddr_in).and_return("pack_sockaddr_in")
+  Socket.stub!(:new).and_return(socket)
+  socket
+end
+
+def mock_config(opts={})
+  opts = {
+    :hostname => Rmpd::Config::DEFAULT_HOSTNAME,
+    :port => Rmpd::Config::DEFAULT_PORT,
+    :password => Rmpd::Config::DEFAULT_PASSWORD,
+  }.merge(opts)
+  config = mock(Rmpd::Config)
+  config.stub!(:hostname).and_return(opts[:hostname])
+  config.stub!(:password).and_return(opts[:password])
+  config.stub!(:port).and_return(opts[:port])
+  Rmpd::Config.stub!(:new).and_return(config)
+  config
+end
+
+def connect_response(version="0.12.0")
+  ok("MPD #{version}")
+end
+
+def connect_and_auth_responses
+  connect_response + ok
+end
+
+def ok(txt="")
+  txt ? ["OK #{txt}\n"] : ["OK\n"]
+end
+
+def ack(x=1, y=2, cmd="foo_command", msg="No one's home dopey!")
+  ["ACK [#{x}@#{y}] {#{cmd}} #{msg}"]
+end

data/spec/spec_rcov.opts

@@ -0,0 +1,5 @@
+--format
+specdoc
+--loadby
+mtime
+--reverse

metadata

@@ -0,0 +1,129 @@
+--- !ruby/object:Gem::Specification 
+name: rmpd
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
+platform: ruby
+authors: 
+- Eric Wollesen
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-06-12 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Music Player Daemon client in Ruby
+email: 
+- ericw@xmtp.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- .gitignore
+- .rspec
+- Gemfile
+- Rakefile
+- lib/rmpd.rb
+- lib/rmpd/commands.rb
+- lib/rmpd/commands/admin.rb
+- lib/rmpd/commands/database.rb
+- lib/rmpd/commands/generators.rb
+- lib/rmpd/commands/miscellaneous.rb
+- lib/rmpd/commands/playback.rb
+- lib/rmpd/commands/playlist.rb
+- lib/rmpd/config.rb
+- lib/rmpd/connection.rb
+- lib/rmpd/multi_response.rb
+- lib/rmpd/response.rb
+- lib/rmpd/version.rb
+- rmpd.gemspec
+- spec/fixtures/config.yml
+- spec/fixtures/config_no_hostname.yml
+- spec/fixtures/config_no_password.yml
+- spec/fixtures/config_no_port.yml
+- spec/fixtures/config_rails.yml
+- spec/models/commands_spec.rb
+- spec/models/config_spec.rb
+- spec/models/connection_spec.rb
+- spec/models/generators_spec.rb
+- spec/models/mildred_mpd_spec.rb
+- spec/models/multi_response_spec.rb
+- spec/models/response_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/spec_rcov.opts
+has_rdoc: true
+homepage: ""
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Music Player Daemon client in Ruby
+test_files: []
+