rmpd 1.1.13 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb4988929e39ec902157e3f0cc7bbdd5f84620d7
-  data.tar.gz: df089ffe90ceb7121317eaa749466adba80628c6
+  metadata.gz: 0b9c7230c97e3cbfe65f19e3384b1de83457ac72
+  data.tar.gz: e33c538d3f9e14964fecd306f34d356245cefa21
 SHA512:
-  metadata.gz: 45b1d3ec4b78bcfc4499c54e33c3f6d827b7e6b2e87c1ef7bd1c36f4e45b2a6ce548b9ee6afd3c57ed79f41b69a95b7388b8f01f4772b3b6bfbc2a35ad392ee7
-  data.tar.gz: 9f246fef27256d620ab5e48142b8c835a41d55987e8bc5af6c1aa1095cf499a393a1f22dd04bca305a4f020f4ba080de727c6a05ff550668d8ef9a4c13053122
+  metadata.gz: 85c9e1503c810b455ba4b40df7f7e4bc970ba3d3f1b4f89d4a7d6487d1ddf0ec16b8fbdab235c88413ec9f09cb234cf6ecd414423a9f6f8548684e02c23c7f99
+  data.tar.gz: e6820320c75a8879894e64a7dd2809790f58b12099687acffa0078d7a29754ee8324d1d1f90a032d05485c502283bd17bbe5614ed2eaf0363ca15dff5d6329fb

data/lib/rmpd/commands.rb

@@ -10,20 +10,6 @@ module Rmpd
 
     private
 
-    def receive_response
-      lines = []
-
-      while lines << @socket.readline do
-        puts "recv: #{lines.last.strip}" if $DEBUG
-        case lines.last
-        when ACK_RE, OK_RE
-          break
-        end
-      end
-
-      lines
-    end
-
     def send_command(command, *args)
       if in_command_list?
         @command_list << [command, args]
@@ -35,7 +21,7 @@ module Rmpd
         when /^command_list.*begin$/
           @command_list = [command, args]
         else
-          send_command_now(command, *args)
+          connection.send_command(command, *args)
         end
       end
     end
@@ -44,40 +30,5 @@ module Rmpd
       !@command_list.nil?
     end
 
-    def send_command_now(command, *args)
-      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
-
-    def send_command_old(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
-
-      receive_response unless @in_command_list
-    end
-
   end
 end

data/lib/rmpd/commands/admin.rb

@@ -6,13 +6,15 @@ module Rmpd
     simple_command :disableoutput
     simple_command :enableoutput
     simple_command :update
-    simple_command :_kill
 
     def kill
-      _kill
+      send_command_without_reconnect("kill")
       @socket_mu.lock
-      @socket.close
-      @socket_mu.unlock
+      begin
+        @socket.close
+      ensure
+        @socket_mu.unlock
+      end
     end
 
     alias_method :disable_output, :disableoutput

data/lib/rmpd/commands/miscellaneous.rb

@@ -11,11 +11,10 @@ module Rmpd
     simple_command :ping
     simple_command :stats
     simple_command :status
-    simple_command :_close
 
     def close
-      _close
-      @socket.close
+      send_command_without_reconnect("close")
+      @socket.synchronize {@socket.close}
     end
 
     simple_command :command_list

data/lib/rmpd/connection.rb

@@ -76,22 +76,28 @@ module Rmpd
     def send_command(command, *args)
       tries = 0
 
-      connect
-      @socket_mu.lock
       begin
-        @socket.puts("#{command} #{quote(args).join(" ")}".strip)
+        connect
+        send_command_without_reconnect(command, *args)
       rescue Errno::EPIPE, EOFError
-        @socket.close
         if (tries += 1) < MAX_RETRIES
           retry
         else
           raise MpdError.new("Retry count exceeded")
         end
-      ensure
-        @socket_mu.unlock
       end
     end
 
+    def send_command_without_reconnect(command, *args)
+      @socket_mu.lock
+      @socket.puts("#{command} #{quote(args).join(" ")}".strip)
+    rescue => e
+      @socket.close
+      raise e
+    ensure
+      @socket_mu.unlock
+    end
+
     def read_response
       response = []
 

data/lib/rmpd/version.rb

@@ -1,3 +1,3 @@
 module Rmpd
-  VERSION = "1.1.13"
+  VERSION = "1.1.15"
 end

data/spec/models/commands_spec.rb

@@ -62,14 +62,12 @@ describe Rmpd::Commands do
   end
 
   describe "kill" do
-    before(:each) do
-      set_password
-    end
-
     it "should kill the daemon" do
+      set_password
       @socket.should_receive(:puts).with("kill")
       @socket.stub!(:readline).and_return(*connect_and_auth_responses)
       @socket.should_receive(:close)
+      @conn.connect
       @conn.kill
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmpd
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.15
 platform: ruby
 authors:
 - Eric Wollesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec