allq 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef014bf42e3b2aae0712a29d16dbfe84250f37f
-  data.tar.gz: 47e014a2bee172ace5f140df9f1705a64f6a2a26
+  metadata.gz: 89cc071fa78a00b3bbda7e21cacfc4cbe20d992c
+  data.tar.gz: d0aecf251d0587c8e0d01f2bdf39099a82f3891b
 SHA512:
-  metadata.gz: '0496073b8f00999644900528ce4fbf3e8debb3bda574d4febde0a3b4c13ee6e6a5ada6ab91eafb4a63b4b9946299d206f286032663ce2d6921d107b245c78f28'
-  data.tar.gz: 17d369cd64192b6a0eab7bf8334e32bfc21637fbe09e6a849984a0cccbd6cab79a6618da78be0d5dd9ab1c2c951c08375a2d72dbeb7682bbbd2348cd0cc65aea
+  metadata.gz: 43cb8d3c2614a46e6e5167613381040487b55aeb6df5cc6e50d4fc705456a5b4c112c9d3c3f8f4bdec17c02c0e40f25edfba12e3a151b47c0667784b873b9f5b
+  data.tar.gz: 0ba32f6101c5a53402697c857d2b2783af11847272b8f9ac65a4a0ae592a71bf7e7472705b3fa509b785a0869f12ded5d049171b2702a734eb0aca9f37dc95b2

data/lib/allq/connection.rb

@@ -30,7 +30,6 @@ class AllQ
     #
     def initialize(address = '')
       @address = address || _host_from_env
-      @mutex = Mutex.new
       establish_connection
     rescue
       _raise_not_connected!
@@ -47,25 +46,29 @@ class AllQ
     #
     def transmit(command, options={}, &block)
       _with_retry(options[:retry_interval], options[:init]) do
-        @mutex.synchronize do
-          _raise_not_connected! unless @connection && !@connection.closed?
-          @connection.puts(command.to_s)
-          res = @connection.readline
-          yield block.call(res)
+        send_string = command.to_s
+        if send_string.include?("'")
+          puts "Single quotes not allow in JSON. This will probably error."
         end
+        res = call_socat(send_string)
+        _raise_not_connected if res.include?("Connection refused")
+        yield block.call(res)
       end
     end
 
+    def call_socat(data)
+      cmd_string = "echo '#{data}' | socat - tcp4-connect:#{address}"
+      output = `#{cmd_string}`
+      return output
+    end
+
     # Close connection with allq server.
     #
     # @example
     #  @conn.close
     #
     def close
-      if @connection
-        @connection.close
-        @connection = nil
-      end
+      # no_op
     end
 
     # Returns string representation of job.
@@ -74,7 +77,7 @@ class AllQ
     #  @conn.inspect
     #
     def to_s
-      "#<AllQ::Connection host=#{host.inspect} port=#{port.inspect}>"
+      "#<AllQ::Connection address=#{address}>"
     end
     alias :inspect :to_s
 
@@ -88,11 +91,6 @@ class AllQ
     #  establish_connection('localhost:3005')
     #
     def establish_connection
-      @address = address.first if address.is_a?(Array)
-      match = address.split(':')
-      @host, @port = match[0], Integer(match[1] || DEFAULT_PORT)
-
-      @connection = TCPSocket.new @host, @port
     end
 
     private
@@ -118,7 +116,6 @@ class AllQ
     # @param [Integer] tries The maximum number of attempts to reconnect
     def _reconnect(original_exception, retry_interval, tries=MAX_RETRIES)
       close
-      establish_connection
     rescue Errno::ECONNREFUSED
       tries -= 1
       if tries.zero?

data/lib/allq/job.rb

@@ -59,6 +59,10 @@ class AllQ
       }
     end
 
+    def reload_client
+      @client.reload!
+    end
+
     def self.new_from_hash(hash, client)
       begin
         id = hash.fetch('job_id')

data/lib/allq/version.rb

@@ -1,3 +1,3 @@
 module Allq
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allq
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jason
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler