rmpd 1.1.9 → 1.1.11

data/lib/rmpd.rb

@@ -1,9 +1,10 @@
 require File.join(File.dirname(__FILE__), "rmpd/config")
 require File.join(File.dirname(__FILE__), "rmpd/command")
 require File.join(File.dirname(__FILE__), "rmpd/commands")
-require File.join(File.dirname(__FILE__), "rmpd/io")
 require File.join(File.dirname(__FILE__), "rmpd/connection")
 require File.join(File.dirname(__FILE__), "rmpd/response")
+require File.join(File.dirname(__FILE__), "rmpd/nil_hash")
+
 
 module Rmpd
   ACK_RE = /^ACK \[(\d+)@(\d+)\] \{([^}]*)\} (.*)$/

data/lib/rmpd/command.rb

@@ -23,6 +23,10 @@ module Rmpd
         CommandListOkStrategy
       elsif /command_list/ === name
         CommandListStrategy
+      elsif /^noidle$/ === name
+        NoidleStrategy
+      elsif /^idle$/ === name
+        IdleStrategy
       else
         CommandStrategy
       end
@@ -34,12 +38,45 @@ module Rmpd
       list
     end
 
+    module IdleStrategy
+
+      def execute(connection, *args, &block)
+        connection.send_command(@name, *args)
+        if block_given?
+          yield connection.socket rescue nil
+          connection.send_command("noidle")
+        end
+        Response.factory(@name).parse(connection.read_response)
+      rescue EOFError
+        puts "IdleStrategy EOFError received, retrying" if $DEBUG
+        connection.close
+        retry
+      end
+
+    end
+
+    module NoidleStrategy
+
+      def execute(connection, *args)
+        connection.send_command(@name, *args)
+        # The MPD server will never respond to a noidle command.
+        # http://www.mail-archive.com/musicpd-dev-team@lists.sourceforge.net/msg02246.html
+        nil
+      rescue EOFError
+        puts "NoidleStrategy EOFError received, retrying" if $DEBUG
+        connection.close
+        retry
+      end
+
+    end
+
     module CommandStrategy
 
       def execute(connection, *args)
         connection.send_command(@name, *args)
         Response.factory(@name).parse(connection.read_response)
       rescue EOFError
+        puts "CommandStrategy EOFError received, retrying" if $DEBUG
         connection.close
         retry
       end
@@ -58,6 +95,10 @@ module Rmpd
         end
         connection.send_command("command_list_end")
         Response.factory(@name).parse(connection.read_response)
+      rescue EOFError
+        puts "CommandListStrategy EOFError received, retrying" if $DEBUG
+        connection.close
+        retry
       end
 
     end
@@ -74,6 +115,10 @@ module Rmpd
         end
         connection.send_command("command_list_end")
         handle_command_list_ok_response(connection.read_response)
+      rescue EOFError
+        puts "CommandListOkStrategy EOFError received, retrying" if $DEBUG
+        connection.close
+        retry
       end
 
 

data/lib/rmpd/commands/database.rb

@@ -3,6 +3,7 @@ module Rmpd
 
     simple_command :count
     simple_command :find
+    simple_command :findadd
     simple_command :list
     simple_command :listall
     simple_command :listallinfo

data/lib/rmpd/commands/miscellaneous.rb

@@ -1,11 +1,12 @@
 module Rmpd
   module Commands
 
+    simple_command :config
     simple_command :commands
     simple_command :notcommands
     simple_command :clearerror
-    simple_command :_idle
-    simple_command :_noidle
+    simple_command :idle
+    simple_command :noidle
     simple_command :password
     simple_command :ping
     simple_command :stats
@@ -20,20 +21,7 @@ module Rmpd
     simple_command :command_list
     simple_command :command_list_ok
 
-    def idle(*subsystems)
-      @in_idle = true
-      _idle(mpd, *subsystems)
-    ensure
-      @in_idle = false
-    end
-
-    def noidle
-      return unless @in_idle
-      _noidle
-    end
-
     alias_method :clear_error, :clearerror
     alias_method :not_commands, :notcommands
-
   end
 end

data/lib/rmpd/connection.rb

@@ -5,7 +5,6 @@ module Rmpd
   class Connection
     include Socket::Constants
     include Rmpd::Commands
-    include Rmpd::IO
 
 
     MAX_RETRIES = 5
@@ -26,6 +25,24 @@ module Rmpd
     def connect
       return unless @socket.nil? || @socket.closed?
 
+      if %r{^/} === @config.hostname
+        connect_unix_socket
+      else
+        connect_inet_socket
+      end
+
+      read_response # protocol version, ignore for now
+      password(@config.password) if @config.password
+    end
+
+    def connect_unix_socket
+      @socket = UNIXSocket.new(@config.hostname)
+    rescue StandardError => error
+      @socket = nil
+      raise MpdConnRefusedError.new(error)
+    end
+
+    def connect_inet_socket
       Socket::getaddrinfo(@config.hostname, @config.port, nil, SOCK_STREAM).each do |info|
         begin
           sockaddr = Socket.pack_sockaddr_in(info[1], info[3])
@@ -38,9 +55,6 @@ module Rmpd
           break
         end
       end
-
-      read_response # protocol version, ignore for now
-      password(@config.password) if @config.password
     end
 
     def send_command(command, *args)

data/lib/rmpd/nil_hash.rb

@@ -0,0 +1,11 @@
+class NilHash < Hash
+
+  def method_missing(name, *args, &block)
+    super
+  rescue NoMethodError
+    if 0 == args.size
+      self[name]
+    end
+  end
+
+end

data/lib/rmpd/response.rb

@@ -40,6 +40,8 @@ module Rmpd
                                "list",
                                "outputs",
                                "playlistinfo",
+                               "plchanges",
+                               "plchangesposid",
                                "search",
                                "tagtypes",
                               ]
@@ -142,7 +144,7 @@ module Rmpd
 
     def parse(lines)
       @first_key = nil
-      @temp = {}
+      @temp = NilHash.new
 
       super(lines)
       self << @temp unless @temp.empty?
@@ -155,12 +157,12 @@ module Rmpd
 
       if @first_key == key
         self << @temp
-        @temp = {key => val}
+        @temp = NilHash.new({key => val})
       else
         @first_key ||= key
         @temp[key] = val
-        define_getter(key, @temp)
       end
+      define_getter(key, @temp) unless respond_to?(key)
     end
 
   end
@@ -168,7 +170,7 @@ module Rmpd
   class SingleResponse < Response
 
     def initialize
-      super({})
+      super(NilHash.new)
     end
 
     def register_key_val_pair(match_data)

data/lib/rmpd/version.rb

@@ -1,3 +1,3 @@
 module Rmpd
-  VERSION = "1.1.9"
+  VERSION = "1.1.11"
 end

data/rmpd.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency("rspec", "~> 2.6.0")
-  s.add_development_dependency("ruby-debug")
+  s.add_development_dependency("debugger")
   s.add_development_dependency("rake")
   s.add_development_dependency("pry")
 end

data/spec/models/commands_spec.rb

@@ -17,6 +17,7 @@ describe Rmpd::Commands do
   before(:each) do
     @socket = mock_socket
     @config = mock_config
+    Socket.stub!(:new).and_return(@socket)
     @conn = Connection.new
   end
 
@@ -44,9 +45,9 @@ describe Rmpd::Commands do
 
   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.ping
       @conn.close
     end
   end
@@ -134,6 +135,27 @@ describe Rmpd::Commands do
     end
   end
 
+  describe "noidle" do
+
+    it "returns nil" do
+      @responses = connect_response
+      @socket.stub!(:readline).and_return(*@responses)
+
+      @conn.noidle.should be_nil
+    end
+
+    it "consumes no response, since none is tendered" do
+      @responses = connect_response + status_response + ok
+      @socket.stub!(:readline).and_return(*@responses)
+
+      response = @conn.status
+
+      response.should have(2).items, response.pretty_inspect
+      response.should include("volume")
+      response.should include("state")
+    end
+  end
+
   describe "command_list_ok" do
     it "should return a list of multi responses" do
       @responses = connect_response + command_list_ok_responses + ok

data/spec/spec_helper.rb

@@ -50,3 +50,7 @@ end
 def command_list_ok_responses
   ["Album: Foo\n", "list_OK\n", "Artist: Bar\n", "list_OK\n"]
 end
+
+def status_response
+  ["volume: -1\n", "state: play\n",]
+end

metadata

@@ -1,90 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rmpd
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 1.1.11
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 9
-  version: 1.1.9
 platform: ruby
-authors: 
+authors:
 - Eric Wollesen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Music Player Daemon client in Ruby
-email: 
+email:
 - ericw@xmtp.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -102,7 +99,7 @@ files:
 - lib/rmpd/commands/playlist.rb
 - lib/rmpd/config.rb
 - lib/rmpd/connection.rb
-- lib/rmpd/io.rb
+- lib/rmpd/nil_hash.rb
 - lib/rmpd/response.rb
 - lib/rmpd/response_splitter.rb
 - lib/rmpd/version.rb
@@ -123,36 +120,32 @@ files:
 - spec/spec_rcov.opts
 homepage: http://github.com/ewollesen/rmpd
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2970925028450146323
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2970925028450146323
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Music Player Daemon client in Ruby
 test_files: []
-

data/lib/rmpd/io.rb

@@ -1,18 +0,0 @@
-module Rmpd
-  module IO
-
-    def to_io
-      send_command("idle") unless @in_idle
-      @in_idle = true
-      @socket
-    end
-
-    def check_select
-      return unless @in_idle
-      Response.factory("idle").parse(read_response)
-    ensure
-      @in_idle = false
-    end
-
-  end
-end