devp2p 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9730d697b44cd5f35301e1010636cfa941e30db
-  data.tar.gz: dc7bed10ffed00dc8353e459906014d541738fcc
+  metadata.gz: f6ddcb762858bc073f1b5394c9294dff6a391756
+  data.tar.gz: 8e11801858eff23d391df93214520a47ea31f8c4
 SHA512:
-  metadata.gz: 3b8635533c9b4e6211972ea1d0e3973317553b991dcfd664823ed3cbee5c627b7f68e72d411974d47ceafe8eb241e9137563af6b944f09549b18b56f178c3e45
-  data.tar.gz: 974eae8a51cc88d2668b07c4baa0f75aa305ab59b283307abea19c7edccc9cf5f84e2567dceb223f96739c820394e597fd0c5deb853172d96fab951de00812c1
+  metadata.gz: 7a2cb995431e8db5e5a34f8b9368844fcea25e53cb8519931c04678b88f3c420d89b8191cba17c0ad5967c911011427023b11286b7e4d0f00d49104dd3c77644
+  data.tar.gz: 9b0c03fcaa6a819e20f1a1c516f176c240a75351c5e4dde05087b4dc902d2d39e6a9a36b2072ed1fcf4e8f8ef65debbb0d12768afd75d0996f7d9dda2766626f

data/lib/devp2p/base_app.rb

@@ -16,7 +16,7 @@ module DEVp2p
 
     def initialize(config=default_config)
       @config = Utils.update_config_with_defaults config, default_config
-      @registry = Celluloid::Supervision::Configuration.new
+      @container = Celluloid::Supervision::Container.new
       @services = Hashie::Mash.new
     end
 
@@ -30,38 +30,42 @@ module DEVp2p
       raise ArgumentError, "service #{klass.name} already registered" if services.has_key?(klass.name)
 
       logger.info "registering service", service: klass.name
-
-      registry_name = "#{object_id}__#{klass.name}"
-      @registry.define type: klass, as: registry_name, args: args
+      @container.add type: klass, as: get_actor_name(klass.name), args: args
       services[klass.name] = nil
 
       klass
     end
 
-    def deregister_service(service)
-      raies NotImplemented
-      #raise ArgumentError, "service must be instance of BaseService" unless service.is_a?(BaseService)
-      #services.delete(service.name)
-      #unlink service
+    ##
+    # Terminate service instance, remove it from registry.
+    #
+    def deregister_service(klass)
+      raise ArgumentError, "service must be instance of BaseService" unless klass.instance_of?(Class) && klass < BaseService
+      raise ArgumentError, "service #{klass.name} not registered" unless services.has_key?(klass.name)
+
+      logger.info "deregistering service", service: klass.name
+      @container.remove actor(klass.name)
+      services.delete klass.name
+
+      klass
     end
 
     def start
-      @registry.deploy
+      services.keys.each do |n|
+        next if services[n]
 
-      services.keys.each do |k|
-        registry_name = "#{object_id}__#{k}"
-        services[k] = Celluloid::Actor[registry_name]
-        services[k].start
+        services[n] = actor(n)
+        services[n].start
       end
     end
 
     def stop
-      services.keys.each do |k|
-        services[k].stop if services[k].alive?
-        services[k] = nil
+      services.keys.each do |n|
+        services[n].stop if services[n].alive?
+        services[n] = nil
       end
 
-      @registry.shutdown
+      #@container.shutdown
     end
 
     def join
@@ -76,5 +80,13 @@ module DEVp2p
       @logger ||= Logger.new 'app'
     end
 
+    def actor(name)
+      Celluloid::Actor[get_actor_name(name)]
+    end
+
+    def get_actor_name(service_name)
+      "#{object_id}_#{service_name}"
+    end
+
   end
 end

data/lib/devp2p/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : ascii-8bit -*-
 module DEVp2p
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   VersionString = begin
                     git_describe_re = /^(?<version>v\d+\.\d+\.\d+)-(?<git>\d+-g[a-fA-F0-9]+(?:-dirty)?)$/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devp2p
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie