ruby-mpd-client 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848583ce10594fdc63bf86b171c48c4f46ca8fa6
-  data.tar.gz: 2d55bec022cdf89c6bade050070bf5913ab1105d
+  metadata.gz: 9b876a3e06965ebe7e8f061cc8430dd2f7ee1dbb
+  data.tar.gz: 8c8bc0f8cff555d558cbe02d350fa0b2c3f643b3
 SHA512:
-  metadata.gz: ef433c38433b97d823de38aa187d07e88dad973584597d854d1abff2a45a27fa475b4071cbe2fd73681f7004937cbe38abac8623fe753e047397b5c9992cf60e
-  data.tar.gz: 26ae0891ec7de8fa3e534c1b87fc2b6bcdb2d67f3f5b86cba9b97cc16749438cabf4df81bc4fd23cef2bd563a2501bf1dc027dd4dfd4f336cf4c970281da8d43
+  metadata.gz: 915464ea5f307fa7f4c7ad16530cdf3f41065953868f63d0f8ffb915433ad5f9ae65254743b4e5a89fb01d4d390b0d53f93c7f86551e46d7f8e1fc87866cdd14
+  data.tar.gz: 8860d06293f29478b684ce8a4465ae13d3e51e8950f43a049a1c07fbb3aadfe3ecedd08721f872981cbb3115acd7fa174eba317fd2534558c750fbdfbfa573ac

data/lib/mpd/client.rb

@@ -4,7 +4,9 @@ require 'mpd/client/commands'
 
 module MPD
   class Client
-    attr_reader :connection
+    def self.connect(host: 'localhost', port: 6600)
+      new(host: host, port: port).tap(&:connect)
+    end
 
     def initialize(host: 'localhost', port: 6600)
       @connection = Connection.new(host: host, port: port)
@@ -20,19 +22,26 @@ module MPD
     end
 
     def execute(command)
-      ensure_connection_established
       connection.puts(command)
       response = ServerResponse.from_connection(connection)
       raise(MpdError, response.status) if response.error?
       response
     end
 
-    private
+    def connected?
+      execute('ping')
+    rescue => e
+      raise e if e.is_a?(MpdError)
+      false
+    end
 
-    def ensure_connection_established
-      return if connection.connected?
+    def connect
       connection.connect
-      connection.gets
+      raise(ConnectionError) unless connection.gets =~ /^OK/
     end
+
+    private
+
+    attr_reader :connection
   end
 end

data/lib/mpd/client/connection.rb

@@ -16,21 +16,15 @@ module MPD
       end
 
       def puts(text)
-        raise ConnectionError unless connected?
+        raise ConnectionError unless socket
         socket.puts(text)
       end
 
       def gets
-        raise ConnectionError unless connected?
+        raise ConnectionError unless socket
         socket.gets
       end
 
-      def connected?
-        socket && !socket.closed?
-      rescue
-        false
-      end
-
       private
 
       attr_reader :socket, :host, :port

data/lib/mpd/version.rb

@@ -1,3 +1,3 @@
 module MPD
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitriy Non
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler