gearman_admin_client 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85a42f59821a35635895328155ce084e2919774
-  data.tar.gz: 4b7f6df73a5a470499a15587c154c2f77a88330a
+  metadata.gz: 74da28ff05fbcdf32efcce54d642209f8ac58b74
+  data.tar.gz: 2156744bcbcf9ef0b2699ca2cf6bc1c29f55e99a
 SHA512:
-  metadata.gz: 62060e5e5af46ae99751b8feb490a58730a6ccd944f9357caf81df72c37ddaabe8d74c99ee115d6d39eb0673fc1cd47c73b488653c097b8188b4e355d8102fb0
-  data.tar.gz: 21653ef53e5e3b1820ed7a34029d8f89065d846922551cbf45865acc88cd55224331b322472cdc872ded8441dfc8a92dc2797b945edf10e86133c0c7ae2175b9
+  metadata.gz: 8ff4567818c90bbb8fdcf1dcd08480f233be00384523ed04c1959c18a38f8a89ac2f12ca9c71db6b473ae717ffd06067beb35f0cd009a3acb389de250ab60fbe
+  data.tar.gz: ee0f826c914e6b5f2cf5396da2c934421456b66a8e45f642ad18617e41c34331d11b579bc770fd197c3e807573ad09048f12cd801b595a51e576ee15a54cdaa6

data/lib/gearman_admin_client/connection.rb

@@ -1,24 +1,30 @@
+require 'celluloid/io'
 require 'forwardable'
 
 class GearmanAdminClient
   class Connection
+    include Celluloid::IO
     extend Forwardable
 
     def_delegators :io, :close, :closed?, :eof?
 
+    finalizer :disconnect
+
     attr_reader :io
 
-    def initialize(io)
-      @io = io
+    def initialize(address)
+      @address = address
     end
 
     def write(command)
-      IO::select([], [io])
+      connect if disconnected?
+
       io.puts(command)
     end
 
     def read
-      IO::select([io])
+      connect if disconnected?
+
       io.gets
     end
 
@@ -33,5 +39,22 @@ class GearmanAdminClient
       output
     end
 
+    def connect
+      host, port = @address.split(':')
+
+      @io = TCPSocket.new(host, port)
+    end
+
+    def disconnect
+      if @io
+        @io.close unless @io.closed?
+        @io = nil
+      end
+    end
+
+    def disconnected?
+      @io.nil?
+    end
+
   end
 end

data/lib/gearman_admin_client/version.rb

@@ -1,3 +1,3 @@
 class GearmanAdminClient
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/gearman_admin_client.rb

@@ -1,130 +1,119 @@
-require 'socket'
+require 'celluloid'
 
 require 'gearman_admin_client/worker'
 require 'gearman_admin_client/registered_function'
 require 'gearman_admin_client/connection'
 
 class GearmanAdminClient
+  include Celluloid
 
-  DISCONNECTED = :DISCONNECTED unless defined? DISCONNECTED
+  trap_exit :disconnect
+  finalizer :disconnect
 
-  class BadAddress < RuntimeError ; end
-
-  attr_reader :address
+  attr_reader :address, :connection
 
   def initialize(address)
     @address = address
-    @connection = DISCONNECTED
+    @connect = Connection.method(:new_link)
+    build_connection
   end
 
   def workers
-    connect! do |connection|
-      connection.write('workers')
-      output = connection.drain.split("\n")
-
-      workers = output.map do |line|
-        if line.end_with?(':')
-          function_names = []
-          remainder = line
-        else
-          segments = line.split(':')
-
-          function_names = segments.pop.strip.split(' ')
-
-          remainder = segments.join(':')
-        end
-
-        fd, ip_address, client_id = remainder.split(' ').map(&:strip)
-
-        Worker.new(
-          :file_descriptor => fd,
-          :ip_address => ip_address,
-          :client_id => client_id,
-          :function_names => function_names
-        )
+    connection.write('workers')
+    output = connection.drain.split("\n")
+
+    workers = output.map do |line|
+      if line.end_with?(':')
+        function_names = []
+        remainder = line
+      else
+        segments = line.split(':')
+
+        function_names = segments.pop.strip.split(' ')
+
+        remainder = segments.join(':')
       end
+
+      fd, ip_address, client_id = remainder.split(' ').map(&:strip)
+
+      Worker.new(
+        :file_descriptor => fd,
+        :ip_address => ip_address,
+        :client_id => client_id,
+        :function_names => function_names
+      )
     end
   end
 
   def status
-    connect! do |connection|
-      connection.write('status')
-      output = connection.drain.split("\n")
-
-      output.map do |line|
-        function_name, total, running, workers = line.split("\t")
-
-        RegisteredFunction.new(
-          :name => function_name,
-          :jobs_in_queue => total,
-          :running_jobs => running,
-          :available_workers => workers
-        )
-      end
+    connection.write('status')
+    output = connection.drain.split("\n")
+
+    output.map do |line|
+      function_name, total, running, workers = line.split("\t")
+
+      RegisteredFunction.new(
+        :name => function_name,
+        :jobs_in_queue => total,
+        :running_jobs => running,
+        :available_workers => workers
+      )
     end
   end
 
   def server_version
-    connect! do |connection|
-      connection.write('version')
-      connection.read.strip
-    end
+    connection.write('version')
+    connection.read.strip
   end
 
   def shutdown(options = {})
-    connect! do |connection|
-      command = ['shutdown']
+    command = ['shutdown']
 
-      if options.fetch(:graceful, false)
-        command << 'graceful'
-      end
+    if options.fetch(:graceful, false)
+      command << 'graceful'
+    end
 
-      connection.write(command.join(' '))
-      connection.read.strip
+    connection.write(command.join(' '))
+    connection.read.strip
 
-      connection.eof? && disconnect!
-    end
+    connection.eof? && disconnect
 
     true
   end
 
   def max_queue_size(function_name, queue_size = nil)
-    connect! do |connection|
-      command = ['maxqueue', function_name, queue_size].compact
+    command = ['maxqueue', function_name, queue_size].compact
 
-      connection.write(command.join(' '))
-      connection.read.strip
-    end
+    connection.write(command.join(' '))
+    connection.read.strip
   end
 
-  def disconnected?
-    DISCONNECTED == @connection
-  end
+  def disconnect(actor = nil, reason = nil)
+    if @connection && @connection.alive?
+      @connection.terminate
+    end
 
-  def disconnect!
-    @connection.close
-    @connection = DISCONNECTED
+    if reason
+      build_connection
+    end
   end
 
-  private
-
-  def connect!(&and_then)
-    if disconnected?
-      just_open_a_socket do |socket|
-        @connection = Connection.new(socket)
-      end
+  def disconnected?
+    if @connection
+      not @connection.alive?
     end
+  end
 
-    and_then.call(@connection)
+  def build_connection
+    @connection = @connect.call(@address)
   end
 
-  def just_open_a_socket
-    host, port = address.split(':')
+  def connect(&and_then)
+    disconnect
+    build_connection
 
-    if host && port
-      yield TCPSocket.new(host, port)
-    else
-      raise BadAddress, "expected address to look like HOST:PORT"
+    if and_then
+      and_then.call(@connection)
     end
   end
 

data/spec/gearman_admin_client_spec.rb

@@ -163,7 +163,7 @@ describe GearmanAdminClient do
 
     expect(client).to_not be_disconnected
 
-    client.disconnect!
+    client.disconnect
 
     expect(client).to be_disconnected
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gearman_admin_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Cobb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0.beta0
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby wrapper around the Gearman admin protocol
 email:
 - bcobb@uwalumni.com