officer 0.7.0 → 0.7.1

data/README.markdown

@@ -25,8 +25,8 @@ Run Officer in the background (production mode) and listen on a specific IP and
     sudo officer start -- -h 127.0.0.1 -p 9999
 
 - The server listens on 0.0.0.0:11500 by default.
-- All debugging and error output goes to stdout for now.  The daemons gem is configured to log stdout.
-- The daemons gem will create a PID file in /var/run and log files in /var/log when using the 'start' option for background mode.
+- All debugging and error output goes to stdout for now.
+- The daemons gem will create a pid file in /var/run and redirect stdout to /var/log/officer.output when using the 'start' option for background mode.
 
 ## Ruby Client
 
@@ -95,10 +95,14 @@ Options:
 
 - Returns the internal state of all the server's connections.
 
+
+### Show the locks currently being held for this connection.
+
+    client.my_locks
+
+
 ## Planned Features
 
-- Retrieve the list of locks for the current connection.
-- Client: Option to abort a lock request if there is already a certain number of clients waiting for the lock.
 - Server: configure the daemons gem to allow multiple server processes to run on one box.
 - Tests
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/officer/client.rb

@@ -28,12 +28,14 @@ module Officer
     end
 
     def lock name, options={}
-      execute :command => 'lock', :name => name_with_ns(name),
+      result = execute :command => 'lock', :name => name_with_ns(name),
         :timeout => options[:timeout], :queue_max => options[:queue_max]
+      strip_ns_from_hash result, 'name'
     end
 
     def unlock name
-      execute :command => 'unlock', :name => name_with_ns(name)
+      result = execute :command => 'unlock', :name => name_with_ns(name)
+      strip_ns_from_hash result, 'name'
     end
 
     def with_lock name, options={}
@@ -67,6 +69,12 @@ module Officer
       execute :command => 'connections'
     end
 
+    def my_locks
+      result = execute :command => 'my_locks'
+      result['value'] = result['value'].map {|name| strip_ns(name)}
+      result
+    end
+
   private
     def connect
       raise AlreadyConnectedError if @socket
@@ -93,6 +101,15 @@ module Officer
     def name_with_ns name
       @namespace ? "#{@namespace}:#{name}" : name
     end
+
+    def strip_ns name
+      @namespace ? name.gsub(Regexp.new("^#{@namespace}:"), '') : name
+    end
+
+    def strip_ns_from_hash hash, key
+      hash[key] = strip_ns(hash[key])
+      hash
+    end
   end
 
 end

data/lib/officer/commands.rb

@@ -126,5 +126,14 @@ module Officer
         Officer::LockStore.instance.connections @connection
       end
     end
+
+    class MyLocks < Base
+      register
+
+      def execute
+        Officer::LockStore.instance.my_locks @connection
+      end
+    end
+
   end
 end

data/lib/officer/connection.rb

@@ -81,6 +81,10 @@ module Officer
       def queue_maxed name
         send_result 'queue_maxed', :name => name
       end
+
+      def my_locks names
+        send_result 'my_locks', :value => names
+      end
     end
 
     class Connection < EventMachine::Protocols::LineAndTextProtocol

data/lib/officer/lock_store.rb

@@ -140,11 +140,16 @@ module Officer
       connections = {}
 
       @connections.each do |conn, names|
-        connections[conn.to_host_s] = names
+        connections[conn.to_host_s] = names.to_a
       end
 
       connection.connections connections
     end
+
+    def my_locks connection
+      my_locks = @connections[connection] ? @connections[connection].to_a : []
+      connection.locks my_locks
+    end
   end
 
 end

data/officer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{officer}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Remesch"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: officer
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Chad Remesch