rmpd 1.0.4 → 1.0.5

data/lib/rmpd.rb

@@ -7,6 +7,7 @@ require File.join(File.dirname(__FILE__), "rmpd/response")
 module Rmpd
   ACK_RE = /^ACK \[(\d+)@(\d+)\] \{([^}]*)\} (.*)$/
   OK_RE = /^OK.*$/
+  LIST_OK_RE = /^list_OK.*$/
 
   class MpdError < StandardError ; end
 

data/lib/rmpd/commands.rb

@@ -15,11 +15,14 @@ module Rmpd
     end
 
     def receive_server_response
+      @last_response = nil
       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
+        when ACK_RE, OK_RE, LIST_OK_RE
+          @last_response = lines.last
+          break
         end
       end
       return lines.join

data/lib/rmpd/commands/miscellaneous.rb

@@ -25,14 +25,46 @@ module Rmpd
       @in_command_list = true
       yield self
       send_command("command_list_end")
+      handle_command_list_response
+    ensure
+      @in_command_list = false
+      @in_command_list_response_regexp = nil
+    end
+
+    def command_list_ok
+      send_command("command_list_ok_begin")
+      @in_command_list = true
+      yield self
+      send_command("command_list_end")
+      read_command_list_ok_responses do |responses|
+        handle_command_list_response.tap do |res|
+          responses << res unless res.empty?
+        end
+      end
+    ensure
+      @in_command_list = false
+      @in_command_list_response_regexp = nil
+    end
+
+
+    private
+
+    def handle_command_list_response
       if @in_command_list_response_regexp
         read_responses(@in_command_list_response_regexp)
       else
         read_response
       end
-    ensure
-      @in_command_list = false
-      @in_command_list_response_regexp = nil
+    end
+
+    def read_command_list_ok_responses
+      responses = []
+
+      begin
+        yield responses
+      end while LIST_OK_RE === @last_response
+
+      responses
     end
   end
 end

data/lib/rmpd/config.rb

@@ -16,7 +16,7 @@ module Rmpd
       case config_file
       when String, Pathname
         config = YAML::load_file(config_file)
-      when File
+      when File, StringIO
         config = YAML::load(config_file)
       else
         config = {}

data/lib/rmpd/response.rb

@@ -4,7 +4,7 @@ module Rmpd
 
   KEY_VALUE_RE = /^([^:]+):\s*(.*)$/
   KNOWN_INT_FIELDS = [:pos, :id, :track, :playlistlength, :playlist,
-    :xfade, :repeat, :random, :queued, :volume, :song]
+    :xfade, :repeat, :random, :queued, :volume, :song, :songid]
   KNOWN_COMPLEX_FIELDS = [:time,]
 
   class Response < DelegateClass(Hash)
@@ -39,7 +39,7 @@ module Rmpd
       data.split("\n").each do |line|
         case line
         when KEY_VALUE_RE; register_key_val_pair($~)
-        when OK_RE; @error = nil
+        when LIST_OK_RE, OK_RE; @error = nil
         when ACK_RE; @error = MpdAckError.new($~.values_at(0..-1))
         end
       end

data/lib/rmpd/version.rb

@@ -1,3 +1,3 @@
 module Rmpd
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/models/commands_spec.rb

@@ -143,4 +143,20 @@ describe Rmpd::Commands do
       end
     end
   end
+
+  describe "command_list_ok" do
+    it "should return a list of multi responses" do
+      @responses = connect_response + command_list_ok_responses + ok
+      @socket.stub!(:readline).and_return(*@responses)
+      @socket.stub!(:puts).and_return(@socket.puts)
+      @socket.stub!(:eof?).and_return(false)
+
+      results = @conn.command_list_ok do |c|
+        c.list("album")
+        c.list("artist")
+      end
+
+      results.should have(2).items, results.pretty_inspect
+    end
+  end
 end

data/spec/models/multi_response_spec.rb

@@ -17,7 +17,7 @@ EOF
     end
 
     it "should have a size of 2" do
-      @response.should have(2).items
+      @response.should have(2).items, @response.inspect
     end
 
     it "should be OK" do

data/spec/spec_helper.rb

@@ -46,3 +46,7 @@ end
 def ack(x=1, y=2, cmd="foo_command", msg="No one's home dopey!")
   ["ACK [#{x}@#{y}] {#{cmd}} #{msg}"]
 end
+
+def command_list_ok_responses
+  ["Album: Foo\n", "list_OK\n", "Artist: Bar\n", "list_OK\n"]
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmpd
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Eric Wollesen
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -06:00
-default_executable: 
+date: 2012-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +31,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id001
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +45,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,7 +59,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  requirement: *id003
+  prerelease: false
 description: Music Player Daemon client in Ruby
 email: 
 - ericw@xmtp.net
@@ -106,7 +105,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_rcov.opts
-has_rdoc: true
 homepage: http://github.com/ewollesen/rmpd
 licenses: []
 
@@ -136,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Music Player Daemon client in Ruby