miu 0.0.4 → 0.0.5

data/lib/miu.rb

@@ -1,6 +1,14 @@
 require 'miu/version'
 
 module Miu
+  autoload :CLI, 'miu/cli'
+  autoload :Command, 'miu/command'
+  autoload :Server, 'miu/server'
+  autoload :Message, 'miu/message'
+  autoload :Socket, 'miu/socket'
+  autoload :Publisher, 'miu/publisher'
+  autoload :Subscriber, 'miu/subscriber'
+
   class << self
     def root
       @root ||= find_root 'Gemfile'
@@ -10,33 +18,20 @@ module Miu
       22200
     end
 
-    def default_rpc_port
+    def default_god_port
       default_port
     end
 
-    def default_god_port
+    def default_pub_port
       default_port + 1
     end
 
-    def default_god_config
-      'config/miu.god'
-    end
-
-    def default_fluent_config
-      'config/fluent.conf'
-    end
-
-    def plugins
-      @plugins ||= {}
+    def default_sub_port
+      default_port + 2
     end
 
-    def register(name, plugin, options = {}, &block)
-      name = name.to_s
-      usage = options[:usage] || "#{name} [COMMAND]"
-      desc = options[:desc] || plugin.to_s
-
-      plugins[name] = plugin
-      Miu::CLI.register generate_subcommand(name, plugin, &block), name, usage, desc if block
+    def default_god_config
+      'config/miu.god'
     end
 
     def find_root(flag, base = nil)
@@ -49,5 +44,19 @@ module Miu
       raise 'Could not find root path' unless path
       Pathname.new File.realpath(path)
     end
+
+    def plugins
+      @plugins ||= {}
+    end
+
+    def register(name, plugin, options = {}, &block)
+      Miu.plugins[name] = plugin
+      if block
+        usage = options[:usage] || "#{name} [COMMAND]"
+        desc = options[:desc] || plugin.to_s
+        command = Miu::Command.new name, plugin, &block
+        Miu::CLI.register command, name, usage, desc
+      end
+    end
   end
 end

data/lib/miu/cli.rb

@@ -1,5 +1,5 @@
-require 'thor'
 require 'miu'
+require 'thor'
 
 module Miu
   class CLI < ::Thor
@@ -23,28 +23,39 @@ module Miu
       say "Miu #{Miu::VERSION}"
     end
 
-    desc 'list', 'Lists plugins'
-    def list
-      table = Miu.plugins.map { |k, v| [k, "# #{v}" ] }
-
-      say 'Plugins:'
-      print_table table, :indent => 2, :truncate => true
-      say
-    end
-
     desc 'init', 'Generates a miu configuration files'
     def init
       copy_file 'Gemfile'
       inside 'config' do
-        template 'fluent.conf'
         template 'miu.god'
       end
       empty_directory 'log'
       empty_directory 'tmp/pids'
     end
 
+    desc 'list', 'Lists plugins'
+    def list
+      require 'miu/plugins'
+      table = Miu.plugins.map { |k, v| [k, "# #{v}" ] }
+      say 'Plugins:'
+      print_table table, :indent => 2, :truncate => true
+      say
+    end
+
     desc 'start', 'Start miu'
+    option 'pub-host', :type => :string, :default => '127.0.0.1', :desc => 'pub host address'
+    option 'pub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'pub listen port'
+    option 'sub-host', :type => :string, :default => '127.0.0.1', :desc => 'sub host address'
+    option 'sub-port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'sub listen port'
     def start
+      opts = options.dup
+      opts.keys.each { |k| opts[k.gsub('-', '_')] = opts.delete(k) if k.is_a?(::String) }
+      server = Miu::Server.new opts
+      server.run
+    end
+
+    desc 'supervise', 'Supervise miu and plugins'
+    def supervise
       require 'god'
       run "bundle exec god -c #{Miu.default_god_config}"
     end
@@ -57,7 +68,3 @@ module Miu
     end
   end
 end
-
-# load built-in plugins
-require 'miu/plugins'
-

data/lib/miu/command.rb

@@ -0,0 +1,30 @@
+require 'miu'
+
+module Miu
+  class Command
+    def self.new(name, plugin, options = {}, &block)
+      require 'thor'
+      Class.new ::Thor do
+        include ::Thor::Actions
+        add_runtime_options!
+
+        class << self
+          def source_root
+            Miu.find_root('Gemfile', plugin.called_from)
+          end
+
+          def destination_root
+            Miu.root
+          end
+
+          def banner(task, namespace = nil, subcommand = nil)
+            super task, namespace, subcommand || options.fetch(:subcommand, true)
+          end
+        end
+
+        namespace name
+        class_eval &block if block
+      end
+    end
+  end
+end

data/lib/miu/message.rb

@@ -0,0 +1,24 @@
+require 'msgpack'
+
+module Miu
+  class Message
+    attr_accessor :tag, :time, :body
+
+    def initialize(*args)
+      @tag = args.shift
+      @body = args.pop
+      @time = args.shift || Time.now.to_i
+    end
+
+    def dump
+      [@tag, @time, @body.to_msgpack].map(&:to_s)
+    end
+
+    def self.load(parts)
+      tag = parts.shift
+      time = parts.shift
+      body = MessagePack.unpack(parts.shift)
+      new tag, time, body
+    end
+  end
+end

data/lib/miu/plugin.rb

@@ -17,42 +17,10 @@ module Miu
       attr_accessor :called_from
 
       def register(*args, &block)
-        require 'miu/cli'
         options = args.last.is_a?(::Hash) ? args.pop : {}
         name = args.shift
         plugin = args.shift || self
-        usage = options[:usage] || "#{name} [COMMAND]"
-        desc = options[:desc] || plugin.to_s
-
-        Miu.plugins[name] = plugin
-        Miu::CLI.register generate_subcommand(name, plugin, &block), name, usage, desc if block
-      end
-
-      private
-
-      def generate_subcommand(name, plugin, &block)
-        require 'thor'
-        Class.new ::Thor do
-          include ::Thor::Actions
-          add_runtime_options!
-
-          class << self
-            def source_root
-              Miu.find_root('Gemfile', plugin.called_from)
-            end
-
-            def destination_root
-              Miu.root
-            end
-
-            def banner(task, namespace = nil, subcommand = true)
-              super
-            end
-          end
-
-          namespace name
-          class_eval &block if block
-        end
+        Miu.register name, plugin, options, &block
       end
     end
   end

data/lib/miu/plugins.rb

@@ -1,2 +1,4 @@
-require 'miu/plugins/null'
-
+module Miu
+  module Plugins
+  end
+end

data/lib/miu/publisher.rb

@@ -0,0 +1,31 @@
+require 'miu'
+require 'miu/socket'
+require 'miu/message'
+require 'msgpack'
+
+module Miu
+  class Publisher < Socket
+    def initialize(options = {})
+      options[:port] ||= Miu.default_sub_port
+      super socket_type, options
+
+      yield self if block_given?
+    end
+
+    # tag, time = nil, body
+    def send(*args)
+      message = Message.new *args
+      @socket.send_strings message.dump
+    end
+
+    private
+
+    def socket_type
+      if ZMQ::LibZMQ.version3?
+        ZMQ::XPUB
+      else
+        ZMQ::PUB
+      end
+    end
+  end
+end

data/lib/miu/server.rb

@@ -0,0 +1,55 @@
+require 'miu'
+require 'miu/publisher'
+require 'miu/subscriber'
+
+module Miu
+  class Server
+    attr_reader :options
+    attr_reader :context, :publisher, :subscriber
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    def run
+      pub_address = "#{@options[:pub_host]}:#{@options[:pub_port]}"
+      sub_address = "#{@options[:sub_host]}:#{@options[:sub_port]}"
+
+      @context = ZMQ::Context.new
+      @publisher = Publisher.new({
+        :context => @context,
+        :host => @options[:pub_host],
+        :port => @options[:pub_port]
+      })
+      @subscriber = Subscriber.new({
+        :context => @context,
+        :host => @options[:sub_host],
+        :port => @options[:sub_port]
+      })
+
+      @publisher.bind
+      @subscriber.bind
+
+      puts "Starting miu"
+      puts "pub: #{@publisher.host}:#{@publisher.port}"
+      puts "sub: #{@subscriber.host}:#{@subscriber.port}"
+
+      trap(:INT) do
+        puts "Quit"
+        close
+        exit
+      end
+
+      loop do
+        @subscriber.forward @publisher
+      end
+    end
+
+    def close
+      @subscriber.close
+      @publisher.close
+      @context.terminate
+    end
+    alias_method :shutdown, :close
+  end
+end

data/lib/miu/socket.rb

@@ -0,0 +1,47 @@
+require 'miu'
+require 'ffi-rzmq'
+
+module Miu
+  class Socket
+    attr_reader :host, :port
+    attr_reader :context, :socket
+
+    def initialize(socket_type, options = {})
+      @host = options[:host] || '127.0.0.1'
+      @port = options[:port]
+
+      if options[:context]
+        @context = options[:context]
+        @terminate_context = false
+      else
+        @context = ZMQ::Context.new(options[:io_threads] || 1)
+        @terminate_context = true
+      end
+
+      @socket = @context.socket socket_type
+    end
+
+    def bind
+      @socket.bind "tcp://#{@host}:#{@port}"
+    end
+
+    def connect
+      @socket.connect "tcp://#{@host}:#{@port}"
+    end
+
+    def forward(forwarder)
+      loop do
+        message = ZMQ::Message.new
+        @socket.recvmsg message
+        more = @socket.more_parts?
+        forwarder.socket.sendmsg message, (more ? ZMQ::SNDMORE : 0)
+        break unless more
+      end
+    end
+
+    def close
+      @socket.close
+      @context.terminate if @terminate_context
+    end
+  end
+end

data/lib/miu/subscriber.rb

@@ -0,0 +1,50 @@
+require 'miu'
+require 'miu/socket'
+
+module Miu
+  class Subscriber < Socket
+    attr_reader :subscribe
+
+    def initialize(options = {})
+      options[:port] ||= Miu.default_pub_port
+      super socket_type, options
+
+      self.subscribe = options[:subscribe]
+      yield self if block_given?
+    end
+
+    def subscribe
+      @subscribe
+    end
+
+    def subscribe=(value)
+      @subscribe = value.to_s
+      @socket.setsockopt ZMQ::SUBSCRIBE, @subscribe
+    end
+
+    def recv
+      parts = []
+      @socket.recv_strings parts
+      Message.load parts
+    end
+
+    def each
+      if block_given?
+        loop do
+          message = recv rescue nil
+          yield message if message
+        end
+      end
+    end
+
+    private
+
+    def socket_type
+      if ZMQ::LibZMQ.version3?
+        ZMQ::XSUB
+      else
+        ZMQ::SUB
+      end
+    end
+  end
+end

data/lib/miu/version.rb

@@ -1,3 +1,3 @@
 module Miu
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/templates/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :assets do
   gem 'god'
-  gem 'fluentd'
 end
 
 gem 'miu'
+

data/miu.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'bundler'
-  gem.add_dependency 'thor'
-  gem.add_dependency 'saorin'
-
-  gem.add_development_dependency 'rake'
+  gem.add_dependency 'bundler', '>= 1.2.0'
+  gem.add_dependency 'thor', '>= 0.17.0'
+  gem.add_dependency 'ffi-rzmq', '>= 1.0.0'
+  gem.add_dependency 'msgpack', '>= 0.5.3'
+  gem.add_development_dependency 'rake', '>= 10.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
-  name: saorin
+  name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
 description: miu miu
 email:
 - mail@mashiro.org
@@ -91,12 +107,17 @@ files:
 - bin/miu
 - lib/miu.rb
 - lib/miu/cli.rb
+- lib/miu/command.rb
+- lib/miu/message.rb
 - lib/miu/plugin.rb
 - lib/miu/plugins.rb
 - lib/miu/plugins/null.rb
+- lib/miu/publisher.rb
+- lib/miu/server.rb
+- lib/miu/socket.rb
+- lib/miu/subscriber.rb
 - lib/miu/version.rb
 - lib/templates/Gemfile
-- lib/templates/config/fluent.conf
 - lib/templates/config/miu.god
 - miu.gemspec
 homepage: ''
@@ -113,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3747572747096164549
+      hash: -2326395156696171372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3747572747096164549
+      hash: -2326395156696171372
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24