miu 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1443afae69b50846c4ac4aa4e14c88a54e99cfa8
+  data.tar.gz: a9b76bb0de214c17db275392a1595bbed00e4d40
+SHA512:
+  metadata.gz: 9ef756f4b8fd9d3b1763559cfe27d4e001a0243b3ae072b7b150f202baca1e79c1b73bcfc038cb783dc68620567a00005272d9007f80eaf274137d466941959b
+  data.tar.gz: f7adbd99ffe06db55ed71c07654623ddec8ee49098c0d674ad67645a0d3a0c2ecfa9c581f487be3e2c5cd077e6aca58ba4001556f41dce60d74142fcdd49e86b

data/.gitignore

@@ -18,5 +18,5 @@ tmp
 vendor
 db
 log
-config
+/config
 

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/lib/miu.rb

@@ -6,16 +6,16 @@ module Miu
   autoload :CLI, 'miu/cli'
   autoload :Utility, 'miu/utility'
 
-  autoload :Socket, 'miu/socket'
-  autoload :PubSocket, 'miu/socket'
-  autoload :SubSocket, 'miu/socket'
-  autoload :XPubSocket, 'miu/socket'
-  autoload :XSubSocket, 'miu/socket'
+  autoload :Socket, 'miu/sockets'
+  autoload :PubSocket, 'miu/sockets'
+  autoload :SubSocket, 'miu/sockets'
+  autoload :XPubSocket, 'miu/sockets'
+  autoload :XSubSocket, 'miu/sockets'
 
   autoload :Server, 'miu/server'
   autoload :Packet, 'miu/packet'
-  autoload :Publishable, 'miu/publishable'
-  autoload :Subscribable, 'miu/subscribable'
+  autoload :Writable, 'miu/writable'
+  autoload :Readable, 'miu/readable'
   autoload :Publisher, 'miu/publisher'
   autoload :Subscriber, 'miu/subscriber'
   autoload :Proxy, 'miu/proxy'
@@ -23,30 +23,30 @@ module Miu
 
   autoload :Command, 'miu/command'
   autoload :Node, 'miu/node'
-  autoload :Type, 'miu/type'
+  autoload :Nodes, 'miu/nodes'
   autoload :Resources, 'miu/resources'
   autoload :Messages, 'miu/messages'
 
   class << self
     def root
       require 'pathname'
-      @root ||= Pathname.new(Dir.pwd)
+      Pathname.new(ENV['MIU_ROOT'] || Dir.pwd)
     end
 
     def default_port
       Integer(ENV['MIU_DEFAULT_PORT']) rescue  22200
     end
 
-    def default_god_port
-      default_port
+    def default_pub_port
+      default_port + 0
     end
 
-    def default_pub_port
+    def default_sub_port
       default_port + 1
     end
 
-    def default_sub_port
-      default_port + 2
+    def default_god_port
+      default_port + 3
     end
 
     def default_god_config

data/lib/miu/cli.rb

@@ -6,7 +6,7 @@ module Miu
   class CLI < CLIBase
     class << self
       def source_root
-        File.expand_path('../../templates', __FILE__)
+        File.expand_path('../templates', __FILE__)
       end
 
       def destination_root
@@ -22,9 +22,7 @@ module Miu
 
     desc 'init', 'Generates a miu configuration files'
     def init
-      inside 'config' do
-        template 'miu.god'
-      end
+      directory 'config'
       empty_directory 'log'
       empty_directory 'tmp/pids'
     end
@@ -38,7 +36,7 @@ module Miu
       print_table table, :indent => 2, :truncate => true
     end
 
-    desc 'start', 'Start miu server'
+    desc 'server', 'Start miu server'
     option 'pub-host', :type => :string, :default => '127.0.0.1', :desc => 'pub host'
     option 'pub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'pub port'
     option 'sub-host', :type => :string, :default => '127.0.0.1', :desc => 'sub host'
@@ -46,7 +44,7 @@ module Miu
     option 'bridge-host', :type => :string, :default => '127.0.0.1', :desc => 'bridge host'
     option 'bridge-port', :type => :numeric, :desc => 'bridge port'
     option 'verbose', :type => :boolean, :default => false, :desc => 'verbose output', :aliases => '-V'
-    def start
+    def server
       server = Miu::Server.new Miu::Utility.optionify_keys(options)
       server.run
     end
@@ -54,10 +52,9 @@ module Miu
     desc 'cat TAG ROOM TEXT', 'Okaka kakeyoune'
     option 'host', :type => :string, :default => '127.0.0.1', :desc => 'miu sub host'
     option 'port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'miu sub port'
-    option 'network', :type => :string, :default => 'debug', :desc => 'miu network name'
+    option 'network', :type => :string, :default => 'cat', :desc => 'miu network name'
     def cat(tag, room, text)
       require 'miu/messages'
-      require 'json'
       publisher = Miu::Publisher.new :host => options[:host], :port => options[:port]
       message = Miu::Messages::Text.new do |m|
         m.network.name = options[:network]
@@ -73,30 +70,74 @@ module Miu
       Miu::Logger.exception e
     end
 
-    desc 'supervise', 'Supervise miu and nodes'
+    desc 'supervise', 'Supervise nodes'
     def supervise(*args)
-      args.unshift "-c #{Miu.default_god_config}"
-      run_god *args
+      args.unshift(
+        'god',
+        "-c #{Miu.root.join(Miu.default_god_config)}",
+        "-l #{Miu.root.join('log/god.log')}",
+        '--no-syslog',
+        '--no-events',
+      )
+      run args.join(' '), :verbose => false
     end
 
-    desc 'terminate', 'Terminate miu and nodes'
+    desc 'terminate', 'Terminate nodes'
     def terminate(*args)
-      args.unshift "-p #{Miu.default_god_port} terminate"
+      args.unshift 'terminate'
+      run_god *args
+    end
+
+    desc 'start [NODE]', 'Start specified node or all nodes'
+    def start(node = :all, *args)
+      args.unshift 'start', node
+      run_god *args
+    end
+
+    desc 'stop [NODE]', 'Stop specified node or all nodes'
+    def stop(node = :all, *args)
+      args.unshift 'stop', node
+      run_god *args
+    end
+
+    desc 'restart [NODE]', 'Restart specified node or all nodes'
+    def restart(node = :all, *args)
+      args.unshift 'restart', node
+      run_god *args
+    end
+
+    desc 'monitor [NODE]', 'Monitor specified node or all nodes'
+    def monitor(node = :all, *args)
+      args.unshift 'monitor', node
+      run_god *args
+    end
+
+    desc 'unmonitor [NODE]', 'Unmonitor specified node or all nodes'
+    def unmonitor(node = :all, *args)
+      args.unshift 'unmonitor', node
+      run_god *args
+    end
+
+    desc 'status [NODE]', 'Show status of the specified node or all nodes'
+    def status(node = :all, *args)
+      args.unshift 'status', node
       run_god *args
     end
 
-    desc 'god [ARGS]', 'Miu is a god'
-    def god(*args)
-      args.unshift "-p #{Miu.default_god_port}"
+    desc 'reload', 'Reload config file'
+    def reload(*args)
+      args.unshift "load #{Miu.root.join(Miu.default_god_config)}"
       run_god *args
     end
 
     private
 
     def run_god(*args)
-      require 'god'
-      args.unshift 'god'
-      run args.join(' ')
+      args.unshift(
+        'god',
+        "-p #{Miu.default_god_port}",
+      )
+      run args.join(' '), :verbose => false
     end
   end
 end

data/lib/miu/command.rb

@@ -1,9 +1,10 @@
 require 'miu'
-require 'miu/cli_base'
 
 module Miu
   class Command
     def self.new(name, node, options = {}, &block)
+      require 'miu/cli_base'
+
       Class.new Miu::CLIBase do
         attr_accessor :node
         @node = node
@@ -22,15 +23,17 @@ module Miu
           end
 
           def add_miu_pub_options(name)
+            tag = ['miu', 'input', name].select { |s| s && !s.empty? }.join('.') + '.'
             option 'pub-host', :type => :string, :default => '127.0.0.1', :desc => 'miu pub host'
             option 'pub-port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'miu pub port'
-            option 'pub-tag', :type => :string, :default => "miu.input.#{name}.", :desc => 'miu pub tag'
+            option 'pub-tag', :type => :string, :default => tag, :desc => 'miu pub tag'
           end
 
           def add_miu_sub_options(name)
+            tag = ['miu', 'output', name].select { |s| s && !s.empty? }.join('.') + '.'
             option 'sub-host', :type => :string, :default => '127.0.0.1', :desc => 'miu sub host'
             option 'sub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'miu sub port'
-            option 'sub-tag', :type => :string, :default => "miu.output.#{name}.", :desc => 'miu sub tag'
+            option 'sub-tag', :type => :string, :default => tag, :desc => 'miu sub tag'
           end
 
           def add_miu_pub_sub_options(name)
@@ -39,6 +42,30 @@ module Miu
           end
         end
 
+        unless respond_to? :no_commands
+          class << self
+            alias_method :no_commands, :no_tasks
+          end
+        end
+
+        no_commands do
+         def invoke_command(command, *args)
+           Miu.logger.level = ::Logger::DEBUG if options['verbose'] && Miu.logger
+           super
+         end
+
+         def config(data = nil, &block)
+           data = block.call if !data && block
+           append_to_file Miu.root.join(Miu.default_god_config), "\n#{data}"
+         end
+        end
+
+        class_option :force, :type => :boolean, :group => :runtime, :desc => 'Overwrite files that already exist'
+        class_option :pretend, :type => :boolean, :group => :runtime, :desc => 'Run but do not make any changes'
+        class_option :verbose, :type => :boolean, :group => :runtime, :desc => 'Verbose status output'
+        class_option :quiet, :type => :boolean, :group => :runtime, :desc => 'Suppress status output'
+        class_option :skip, :type => :boolean, :group => :runtime, :desc => 'Skip files that already exist'
+
         namespace name
         class_eval &block if block
       end

data/lib/miu/dsl.rb

@@ -0,0 +1,45 @@
+require 'miu'
+require 'god/sugar'
+require 'god/task'
+require 'god/watch'
+
+module Miu
+  class << self
+    def dump_cli_options(options)
+      options.map do |k, v|
+        v = case v
+            when Array
+              v.map { |x| "'#{x}'" }.join(' ')
+            else
+              v.to_s
+            end
+        "#{k}=#{v}"
+      end.join(' ')
+    end
+
+    def watch(name)
+      God.watch do |w|
+        w.dir = Miu.root
+        w.log = Miu.root.join("log/#{name}.log").to_s
+        w.name = name
+        w.group = 'all'
+
+        yield w if block_given?
+
+        [:start, :stop, :restart].each do |action|
+          value = w.public_send action
+          if value.is_a?(Array)
+            options = Miu::Utility.extract_options! value
+            value << dump_cli_options(options)
+            w.public_send "#{action}=", value.join(' ')
+          end
+        end
+      end
+    end
+  end
+end
+
+if $load_god
+  God.port = Miu.default_god_port
+  God.pid_file_directory = Miu.root.join('tmp/pids').to_s
+end

data/lib/miu/forwarder.rb

@@ -1,4 +1,4 @@
-require 'miu/socket'
+require 'miu/sockets'
 require 'miu/proxy'
 require 'ffi-rzmq'
 

data/lib/miu/logger.rb

@@ -33,6 +33,7 @@ module Miu
     attr_accessor :default_logger
     attr_accessor :logger
   end
+
   self.default_logger = ::Logger.new(STDERR)
   self.logger = self.default_logger
   self.logger.level = ::Logger::INFO

data/lib/miu/messages.rb

@@ -19,3 +19,6 @@ end
 require 'miu/messages/base'
 require 'miu/messages/unknown'
 require 'miu/messages/text'
+require 'miu/messages/enter'
+require 'miu/messages/leave'
+

data/lib/miu/messages/base.rb

@@ -17,20 +17,17 @@ module Miu
         yield self if block_given?
       end
 
-      def to_hash
+      def to_h
         {
-          :network => @network.to_hash,
+          :network => @network.to_h,
           :type => @type,
-          :content => @content ? @content.to_hash : {}
+          :content => @content ? @content.to_h : {}
         }
       end
 
       def to_msgpack(*args)
-        to_hash.to_msgpack(*args)
+        to_h.to_msgpack(*args)
       end
     end
-
-    class Unknown < Base
-    end
   end
 end

data/lib/miu/messages/enter.rb

@@ -0,0 +1,16 @@
+require 'miu/resources'
+require 'miu/messages/base'
+
+module Miu
+  module Messages
+    class Enter < Base
+      def initialize(options = {})
+        options[:type] ||= 'enter'
+        options[:content] = Miu::Utility.adapt(Resources::EnterContent, options[:content] || {})
+        super 
+      end
+    end
+
+    register :enter, Enter
+  end
+end

data/lib/miu/messages/leave.rb

@@ -0,0 +1,16 @@
+require 'miu/resources'
+require 'miu/messages/base'
+
+module Miu
+  module Messages
+    class Leave < Base
+      def initialize(options = {})
+        options[:type] ||= 'leave'
+        options[:content] = Miu::Utility.adapt(Resources::LeaveContent, options[:content] || {})
+        super 
+      end
+    end
+
+    register :leave, Leave
+  end
+end

data/lib/miu/packet.rb

@@ -22,6 +22,10 @@ module Miu
       raise PacketLoadError, e
     end
 
+    def to_s
+      "<#{tag}> #{data.to_h}"
+    end
+
     def inspect
       inspection = [:tag, :data].map do |name|
         "#{name}: #{__send__(name).inspect}"

data/lib/miu/proxy.rb

@@ -1,4 +1,4 @@
-require 'miu/socket'
+require 'miu/sockets'
 require 'ffi-rzmq'
 
 module Miu
@@ -9,8 +9,8 @@ module Miu
     PROXY_TO = '@__proxy_to__'
 
     def initialize(frontends, backends)
-      @frontends = Array(frontends).map { |s| unwrap s }
-      @backends = Array(backends).map { |s| unwrap s }
+      @frontends = Array(frontends).map { |s| s.to_io rescue s }
+      @backends = Array(backends).map { |s| s.to_io rescue s }
 
       @frontends.each { |s| s.instance_variable_set PROXY_TO, @backends }
       @backends.each { |s| s.instance_variable_set PROXY_TO, @frontends }
@@ -42,16 +42,5 @@ module Miu
         end
       end
     end
-
-    private
-
-    def unwrap(socket)
-      case socket
-      when Miu::Socket
-        socket.socket
-      else
-        socket
-      end
-    end
   end
 end