rmpd 1.0.1 → 1.0.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use ruby-1.8.7-p330@global > /dev/null

data/lib/rmpd/commands/generators.rb

@@ -21,11 +21,24 @@ module Rmpd
           server_version_at_least(*args[:min_version])
         end
         send_command(name.to_s.gsub(/^_*/, ""), *quote(a))
-        read_responses(args[:regexp]) unless @in_command_list
+        if @in_command_list
+          append_command_list_regexp(args[:regexp])
+        else
+          read_responses(args[:regexp])
+        end
       end
       send(:define_method, name, &block)
     end
 
+    def append_command_list_regexp(regexp)
+      if @in_command_list_response_regexp
+        @in_command_list_response_regexp = \
+          Regexp.union(@in_command_list_response_regexp, regexp)
+      else
+        @in_command_list_response_regexp = regexp
+      end
+    end
+
     def quote(args)
       args.collect {|arg| "\"#{arg.to_s.gsub(/"/, "\\\"")}\""}
     end

data/lib/rmpd/commands/miscellaneous.rb

@@ -25,9 +25,14 @@ module Rmpd
       @in_command_list = true
       yield self
       send_command("command_list_end")
-      read_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
   end
 end

data/lib/rmpd/commands/playlist.rb

@@ -32,12 +32,17 @@ module Rmpd
     simple_command :swapid
 
 
-    # must be a file only, cannot use with a director
+    # must be a file only, cannot use with a directory
     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
+      send_command("addid #{quote(path)} #{pos ? pos.to_s : nil}")
+      @add_id_response_regex ||= /(^Id: )/i
+      if @in_command_list
+        append_command_list_regexp(@add_id_response_regex)
+      else
+        read_responses(@add_id_response_regex)
+      end
     end
 
     alias_method :add_id, :addid

data/lib/rmpd/multi_response.rb

@@ -13,7 +13,7 @@ module Rmpd
     end
 
     def ok?
-      self.all? {|x| x.ok?}
+      self.all?(&:ok?)
     end
 
     def ack?
@@ -21,7 +21,7 @@ module Rmpd
     end
 
     def error
-      self.find(nil) {|x| x.error}
+      self.map(&:error).compact.first
     end
 
 

data/lib/rmpd/version.rb

@@ -1,3 +1,3 @@
 module Rmpd
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/rmpd.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Eric Wollesen"]
   s.email       = ["ericw@xmtp.net"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/ewollesen/rmpd"
   s.summary     = %q{Music Player Daemon client in Ruby}
   s.description = %q{Music Player Daemon client in Ruby}
 

data/spec/models/commands_spec.rb

@@ -131,5 +131,16 @@ describe Rmpd::Commands do
         c.stats
       end
     end
+
+    it "should handle multi responses" do
+      @responses = connect_and_auth_responses + playlist_id_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.addid("foo")
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -34,6 +34,11 @@ def connect_and_auth_responses
   connect_response + ok
 end
 
+def playlist_id_response
+  @id ||= 0
+  ["Id: #{@id += 1}"]
+end
+
 def ok(txt="")
   txt ? ["OK #{txt}\n"] : ["OK\n"]
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmpd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Eric Wollesen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -06:00
+date: 2011-07-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - Rakefile
 - lib/rmpd.rb
@@ -92,7 +93,7 @@ files:
 - spec/spec_helper.rb
 - spec/spec_rcov.opts
 has_rdoc: true
-homepage: ""
+homepage: http://github.com/ewollesen/rmpd
 licenses: []
 
 post_install_message: