pcp-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 404c05c867f92b146e2f9d046fe2d8741bf38402
-  data.tar.gz: 6dcb82793a413080b7230d34228d6aab9ae70845
+  metadata.gz: 4bbadd16844a443623b6d9d1389b580960b17592
+  data.tar.gz: cfe1c97388dbab0db4496b316f57961cc6e30d9d
 SHA512:
-  metadata.gz: d06217562d449a04f11c904d2cb0179a6bdbabe1458a48bc494f20fc38e7f29246bcfdb4d2173b99f1a1592d4a586d16b50cd638db7334523060f405110e646d
-  data.tar.gz: 7b4d892e27a3271e312b326a660d64a406127963b1f52356158ff17ca0f3e821f17dd22ef74351f4576354c86c8b059745b5150419d450c7b1175da004edd2b9
+  metadata.gz: d006505e2bfdee5de658da1a1dff1215d3a483ce4e7326815f8229b39f9acf61597686ad7c4a83e1e0d46e712aa8420742387743792df3212ef760bbeb25947d
+  data.tar.gz: ef1ab13ddaeffda48954bc65c8d7b1d28c62037667dad6d40708eb79c37c69544767cd41198778cf690bd35b547d759665020897f82774aa7c85c31af5a30f04

data/lib/pcp/client.rb

@@ -1,4 +1,4 @@
-require 'eventmachine-le'
+require 'eventmachine'
 require 'faye/websocket'
 require 'pcp/message'
 require 'logger'
@@ -42,17 +42,6 @@ module PCP
     # @param seconds [Numeric]
     # @return [true,false,nil]
     def connect(seconds = 0)
-      unless EM.reactor_running?
-        raise "An Eventmachine reactor needs to be running"
-      end
-
-      if EM.reactor_thread?
-        # Because we use a condition variable to signal this thread
-        # from the reactor thread to provide an imperative interface,
-        # they cannot be the same thread
-        raise "Cannot be run on the same thread as the reactor"
-      end
-
       if @connection
         # We close over so much, we really just need to say no for now
         raise "Can only connect once per client"
@@ -64,7 +53,7 @@ module PCP
       @logger.debug { [:connect, @server] }
       @connection = Faye::WebSocket::Client.new(@server, nil, {:tls => {:private_key_file => @ssl_key,
                                                                         :cert_chain_file => @ssl_cert,
-                                                                        :ssl_version => :TLSv1}})
+                                                                        :ssl_version => ["TLSv1", "TLSv1_1", "TLSv1_2"]}})
 
       @connection.on :open do |event|
         begin
@@ -110,6 +99,22 @@ module PCP
         @associated = false
       end
 
+      if !EM.reactor_running?
+        @logger.debug { [:no_eventmachine_reactor,
+                         "Eventmachine reactor is not running" ] }
+        return nil
+      end
+
+      if EM.reactor_thread?
+        # Because we use a condition variable to signal this thread
+        # from the reactor thread to provide an imperative interface,
+        # they cannot be the same thread.  We might associate later,
+        # we just can't wait on ourselves from here.
+        @logger.debug { [:connection_cannot_wait,
+                        "Cannot wait on a connection if we are in the same thread as the reactor" ] }
+        return nil
+      end
+
       begin
         Timeout::timeout(seconds) do
           mutex.synchronize do
@@ -141,6 +146,14 @@ module PCP
       @connection.send(message.encode)
     end
 
+    # Disconnect the client
+    # @api public
+    # @return unused
+    def close
+      @logger.debug { [:close] }
+      @connection.close
+    end
+
     private
 
     # Get the common name from an X509 certficate in file

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pcp-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine-le
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement