isono 0.2.21 → 0.2.22

data/isono.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.21"
+  s.version = "0.2.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = "2018-02-05"
+  s.date = "2018-03-22"
   s.email = ["dev@axsh.net", "m-fujiwara@axsh.net"]
   s.executables = ["cli"]
-  s.files = ["LICENSE", "NOTICE", "Rakefile", "isono.gemspec", "lib/isono/manifest.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/models/resource_instance.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/event_log.rb", "lib/isono/rack.rb", "lib/isono/logger.rb", "lib/isono/resource_manifest.rb", "lib/isono/util.rb", "lib/isono/daemonize.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/node.rb", "lib/isono/amqp_client.rb", "lib/isono/version.rb", "lib/isono/event_observable.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/map.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/job.rb", "lib/isono/rack/sequel.rb", "lib/isono/messaging_client.rb", "lib/isono/thread_pool.rb", "lib/isono/event_delegate_context.rb", "lib/isono/serializer.rb", "lib/isono.rb", "lib/ext/shellwords.rb", "spec/event_observable_spec.rb", "spec/amqp_client_spec.rb", "spec/manifest_spec.rb", "spec/logger_spec.rb", "spec/file_channel_spec.rb", "spec/spec_helper.rb", "spec/job_channel_spec.rb", "spec/rpc_channel_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/util_spec.rb", "spec/thread_pool_spec.rb", "tasks/load_resource_manifest.rake", "bin/cli"]
+  s.files = ["LICENSE", "NOTICE", "Rakefile", "isono.gemspec", "lib/ext/shellwords.rb", "lib/isono/amqp_client.rb", "lib/isono/daemonize.rb", "lib/isono/event_delegate_context.rb", "lib/isono/event_observable.rb", "lib/isono/logger.rb", "lib/isono/manifest.rb", "lib/isono/messaging_client.rb", "lib/isono/models/event_log.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/resource_instance.rb", "lib/isono/node.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/direct_channel.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/job.rb", "lib/isono/rack/map.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/sequel.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/rack.rb", "lib/isono/resource_manifest.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/serializer.rb", "lib/isono/thread_pool.rb", "lib/isono/util.rb", "lib/isono/version.rb", "lib/isono.rb", "spec/amqp_client_spec.rb", "spec/event_observable_spec.rb", "spec/file_channel_spec.rb", "spec/job_channel_spec.rb", "spec/logger_spec.rb", "spec/manifest_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/rpc_channel_spec.rb", "spec/spec_helper.rb", "spec/thread_pool_spec.rb", "spec/util_spec.rb", "tasks/load_resource_manifest.rake", "bin/cli"]
   s.homepage = "http://github.com/axsh/isono"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")

data/lib/isono.rb

@@ -19,6 +19,7 @@ module Isono
     autoload :Base, 'isono/node_modules/base'
     autoload :DataStore, 'isono/node_modules/data_store'
     autoload :EventChannel, 'isono/node_modules/event_channel'
+    autoload :DirectChannel, 'isono/node_modules/direct_channel'
     autoload :RpcChannel, 'isono/node_modules/rpc_channel'
     autoload :NodeHeartbeat, 'isono/node_modules/node_heartbeat'
     autoload :NodeCollector, 'isono/node_modules/node_collector'

data/lib/isono/node_modules/direct_channel.rb

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+
+module Isono
+  module NodeModules
+    class DirectChannel < Base
+      AMQP_EXCHANGE='isono.direct'
+      
+      initialize_hook do
+        @amq = node.create_channel
+        @amq.instance_eval {
+          def event_exchange
+            self.direct(AMQP_EXCHANGE, {:auto_delete=>false})
+          end
+        }
+
+        # create the exchange
+        @amq.event_exchange
+      end
+
+      terminate_hook do
+      end
+
+      # @example
+      #   publish('ev/event_name', :args=>[1, 2, 3])
+      def publish(evname, opts={})
+        opts = {:args=>[], :sender=>manifest.node_id}.merge(opts)
+        
+        body = {
+          :event => evname,
+          :published_at=> Time.now,
+          :sender  => opts[:sender],
+          :origin_node  => manifest.node_id,
+          :args => opts[:args]
+        }
+        
+        EventMachine.schedule {
+          @amq.event_exchange.publish(Serializer.instance.marshal(body),
+                                            {:key=>"#{evname}"}
+                                            )
+        }
+      end
+      
+      def subscribe(evname, &blk)
+        @amq.queue("#{evname}",{:auto_delete=>true}).bind(
+                     AMQP_EXCHANGE, :key=>"#{evname}"
+                     ).subscribe { |data|
+          data = Serializer.instance.unmarshal(data)
+          case blk.arity
+          when 2
+            m = data.delete(:args)
+            blk.call(data, m)
+          when 1
+            blk.call(data[:args])
+          else
+            blk.call
+          end
+        }
+      end
+      
+      def unsubscribe(evname)
+        EventMachine.schedule {
+          q = @amq.queue("#{evname}",{:auto_delete=>true})
+          q.unsubscribe
+        }
+      end
+
+    end
+  end
+end
+

data/lib/isono/runner/rpc_server.rb

@@ -159,6 +159,7 @@ module Isono
 
       DEFAULT_MANIFEST = Manifest.new(Dir.pwd) do
         load_module NodeModules::EventChannel
+        load_module NodeModules::DirectChannel
         load_module NodeModules::RpcChannel
         load_module NodeModules::JobWorker
         load_module NodeModules::JobChannel

data/lib/isono/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Isono
-  VERSION='0.2.21'
+  VERSION='0.2.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -105,59 +105,60 @@ files:
 - NOTICE
 - Rakefile
 - isono.gemspec
+- lib/ext/shellwords.rb
+- lib/isono/amqp_client.rb
+- lib/isono/daemonize.rb
+- lib/isono/event_delegate_context.rb
+- lib/isono/event_observable.rb
+- lib/isono/logger.rb
 - lib/isono/manifest.rb
-- lib/isono/node_modules/job_channel.rb
-- lib/isono/node_modules/node_collector.rb
-- lib/isono/node_modules/event_channel.rb
+- lib/isono/messaging_client.rb
+- lib/isono/models/event_log.rb
+- lib/isono/models/job_state.rb
+- lib/isono/models/node_state.rb
+- lib/isono/models/resource_instance.rb
+- lib/isono/node.rb
+- lib/isono/node_modules/base.rb
 - lib/isono/node_modules/data_store.rb
+- lib/isono/node_modules/direct_channel.rb
+- lib/isono/node_modules/event_channel.rb
+- lib/isono/node_modules/event_logger.rb
+- lib/isono/node_modules/job_channel.rb
 - lib/isono/node_modules/job_collector.rb
-- lib/isono/node_modules/base.rb
-- lib/isono/node_modules/rpc_channel.rb
 - lib/isono/node_modules/job_worker.rb
+- lib/isono/node_modules/node_collector.rb
 - lib/isono/node_modules/node_heartbeat.rb
-- lib/isono/node_modules/event_logger.rb
-- lib/isono/models/resource_instance.rb
-- lib/isono/models/job_state.rb
-- lib/isono/models/node_state.rb
-- lib/isono/models/event_log.rb
-- lib/isono/rack.rb
-- lib/isono/logger.rb
-- lib/isono/resource_manifest.rb
-- lib/isono/util.rb
-- lib/isono/daemonize.rb
-- lib/isono/runner/rpc_server.rb
-- lib/isono/runner/base.rb
-- lib/isono/runner/cli.rb
-- lib/isono/node.rb
-- lib/isono/amqp_client.rb
-- lib/isono/version.rb
-- lib/isono/event_observable.rb
-- lib/isono/rack/thread_pass.rb
-- lib/isono/rack/data_store.rb
+- lib/isono/node_modules/rpc_channel.rb
 - lib/isono/rack/builder.rb
-- lib/isono/rack/object_method.rb
+- lib/isono/rack/data_store.rb
+- lib/isono/rack/job.rb
 - lib/isono/rack/map.rb
+- lib/isono/rack/object_method.rb
 - lib/isono/rack/proc.rb
-- lib/isono/rack/job.rb
 - lib/isono/rack/sequel.rb
-- lib/isono/messaging_client.rb
-- lib/isono/thread_pool.rb
-- lib/isono/event_delegate_context.rb
+- lib/isono/rack/thread_pass.rb
+- lib/isono/rack.rb
+- lib/isono/resource_manifest.rb
+- lib/isono/runner/base.rb
+- lib/isono/runner/cli.rb
+- lib/isono/runner/rpc_server.rb
 - lib/isono/serializer.rb
+- lib/isono/thread_pool.rb
+- lib/isono/util.rb
+- lib/isono/version.rb
 - lib/isono.rb
-- lib/ext/shellwords.rb
-- spec/event_observable_spec.rb
 - spec/amqp_client_spec.rb
-- spec/manifest_spec.rb
-- spec/logger_spec.rb
+- spec/event_observable_spec.rb
 - spec/file_channel_spec.rb
-- spec/spec_helper.rb
 - spec/job_channel_spec.rb
-- spec/rpc_channel_spec.rb
+- spec/logger_spec.rb
+- spec/manifest_spec.rb
 - spec/node_spec.rb
 - spec/resource_loader_spec.rb
-- spec/util_spec.rb
+- spec/rpc_channel_spec.rb
+- spec/spec_helper.rb
 - spec/thread_pool_spec.rb
+- spec/util_spec.rb
 - tasks/load_resource_manifest.rake
 - bin/cli
 homepage: http://github.com/axsh/isono