archipelago 0.1.0 → 0.1.1

data/TODO

@@ -1,3 +1,13 @@
 
- * Create a new HashishProvider with built in redundancy, for example
-   using the Chord project: http://pdos.csail.mit.edu/chord/
+ * Create a new HashishProvider with built in redundancy, 
+   for example using the Chord project: http://pdos.csail.mit.edu/chord/
+
+ * Make Chest aware about whether transactions have affected it 'for real' ie 
+   check whether the instance before the call differs from the instance after 
+   the call. Preferably without incurring performance lossage.
+
+ * Test the transaction recovery mechanism of Chest.
+
+ * Make Archipelago::Treasure::Dubloons work after an Archipelago::Treasure::Chest
+   has rebooted. For example: demand that the chest always run the same host+port
+   or make Dubloons able to lookup their home Chest by service_id.

data/lib/{disco.rb → archipelago/disco.rb}

@@ -19,7 +19,7 @@ require 'socket'
 require 'thread'
 require 'ipaddr'
 require 'pp'
-require 'current'
+require 'archipelago/current'
 require 'drb'
 require 'set'
 
@@ -83,6 +83,30 @@ module Archipelago
     #
     module Publishable
 
+      #
+      # Also add the ClassMethods to +base+.
+      #
+      def self.append_features(base)
+        super
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        #
+        # Just load whatever we have in +s+.
+        #
+        def _load(s)
+          DRbObject._load(s)
+        end
+      end
+
+      #
+      # Dump a DRbObject refering to us.
+      #
+      def _dump(dummy_param)
+        DRbObject.new(self)._dump(dummy_param)
+      end
+
       #
       # Will initialize this instance with @service_description and @jockey_options
       # and merge these with the optionally given <i>:service_description</i> and
@@ -91,8 +115,8 @@ module Archipelago
       def initialize_publishable(options = {})
         @service_description = {
           :service_id => service_id,
-          :validator => DRbObject.new(self),
-          :service => DRbObject.new(self),
+          :validator => self,
+          :service => self,
           :class => self.class.name
         }.merge(options[:service_description] || {})
         @jockey_options = options[:jockey_options] || {}
@@ -106,7 +130,7 @@ module Archipelago
       # <i>:service_description</i>.
       #
       def publish!(options = {})
-        @jockey ||= Archipelago::Disco::Jockey.new(@jockey_options.merge(options[:jockey_options] || {}))
+        @jockey ||= defined?(Archipelago::Disco::MC) ? Archipelago::Disco::MC : Archipelago::Disco::Jockey.new(@jockey_options.merge(options[:jockey_options] || {}))
         @jockey.publish(Archipelago::Disco::Record.new(@service_description.merge(options[:service_description] || {})))
       end
 
@@ -203,7 +227,7 @@ module Archipelago
       # Initialize this Record with a hash that must contain an <i>:service_id</i> and a <i>:validator</i>.
       #
       def initialize(hash)
-        raise "Record must have an :service_id" unless hash.include?(:service_id)
+        raise "Record must have a :service_id" unless hash.include?(:service_id)
         raise "Record must have a :validator" unless hash.include?(:validator)
         super(hash)
       end
@@ -278,8 +302,6 @@ module Archipelago
     #
     class Jockey
       
-      attr_reader :new_service_semaphore
-      
       #
       # Will create a Jockey service running on <i>:address</i> and <i>:port</i> or
       # ADDRESS and PORT if none are given.
@@ -366,7 +388,7 @@ module Archipelago
       #
       # Stops all the threads in this instance.
       #
-      def stop
+      def stop!
         @listener_thread.kill
         @unilistener_thread.kill
         @shouter_thread.kill
@@ -412,6 +434,7 @@ module Archipelago
       #
       def publish(service)
         if service.valid?
+          service[:published_at] = Time.now
           @local_services[service[:service_id]] = service
           @new_service_semaphore.broadcast
           unless @thrifty_publishing
@@ -543,6 +566,8 @@ module Archipelago
 
     end
 
+    MC = Jockey.new(defined?(MC_OPTIONS) ? MC_OPTIONS : {}) unless defined?(MC_DISABLED) && MC_DISABLED
+
   end
 
 end 

data/lib/{hashish.rb → archipelago/hashish.rb}

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'current'
+require 'archipelago/current'
 require 'bdb'
 
 module Archipelago

data/lib/{pirate.rb → archipelago/pirate.rb}

@@ -15,9 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'disco'
-require 'tranny'
-require 'treasure'
+require 'archipelago/disco'
+require 'archipelago/tranny'
+require 'archipelago/treasure'
 require 'pp'
 require 'drb'
 require 'digest/sha1'
@@ -65,7 +65,7 @@ module Archipelago
     # Archipelago::Treasure:Dubloons in them.
     #
     class Captain
-      attr_reader :chests, :treasure_map, :trannies, :transaction
+      attr_reader :chests, :treasure_map, :trannies
       #
       # Initialize an instance using an Archipelago::Disco::Jockey with <i>:jockey_options</i> 
       # if given, that looks for new services <i>:initial_service_update_interval</i> or INITIAL_SERVICE_UPDATE_INTERVAL,
@@ -74,13 +74,20 @@ module Archipelago
       # Will look for Archipelago::Treasure::Chests matching <i>:chest_description</i> or CHEST_DESCRIPTION and 
       # Archipelago::Tranny::Managers matching <i>:tranny_description</i> or TRANNY_DESCRIPTION.
       #
+      # Will send off all <i>:chest_eval_files</i> to any chest found for possible evaluation to ensure existence
+      # of required classes and modules at the chest.
+      #
       def initialize(options = {})
-        @treasure_map = Archipelago::Disco::Jockey.new(options[:jockey_options] || {})
+        @treasure_map = defined?(Archipelago::Disco::MC) ? Archipelago::Disco::MC : Archipelago::Disco::Jockey.new(options[:jockey_options] || {})
 
         @chest_description = CHEST_DESCRIPTION.merge(options[:chest_description] || {})
         @tranny_description = TRANNY_DESCRIPTION.merge(options[:tranny_description] || {})
         @jockey_options = options[:jockey_options] || {}
 
+        @chest_eval_files = options[:chest_eval_files] || []
+
+        @chests_having_evaluated = {}
+
         start_service_updater(options[:initial_service_update_interval] || INITIAL_SERVICE_UPDATE_INTERVAL,
                               options[:maximum_service_update_interval] || MAXIMUM_SERVICE_UPDATE_INTERVAL)
 
@@ -135,6 +142,38 @@ module Archipelago
         return rval
       end
 
+      #
+      # Execute +block+ within a transaction.
+      #
+      # Will commit! transaction after the block is finished unless
+      # the transaction is aborted or commited already.
+      #
+      # Will abort! the transaction if any exception is raised.
+      #
+      def transaction(&block) #:yields: transaction
+        raise NoTransactionManagerAvailableException.new(self) if @trannies.empty?
+
+        @transaction = @trannies.values.first[:service].begin
+        begin
+          yield(@transaction)
+          @transaction.commit! if @transaction.state == :active
+        rescue Exception => e
+          @transaction.abort! unless @transaction.state == :aborted
+          puts e
+          pp e.backtrace
+        ensure
+          @transaction = nil
+        end
+      end
+
+      #
+      # Evaluate this file in all known chests.
+      #
+      def evaluate!(filename)
+        @chest_eval_files << filename
+        evaluate_in_chests
+      end
+
       #
       # Commit the transaction we are a member of and forget about it.
       #
@@ -159,6 +198,13 @@ module Archipelago
         'yar!'
       end
 
+      #
+      # Stops the service update thread for this Pirate.
+      #
+      def stop!
+        @service_update_thread.kill
+      end
+
       private
 
       #
@@ -175,14 +221,60 @@ module Archipelago
         return @chests[sorted_chest_ids.first]
       end
 
+      #
+      # Make sure all our known chests have evaluated
+      # all files we need them to.
+      #
+      def evaluate_in_chests
+        #
+        # For all chests
+        #
+        @chests.values.each do |chest|
+          #
+          # Ensure that this chest has a Set of evaluated files
+          #
+          @chests_having_evaluated[
+                                   [
+                                    chest[:service_id], 
+                                    chest[:published_at]
+                                   ]
+                                  ] ||= Set.new
+          @chest_eval_files.each do |filename|
+            unless @chests_having_evaluated[
+                                            [
+                                             chest[:service_id], 
+                                             chest[:published_at]
+                                            ]
+                                           ].include?(filename)
+              begin
+                chest[:service].evaluate!(filename, 
+                                          File.ctime(filename), 
+                                          open(filename).read)
+              rescue Exception => e
+                puts e
+                pp e.backtrace
+              ensure
+                @chests_having_evaluated[
+                                         [
+                                          chest[:service_id], 
+                                          chest[:published_at]
+                                         ]
+                                        ] << filename
+              end
+            end
+          end
+        end
+      end
+
       #
       # Start a thread looking up existing chests between every
       # +initial+ and +maximum+ seconds.
       #
       def start_service_updater(initial, maximum)
         @chests = @treasure_map.lookup(Archipelago::Disco::Query.new(@chest_description), 0)
+        evaluate_in_chests
         @trannies = @treasure_map.lookup(Archipelago::Disco::Query.new(@tranny_description), 0)
-        Thread.start do
+        @service_update_thread = Thread.start do
           standoff = initial
           loop do
             begin
@@ -190,6 +282,7 @@ module Archipelago
               standoff *= 2
               standoff = maximum if standoff > maximum
               @chests = @treasure_map.lookup(Archipelago::Disco::Query.new(@chest_description), 0)
+              evaluate_in_chests
               @trannies = @treasure_map.lookup(Archipelago::Disco::Query.new(@tranny_description), 0)
             rescue Exception => e
               puts e

data/lib/{tranny.rb → archipelago/tranny.rb}

@@ -18,9 +18,10 @@
 require 'bdb'
 require 'pathname'
 require 'drb'
-require 'current'
+require 'archipelago/current'
 require 'digest/sha1'
-require 'disco'
+require 'archipelago/disco'
+require 'archipelago/hashish'
 
 module Archipelago
 
@@ -91,7 +92,6 @@ module Archipelago
     #
     class Manager
 
-      include DRb::DRbUndumped
       include Archipelago::Disco::Publishable
 
       attr_accessor :error_logger
@@ -113,7 +113,6 @@ module Archipelago
 
         @transaction_timeout = options[:transaction_timeout] || TRANSACTION_TIMEOUT
 
-        @metadata = @persistence_provider.get_hashish("metadata")
         @db = @persistence_provider.get_cached_hashish("db")
       end
       
@@ -185,6 +184,7 @@ module Archipelago
       attr_accessor :transaction_id
       def initialize(transaction)
         @manager = transaction.manager
+        @manager_id = transaction.manager.service_id
         @transaction_id = transaction.transaction_id
         @state = :unknown
       end
@@ -222,7 +222,21 @@ module Archipelago
       # returnvalue if necessary.
       #
       def method_missing(meth, *args) #:nodoc:
-        rval = @manager.call_instance_method(@transaction_id, meth, *args)
+        rval = nil
+        begin
+          rval = @manager.call_instance_method(@transaction_id, meth, *args)
+        rescue DRb::DRbConnError => e
+          if defined?(Archipelago::Disco::MC)
+            possible_replacements = Archipelago::Disco::MC.lookup(Archipelago::Disco::Query.new({:service_id => @manager_id}))
+            raise e if possible_replacements.empty?
+            
+            @manager = possible_replacements[@manager_id][:service]
+            
+            retry
+          else
+            raise e
+          end
+        end
         case meth
         when :abort!
           @state = :aborted
@@ -346,7 +360,7 @@ module Archipelago
         #
         # We have a manager!
         #
-        @manager = DRbObject.new(manager)
+        @manager = manager
         #
         # We have a proxy to send forth into the world!
         #

data/lib/{treasure.rb → archipelago/treasure.rb}

@@ -16,14 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require 'drb'
-require 'disco'
 require 'bdb'
 require 'pathname'
 require 'digest/sha1'
 require 'pp'
 require 'set'
-require 'hashish'
-require 'tranny'
+require 'archipelago/hashish'
+require 'archipelago/tranny'
+require 'archipelago/disco'
 
 module Archipelago
 
@@ -35,6 +35,12 @@ module Archipelago
     #
     TRANSACTION_RECOVERY_INTERVAL = 30
 
+    #
+    # The known chests by service id to speed up
+    # recovery by Dubloons having lost their Chest.
+    #
+    CHESTS_BY_SERVICE_ID = {}
+
     #
     # Raised whenever the optimistic locking of the serializable transaction isolation level
     # was proved wrong.
@@ -104,6 +110,36 @@ module Archipelago
         @public_methods = public_methods
       end
       #
+      # A more or less normal dump of all our instance variables.
+      #
+      def _dump(dummy_levels)
+        Marshal.dump([
+                      @key, 
+                      @chest, 
+                      @transaction, 
+                      @chest_id, 
+                      @public_methods
+                     ])
+      end
+      #
+      # Load some instance variables and replace @chest if we know that
+      # it actually is not correct.
+      #
+      def self._load(s)
+        key, chest, transaction, chest_id, public_methods = Marshal.load(s)
+        instance = self.allocate
+        instance.instance_variable_set(:@key, key)
+        instance.instance_variable_set(:@transaction, transaction)
+        instance.instance_variable_set(:@chest_id, chest_id)
+        instance.instance_variable_set(:@public_methods, public_methods)
+        if CHEST_BY_SERVICE_ID.include?(chest_id)
+          instance.instance_variable_set(:@chest, CHEST_BY_SERVICE_ID[chest_id])
+        else
+          instance.instance_variable_set(:@chest, chest)
+        end
+        return instance
+      end
+      #
       # The public_methods of our target.
       #
       def public_methods
@@ -144,7 +180,21 @@ module Archipelago
       #
       def method_missing(meth, *args, &block)
         if respond_to?(meth)
-          return @chest.call_instance_method(@key, meth, @transaction, *args, &block)
+          begin
+            return @chest.call_instance_method(@key, meth, @transaction, *args, &block)
+          rescue DRb::DRbConnError => e
+            if defined?(Archipelago::Disco::MC)
+              possible_replacements = Archipelago::Disco::MC.lookup(Archipelago::Disco::Query.new({:service_id => @chest_id}))
+              raise e if possible_replacements.empty?
+
+              @chest = possible_replacements[@chest_id][:service]
+              CHESTS_BY_SERVICE_ID[@chest_id] = @chest
+              
+              retry
+            else
+              raise e
+            end
+          end
         else
           return super(meth, *args)
         end
@@ -158,15 +208,8 @@ module Archipelago
     #
     # Has support for optimistically locked distributed serializable transactions.
     #
-    # TODO: Test the transaction recovery mechanism.
-    #
     class Chest
 
-      #
-      # The Chest never leaves its host.
-      #
-      include DRb::DRbUndumped
-
       #
       # The Chest can be published.
       #
@@ -215,6 +258,8 @@ module Archipelago
         #
         @crashed = Set.new
 
+        initialize_seen_data
+
         #
         # The magical persistent map that defines how we actually 
         # store our data.
@@ -223,6 +268,7 @@ module Archipelago
 
         initialize_prepared(options[:transaction_recovery_interval] || TRANSACTION_RECOVERY_INTERVAL)
 
+        CHESTS_BY_SERVICE_ID[self.service_id] = self
       end
 
       #
@@ -232,6 +278,32 @@ module Archipelago
         @snapshot_by_transaction.keys.clone
       end
 
+      #
+      # Evaluate +data+ if we have not already seen +label+ or if we have an earlier +timestamp+ than the one given.
+      #
+      def evaluate!(label, timestamp, data)
+        serialized_label = Marshal.dump(label)
+        go = false
+
+        if @seen_data.include?(serialized_label)
+          last_timestamp, last_data = Marshal.load(@seen_data[serialized_label])
+          go = true if timestamp > last_timestamp
+        else
+          go = true
+        end
+
+        if go
+          begin
+            Object.class_eval(data)
+            @seen_data[serialized_label] = Marshal.dump([timestamp, data])
+          rescue Exception => e
+            @seen_data[serialized_label] = Marshal.load([timestamp, nil])
+            puts e
+            pp e.backtrace
+          end
+        end
+      end
+
       #
       # Return the contents of this chest using a given +key+ and +transaction+.
       #
@@ -244,7 +316,7 @@ module Archipelago
         if Dubloon === instance
           return instance.join(transaction)
         else
-          return Dubloon.new(key, DRbObject.new(self), transaction, self.service_id, instance.public_methods)
+          return Dubloon.new(key, self, transaction, self.service_id, instance.public_methods)
         end
       end
       
@@ -365,11 +437,6 @@ module Archipelago
       # this transaction to block until it is either aborted
       # or commited!
       #
-      # TODO: Make us aware about whether transactions have affected us
-      # 'for real' ie check whether the instance before the call
-      # differs from the instance after the call. Preferably
-      # without incurring performance lossage.
-      #
       def prepare!(transaction)
         assert_transaction(transaction)
 
@@ -457,6 +524,29 @@ module Archipelago
 
       private
 
+      #
+      # Evaluates all data we have been told to evaluate in earlier runs.
+      #
+      def initialize_seen_data
+        #
+        # [label => [timestamp, data]]
+        # To remember what and when we have evaluated and be able to evaluate it again.
+        #
+        @seen_data = @persistence_provider.get_hashish("seen_data")
+        @seen_data.each do |serialized_label, serialized_pair|
+          timestamp, data = Marshal.load(serialized_pair)
+
+          if data
+            begin
+              Object.class_eval(data)
+            rescue Exception => e
+              puts e
+              pp e.backtrace
+            end
+          end
+        end
+      end
+
       #
       # Allocates space for this +transaction+.
       #
@@ -471,7 +561,7 @@ module Archipelago
                 @snapshot_by_transaction[transaction] = {}
                 @snapshot_by_transaction[transaction].extend(Archipelago::Current::Synchronized)
                 @timestamp_by_key_by_transaction[transaction] = {}
-                transaction.join(DRbObject.new(self))
+                transaction.join(self)
               end
             end
           else
@@ -631,7 +721,7 @@ module Archipelago
 
         return value if Dubloon === value
 
-        return Dubloon.new(key, DRbObject.new(self), transaction, service_id, value.public_methods)
+        return Dubloon.new(key, self, transaction, service_id, value.public_methods)
       end
 
       #

data/lib/archipelago.rb

@@ -17,8 +17,8 @@
 
 $: << File.dirname(File.expand_path(__FILE__))
 
-require 'disco'
-require 'current'
-require 'tranny'
-require 'treasure'
-require 'pirate'
+require 'archipelago/disco'
+require 'archipelago/current'
+require 'archipelago/tranny'
+require 'archipelago/treasure'
+require 'archipelago/pirate'

data/scripts/chest.rb

@@ -7,7 +7,7 @@ end
 
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'treasure'
+require 'archipelago/treasure'
 
 if ARGV.size > 1
   DRb.start_service(ARGV[1])

data/scripts/pirate.rb

@@ -1,6 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'pirate'
+require 'archipelago/pirate'
+
+#
+# An overload of Archipelago::Hashish::BerkeleyHashish
+# just to get a nice debugging method.
+#
+class Archipelago::Hashish::BerkeleyHashish
+  # 
+  # Get the serialized value for +key+.
+  #
+  def get_serialized_value(key)
+    @content_db[Marshal.dump(key)]
+  end
+end
 
 DRb.start_service("druby://localhost:#{rand(1000) + 5000}")
 @p = Archipelago::Pirate::Captain.new

data/scripts/tranny.rb

@@ -7,7 +7,7 @@ end
 
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 
-require 'treasure'
+require 'archipelago/treasure'
 
 if ARGV.size > 1
   DRb.start_service(ARGV[1])

data/tests/current_test.rb

@@ -1,6 +1,5 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
-require 'current'
 
 class CurrentTest < Test::Unit::TestCase
 

data/tests/disco_test.rb

@@ -1,10 +1,5 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
-require 'disco'
-require 'drb'
-require 'socket'
-require 'ipaddr'
-require 'thread'
 
 class RemoteValidator
   include DRb::DRbUndumped
@@ -27,8 +22,8 @@ class DiscoTest < Test::Unit::TestCase
     @d2 = TestJockey.new(:thrifty_publishing => false)
     @v1 = RemoteValidator.new(true)
     @p1 = Archipelago::Disco::Record.new(:service_id => 1, 
-                                          :validator => DRbObject.new(@v1),
-                                          :epa => "blar")
+                                         :validator => DRbObject.new(@v1),
+                                         :epa => "blar")
     @d1.publish(@p1)
     assert(!@d2.lookup(Archipelago::Disco::Query.new(:epa => "blar")).empty?)
 
@@ -62,8 +57,8 @@ class DiscoTest < Test::Unit::TestCase
   end
 
   def teardown
-    @d1.stop
-    @d2.stop
+    @d1.stop!
+    @d2.stop!
     DRb.stop_service
     @lt.kill
     @listener.close
@@ -78,8 +73,8 @@ class DiscoTest < Test::Unit::TestCase
     assert(empty)
 
     @d1.publish(Archipelago::Disco::Record.new(:service_id => 1, 
-                                                :validator => Archipelago::Disco::MockValidator.new, 
-                                                :epa => "blar2"))
+                                               :validator => Archipelago::Disco::MockValidator.new, 
+                                               :epa => "blar2"))
 
     assert_within(0.5) do
       !empty
@@ -94,7 +89,9 @@ class DiscoTest < Test::Unit::TestCase
   def test_thrifty_publishing
     @ltq.clear
 
-    @d1.publish(Archipelago::Disco::Record.new(:glada => "jaa", :validator => Archipelago::Disco::MockValidator.new, :service_id => 344))
+    @d1.publish(Archipelago::Disco::Record.new(:glada => "jaa", 
+                                               :validator => Archipelago::Disco::MockValidator.new, 
+                                               :service_id => 344))
     sleep 0.1
     assert(@ltq.any? do |d|
              o = Marshal.load(d)
@@ -106,24 +103,28 @@ class DiscoTest < Test::Unit::TestCase
              end
            end)
 
-    @d1.stop
-    @d2.stop
+    @d1.stop!
+    @d2.stop!
 
     @ltq.clear
     c3 = Archipelago::Disco::Jockey.new(:thrifty_publishing => true)
-    c3.publish(Archipelago::Disco::Record.new(:glad => "ja", :validator => Archipelago::Disco::MockValidator.new, :service_id => 33))
+    c3.publish(Archipelago::Disco::Record.new(:glad => "ja", 
+                                              :validator => Archipelago::Disco::MockValidator.new, 
+                                              :service_id => 33))
     sleep 0.1
     assert(@ltq.empty?)
 
     c1 = Archipelago::Disco::Jockey.new(:thrifty_publishing => true)
     assert(!c1.lookup(Archipelago::Disco::Query.new(:glad => "ja")).empty?)
 
-    c1.stop
-    c3.stop
+    c1.stop!
+    c3.stop!
   end
 
   def test_thrifty_replying
-    @d1.publish(Archipelago::Disco::Record.new(:gladaa => "jaaa", :validator => Archipelago::Disco::MockValidator.new, :service_id => 3444))
+    @d1.publish(Archipelago::Disco::Record.new(:gladaa => "jaaa", 
+                                               :validator => Archipelago::Disco::MockValidator.new, 
+                                               :service_id => 3444))
     
     @ltq.clear
     assert(!@d2.lookup(Archipelago::Disco::Query.new(:gladaa => "jaaa")).empty?)
@@ -138,10 +139,12 @@ class DiscoTest < Test::Unit::TestCase
            end)
     
     
-    @d1.stop
-    @d2.stop
+    @d1.stop!
+    @d2.stop!
     c3 = Archipelago::Disco::Jockey.new(:thrifty_replying => true, :thrifty_publishing => true)
-    c3.publish(Archipelago::Disco::Record.new(:glad2 => "ja2", :validator => Archipelago::Disco::MockValidator.new, :service_id => 34))
+    c3.publish(Archipelago::Disco::Record.new(:glad2 => "ja2", 
+                                              :validator => Archipelago::Disco::MockValidator.new, 
+                                              :service_id => 34))
 
     @ltq.clear
 
@@ -157,19 +160,23 @@ class DiscoTest < Test::Unit::TestCase
              end
            end)
 
-    c1.stop
-    c3.stop
+    c1.stop!
+    c3.stop!
   end
 
   def test_thrifty_caching
-    @d2.publish(Archipelago::Disco::Record.new(:bojkotta => "jag", :validator => Archipelago::Disco::MockValidator.new, :service_id => 411))
+    @d2.publish(Archipelago::Disco::Record.new(:bojkotta => "jag", 
+                                               :validator => Archipelago::Disco::MockValidator.new, 
+                                               :service_id => 411))
     sleep 0.1
     assert(@d1.remote_services.include?(411))
 
     c1 = TestJockey.new(:thrifty_caching => true)
     assert(!c1.local_services.include?(41))
     assert(!c1.remote_services.include?(41))
-    @d1.publish(Archipelago::Disco::Record.new(:bojkott => "ja", :validator => Archipelago::Disco::MockValidator.new, :service_id => 41))
+    @d1.publish(Archipelago::Disco::Record.new(:bojkott => "ja", 
+                                               :validator => Archipelago::Disco::MockValidator.new, 
+                                               :service_id => 41))
     sleep 0.1
     assert(!c1.local_services.include?(41))
     assert(!c1.remote_services.include?(41))

data/tests/pirate_test.rb

@@ -1,10 +1,5 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
-require 'treasure'
-require 'drb'
-require 'tranny'
-require 'hashish'
-require 'pirate'
 
 class PirateTest < Test::Unit::TestCase
 
@@ -27,12 +22,39 @@ class PirateTest < Test::Unit::TestCase
   end
 
   def teardown
+    @p.stop!
     @c.persistence_provider.unlink
     @c2.persistence_provider.unlink
     @tm.persistence_provider.unlink
     DRb.stop_service
   end
 
+  def test_evaluate
+    assert_raise(NameError) do
+      e = Evaltest.new
+    end
+
+    p2 = Archipelago::Pirate::Captain.new(:chest_description => {:class => "TestChest"}, 
+                                          :tranny_description => {:class => "TestManager"},
+                                          :chest_eval_files => [File.join(File.dirname(__FILE__), 'evaltest')])
+
+    assert_within(10) do
+      !p2.chests.empty?
+    end
+    
+    e = Evaltest.new
+
+    assert_raise(NameError) do
+      e = Evaltestmore.new
+    end
+
+    p2.evaluate!(File.join(File.dirname(__FILE__), "evaltestmore"))
+
+    e = Evaltestmore.new
+
+    p2.stop!
+  end
+
   def test_write_read
     0.upto(100) do |n|
       @p["#{n}"] = "#{n}"

data/tests/test_helper.rb

@@ -2,11 +2,16 @@
 home = File.expand_path(File.dirname(__FILE__))
 $: << File.join(home, "..", "lib")
 
+MC_DISABLED = true
+
 require 'pp'
+require 'drb'
 require 'test/unit'
-require 'tranny'
-require 'treasure'
+require 'archipelago'
 require 'benchmark'
+require 'socket'
+require 'ipaddr'
+require 'thread'
 
 class TestTransaction
   def join(o)

data/tests/tranny_test.rb

@@ -1,7 +1,5 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
-require 'tranny'
-require 'drb'
 
 class TrannyTest < Test::Unit::TestCase
 

data/tests/treasure_test.rb

@@ -1,9 +1,5 @@
 
 require File.join(File.dirname(__FILE__), 'test_helper')
-require 'treasure'
-require 'drb'
-require 'tranny'
-require 'hashish'
 
 class TreasureTest < Test::Unit::TestCase
 
@@ -21,6 +17,18 @@ class TreasureTest < Test::Unit::TestCase
     DRb.stop_service
   end
 
+  def test_eval
+    t = Time.now
+    @c.evaluate!("burk", t, "class Burk; end")
+    b = Burk.new
+    @c.evaluate!("burk", t, "class Bong; end")
+    assert_raise(NameError) do
+      b = Bong.new
+    end
+    @c.evaluate!("burk", Time.now + 10, "class Bong; end")
+    b = Bong.new
+  end
+
   def test_store_load_update
     s = "hehu"
     @c["oj"] = "hehu"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: archipelago
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-11-12 00:00:00 +01:00
+  version: 0.1.1
+date: 2006-11-14 00:00:00 +01:00
 summary: A set of tools for distributed computing in ruby.
 require_paths: 
 - lib
@@ -29,12 +29,12 @@ authors:
 - Martin Kihlgren
 files: 
 - lib/archipelago.rb
-- lib/current.rb
-- lib/disco.rb
-- lib/hashish.rb
-- lib/pirate.rb
-- lib/tranny.rb
-- lib/treasure.rb
+- lib/archipelago/current.rb
+- lib/archipelago/disco.rb
+- lib/archipelago/hashish.rb
+- lib/archipelago/pirate.rb
+- lib/archipelago/tranny.rb
+- lib/archipelago/treasure.rb
 - scripts/chest.rb
 - scripts/console
 - scripts/pirate.rb