RingyDingy 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,9 @@
+= 1.2.0
+
+* Split RingyDingy::RingServer::list into ::list_services and
+  ::print_services for reuse.
+* Services without the default name no longer reregister multiple times
+
 = 1.1.0
 
 * Added ring_server executable (Rinda::RingServer wrapper)

data/lib/ringy_dingy.rb

@@ -21,7 +21,7 @@ $TESTING = defined? $TESTING
 
 class RingyDingy
 
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 
   ##
   # Interval to check the RingServer for our registration information.
@@ -78,7 +78,7 @@ class RingyDingy
   # RingServer can't be found or contacted, returns false.
 
   def registered?
-    registrations = ring_server.read_all [:name, :RingyDingy, nil, @identifier]
+    registrations = ring_server.read_all [:name, @service, nil, @identifier]
     registrations.any? { |registration| registration[2] == @object }
   rescue DRb::DRbConnError
     @ring_server = nil

data/lib/ringy_dingy/ring_server.rb

@@ -48,33 +48,47 @@ class RingyDingy::RingServer
 
   attr_reader :verbose
 
+  RF = Rinda::RingFinger.new
+
   ##
-  # Print all available services on all available Rinda::RingServers to
-  # stdout.
+  # Return a collection of all remote DRb services.
+  #
+  # Format:
+  #
+  #   { Rinda::RingServer.__drburi => [ registration_tuple, ... ],
+  #     ... }
 
-  def self.list
+  def self.list_services
     DRb.start_service unless DRb.primary_server
 
-    rf = Rinda::RingFinger.new
+    services = {}
 
-    services = Hash.new { |h,k| h[k] = {} }
-
-    rf.lookup_ring do |ts|
-      found_services = ts.read_all [:name, nil, DRbObject, nil]
-      found_services.each do |service|
-        # #hash and #eql? will not always work
-        ref = "#{service[2].__drburi}:#{service[2].__drbref}"
-        services[ts.__drburi][ref] = service
-      end
+    RF.lookup_ring do |ts|
+      services[ts.__drburi] = ts.read_all [:name, nil, DRbObject, nil]
     end
 
-    services.each do |ring_server, services|
-      puts "Services on #{ring_server}:"
-      services.values.each do |s|
-        puts "%p, %p\n\tURI: %s ref: %d" %
+    return services
+  end
+
+  ##
+  # Print all available services on all available Rinda::RingServers to
+  # stdout.
+
+  def self.print_services
+    out = []
+    list_services.each do |ring_server, services|
+      out << "Services on #{ring_server}"
+
+      values = services.sort_by { |s| [s[2].__drburi, -s[2].__drbref] }
+
+      values.each do |s|
+        out << "\t%p, %p\n\t\tURI: %s ref: %d" %
                [s[1], s[3], s[2].__drburi, s[2].__drbref]
+        out << nil
       end
     end
+
+    puts out.join("\n")
   end
 
   ##
@@ -84,9 +98,7 @@ class RingyDingy::RingServer
   def self.set_verbose(boolean)
     DRb.start_service unless DRb.primary_server
 
-    rf = Rinda::RingFinger.new
-
-    rf.lookup_ring do |ts|
+    RF.lookup_ring do |ts|
       ts.write [:RingyDingy, :verbose, boolean]
     end
   end
@@ -150,7 +162,7 @@ class RingyDingy::RingServer
     options = process_args args
 
     if options.include? :List then
-      list
+      print_services
       exit
     elsif options.include? :SetVerbose then
       set_verbose options[:SetVerbose]

data/test/test_ring_server.rb

@@ -9,19 +9,119 @@ require 'ringy_dingy/ring_server'
 
 DRb.start_service
 
+class FakeTupleSpace
+
+  attr_writer :read_all
+  attr_accessor :__drburi
+
+  def read_all(template)
+    @read_all
+  end
+
+end
+
 class RingyDingy::RingServer
+
   attr_accessor :expirations, :registrations, :ts
   attr_reader :verbose
+
+  remove_const :RF
+
+  RF = Object.new
+
+  def RF.lookup_ring
+    ts1 = FakeTupleSpace.new
+    ts1.__drburi = 'druby://localhost:10000'
+    ts1.read_all = TestRingServer::SERVICES[ts1.__drburi]
+    yield ts1
+
+    ts2 = FakeTupleSpace.new
+    ts2.__drburi = 'druby://localhost:10002'
+    ts2.read_all = TestRingServer::SERVICES[ts2.__drburi]
+    yield ts2 # IPv4
+    yield ts2 # IPv6
+  end
+
 end
 
 class TestRingServer < Test::Unit::TestCase
 
+  OBJS = [Object.new, Object.new, Object.new]
+
+  OBJS.each_with_index { |obj, i| const_set "OBJ#{i}", obj }
+
+  SERVICES = {
+    'druby://localhost:10000' => [
+      [:name, :RingyDingy, DRbObject.new(OBJ0, 'druby://localhost:10001'),
+       'localhost_9607_obj0'],
+      [:name, :RingyDingy, DRbObject.new(OBJ1, 'druby://localhost:10001'),
+       'localhost_9607_obj1'],
+    ],
+    'druby://localhost:10002' => [
+      [:name, :RingyDingy, DRbObject.new(OBJ2, 'druby://localhost:10003'),
+       'localhost_9607_obj2'],
+    ],
+  }
+
   def setup
     util_capture do
       @rs = RingyDingy::RingServer.new :Verbose => true
     end
   end
 
+  def test_self_list_services
+    assert_equal SERVICES, RingyDingy::RingServer.list_services
+  end
+
+  def test_self_print_services
+    rf = Object.new
+
+    def rf.lookup_ring
+      fts = FakeTupleSpace.new
+      fts.__drburi = 'druby://localhost:10000'
+      fts.read_all = [
+        [:name, :RingyDingy, DRbObject.new(OBJ0, 'druby://localhost:10001'),
+         'localhost_9607_obj0'],
+        [:name, :RingyDingy, DRbObject.new(OBJ1, 'druby://localhost:10001'),
+         'localhost_9607_obj1'],
+      ]
+      yield fts
+      fts = FakeTupleSpace.new
+      fts.__drburi = 'druby://localhost:10002'
+      fts.read_all = [
+        [:name, :RingyDingy, DRbObject.new(OBJ2, 'druby://localhost:10003'),
+         'localhost_9607_obj2'],
+      ]
+      yield fts
+    end
+
+    RingyDingy::RingServer.send :remove_const, :RF
+    RingyDingy::RingServer.send :const_set, :RF, rf
+
+    out, err = util_capture do
+      RingyDingy::RingServer.print_services
+    end
+
+    expected = <<-EOF
+Services on druby://localhost:10000
+\t:RingyDingy, "localhost_9607_obj0"
+\t\tURI: druby://localhost:10001 ref: #{OBJ0.object_id}
+
+\t:RingyDingy, "localhost_9607_obj1"
+\t\tURI: druby://localhost:10001 ref: #{OBJ1.object_id}
+
+Services on druby://localhost:10002
+\t:RingyDingy, "localhost_9607_obj2"
+\t\tURI: druby://localhost:10003 ref: #{OBJ2.object_id}
+    EOF
+
+    assert_equal expected, out.string
+    assert_equal '', err.string
+  ensure
+    RingyDingy::RingServer.send :remove_const, :RF
+    RingyDingy::RingServer.send :const_set, :RF, Rinda::RingFinger
+  end
+
   def test_initialize_verbose_daemon
     rs = RingyDingy::RingServer.new :Verbose => true, :Daemon => true
     assert_equal false, rs.verbose

data/test/test_ringy_dingy.rb

@@ -31,8 +31,8 @@ class StubRingServer
     @tuples << args
   end
 
-  def read_all(*args)
-    @tuples.map { |t,r| t }
+  def read_all(template)
+    @tuples.map { |t,r| t }.select { |t| t[1] == template[1] }
   end
 
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.99
+rubygems_version: 0.9.0
 specification_version: 1
 name: RingyDingy
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-10-21 00:00:00 -06:00
+  version: 1.2.0
+date: 2006-11-04 00:00:00 -08:00
 summary: RingyDingy is a little boat that keeps your DRb service afloat!
 require_paths: 
 - lib