miu 0.0.1 → 0.0.2

data/.gitignore

@@ -16,4 +16,7 @@ test/tmp
 test/version_tmp
 tmp
 vendor
-db/*.db*
+db
+log
+config
+

data/bin/miu

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 require 'miu/cli'
-require 'miu/store/cli'
-
 Miu::CLI.start

data/lib/miu/cli.rb

@@ -2,12 +2,58 @@ require 'thor'
 require 'miu'
 
 module Miu
-  class CLI < Thor
+  class CLI < ::Thor
+    include ::Thor::Actions
+    add_runtime_options!
+
     map ['--version', '-v'] => :version
 
     desc 'version', 'Show version'
     def version
       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
+      empty_directory 'config'
+      empty_directory 'log'
+      empty_directory 'tmp/pids'
+
+      create_file 'config/miu.god', <<-CONF
+# vim: ft=ruby
+require 'miu'
+
+God.port = 30300
+God.pid_file_directory = Miu.root.join('tmp/pids')
+
+God.watch do |w|
+  w.dir = Miu.root
+  w.log = Miu.root.join('log/fluentd.log')
+  w.name = 'fluentd'
+  w.start = 'bundle exec fluentd -c config/fluent.conf'
+  w.keepalive
+end
+      CONF
+      create_file 'config/fluent.conf', <<-CONF
+# built-in TCP input
+# $ echo <json> | fluent-cat <tag>
+<source>
+  type forward
+</source>
+      CONF
+    end
   end
 end
+
+# load built-in plugins
+require 'miu/plugins'
+

data/lib/miu/plugin.rb

@@ -0,0 +1,16 @@
+require 'miu'
+
+module Miu
+  module Plugin
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def register(*args, &block)
+        args.insert 1, self.class
+        Miu.register *args, &block
+      end
+    end
+  end
+end

data/lib/miu/plugins/null.rb

@@ -0,0 +1,57 @@
+require 'miu/plugin'
+
+module Miu
+  module Plugins
+    class Null
+      include Miu::Plugin
+
+      class Handler
+        def log(tag, time, record)
+        end
+      end
+
+      def initialize(options)
+        require 'msgpack/rpc'
+        @server = MessagePack::RPC::Server.new
+        @server.listen options[:host], options[:port], Handler.new
+
+        [:TERM, :INT].each do |sig|
+          Signal.trap(sig) { @server.stop }
+        end
+
+        @server.run
+      end
+
+      register :null, :desc => 'Null plugin' do
+        desc 'start', 'start null'
+        option :bind, :type => :string, :default => '0.0.0.0', :desc => 'bind address', :aliases => '-a'
+        option :port, :type => :numeric, :default => 30301, :desc => 'listen port', :aliases => '-p'
+        def start
+          Null.new options
+        end
+
+        desc 'init', 'init null config'
+        def init
+          append_to_file 'config/miu.god', <<-CONF
+
+God.watch do |w|
+  w.dir = Miu.root
+  w.log = Miu.root.join('log', 'null.log')
+  w.name = 'null'
+  w.start = 'bundle exec miu null start'
+end
+          CONF
+          append_to_file 'config/fluent.conf', <<-CONF
+
+# miu null output plugin
+<match miu.output.null>
+  type msgpack_rpc
+  host localhost
+  port 30301
+</match>
+          CONF
+        end
+      end
+    end
+  end
+end

data/lib/miu/plugins.rb

@@ -0,0 +1,2 @@
+require 'miu/plugins/null'
+

data/lib/miu/version.rb

@@ -1,3 +1,3 @@
 module Miu
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/miu.rb

@@ -1,11 +1,48 @@
 require 'miu/version'
-require 'miu/store'
-require 'pathname'
 
 module Miu
+  autoload :CLI, 'miu/cli'
+
   class << self
     def root
+      require 'pathname'
       Pathname.new(File.expand_path('../../', __FILE__))
     end
+
+    def plugins
+      @plugins ||= {}
+    end
+
+    def register(name, type, options = {}, &block)
+      name = name.to_s
+      usage = options[:usage] || "#{name} [COMMAND]"
+      desc = options[:desc] || type.to_s
+
+      plugins[name] = type
+      Miu::CLI.register generate_subcommand(name, &block), name, usage, desc if block
+    end
+
+    private
+
+    def generate_subcommand(name, &block)
+      require 'thor'
+      Class.new ::Thor do
+        include ::Thor::Actions
+        add_runtime_options!
+
+        class << self
+          def source_root
+            Miu.root.to_s
+          end
+
+          def banner(task, namespace = nil, subcommand = true)
+            super
+          end
+        end
+
+        namespace name
+        class_eval &block if block
+      end
+    end
   end
 end

data/miu.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'thor'
-  gem.add_dependency 'foreman'
+  gem.add_dependency 'god'
   gem.add_dependency 'fluentd'
-  gem.add_dependency 'msgpack'
   gem.add_dependency 'msgpack-rpc'
 
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: god
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc
   requirement: !ruby/object:Gem::Requirement
@@ -118,19 +102,14 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
-- Procfile
 - README.md
 - Rakefile
 - bin/miu
-- config/fluent.conf
-- config/store.rb
-- db/.gitkeep
 - lib/miu.rb
 - lib/miu/cli.rb
-- lib/miu/store.rb
-- lib/miu/store/cli.rb
-- lib/miu/store/strategies/null.rb
-- lib/miu/store/strategy.rb
+- lib/miu/plugin.rb
+- lib/miu/plugins.rb
+- lib/miu/plugins/null.rb
 - lib/miu/version.rb
 - miu.gemspec
 homepage: ''
@@ -147,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1422047492336437771
+      hash: -1753892730624338277
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1422047492336437771
+      hash: -1753892730624338277
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/Procfile

@@ -1,3 +0,0 @@
-store: bundle exec bin/miu store
-fluentd: bundle exec fluentd -c config/fluent.conf
-

data/config/fluent.conf

@@ -1,84 +0,0 @@
-
-## built-in TCP input
-## $ echo <json> | fluent-cat <tag>
-<source>
-  type forward
-</source>
-
-## built-in UNIX socket input
-#<source>
-#  type unix
-#</source>
-
-# HTTP input
-# http://localhost:8888/<tag>?json=<json>
-<source>
-  type http
-  port 8888
-</source>
-
-## File input
-## read apache logs with tag=apache.access
-#<source>
-#  type tail
-#  format apache
-#  path /var/log/httpd-access.log
-#  tag apache.access
-#</source>
-
-# Listen DRb for debug
-<source>
-  type debug_agent
-  port 24230
-</source>
-
-
-## match tag=apache.access and write to file
-#<match apache.access>
-#  type file
-#  path /var/log/fluent/access
-#</match>
-
-## match tag=debug.** and dump to console
-<match debug.**>
-  type stdout
-</match>
-
-## match tag=system.** and forward to another fluent server
-#<match system.**>
-#  type forward
-#  host 192.168.0.11
-#  <secondary>
-#    host 192.168.0.12
-#  </secondary>
-#</match>
-
-## match tag=myapp.** and forward and write to file
-#<match myapp.**>
-#  type copy
-#  <store>
-#    type forward
-#    host 192.168.0.13
-#    buffer_type file
-#    buffer_path /var/log/fluent/myapp-forward
-#    retry_limit 50
-#    flush_interval 10s
-#  </store>
-#  <store>
-#    type file
-#    path /var/log/fluent/myapp
-#  </store>
-#</match>
-
-## match fluent's internal events
-#<match fluent.**>
-#  type null
-#</match>
-
-## match not matched logs and write to file
-#<match **>
-#  type file
-#  path /var/log/fluent/else
-#  compress gz
-#</match>
-

data/config/store.rb

@@ -1,3 +0,0 @@
-# options.database = '0.0.0.0'
-# options.port = 30301
-

data/lib/miu/store/cli.rb

@@ -1,32 +0,0 @@
-require 'miu'
-require 'miu/store'
-require 'miu/cli'
-
-module Miu
-  module Store
-    class CLI < Thor
-      include Thor::Actions
-
-      namespace :store
-
-      class << self
-        def source_root
-          Miu.root
-        end
-      end
-
-      desc 'start', 'Start miu store'
-      option :config, :type => :string, :desc => 'config file', :aliases => '-c'
-      option :address, :type => :string, :default => '0.0.0.0', :desc => 'bind address', :aliases => '-a'
-      option :port, :type => :numeric, :default => 30301, :desc => 'listen port', :aliases => '-p'
-      option :type, :type => :string, :default => 'groonga', :desc => 'store type', :aliases => '-t'
-      option :database, :type => :string, :default => 'db/miu.db', :desc => 'database'
-      def start
-        apply options[:config] if options[:config]
-        Miu::Store.start options
-      end
-    end
-  end
-
-  Miu::CLI.register Miu::Store::CLI, 'store', 'store [COMMAND]', 'Miu store'
-end

data/lib/miu/store/strategies/null.rb

@@ -1,16 +0,0 @@
-require 'miu/store/strategy'
-
-module Miu
-  module Store
-    module Strategies
-      class Null
-        include Miu::Store::Strategy
-
-        def log(tag, time, record)
-        end
-      end
-    end
-
-    register :null, Strategies::Null
-  end
-end

data/lib/miu/store/strategy.rb

@@ -1,18 +0,0 @@
-require 'miu/store'
-
-module Miu
-  module Store
-    module Strategy
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-      end
-
-      def log(tag, time, record)
-        raise NotImplementedError
-      end
-    end
-  end
-end

data/lib/miu/store.rb

@@ -1,34 +0,0 @@
-require 'msgpack/rpc'
-
-module Miu
-  module Store
-    class << self
-      def strategies
-        @@strategies ||= {}
-      end
-
-      def register(name, type)
-        strategies[name.to_sym] = type
-      end
-
-      def start(options = {})
-        address = options[:address]
-        port = options[:port]
-        type = options[:type]
-
-        klass = Miu::Store.strategies[type.to_sym]
-
-        server = MessagePack::RPC::Server.new
-        server.listen address, port, klass.new(options)
-
-        [:TERM, :INT].each do |sig|
-          Signal.trap(sig) { server.stop }
-        end
-
-        server.run
-      end
-    end
-  end
-end
-
-require 'miu/store/strategies/null'