miu 0.0.3 → 0.0.4

data/bin/miu

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 require 'bundler'
-Bundler.require
-
+Bundler.require(:default)
 require 'miu/cli'
 Miu::CLI.start

data/lib/miu/cli.rb

@@ -35,10 +35,26 @@ module Miu
     desc 'init', 'Generates a miu configuration files'
     def init
       copy_file 'Gemfile'
-      directory 'config'
+      inside 'config' do
+        template 'fluent.conf'
+        template 'miu.god'
+      end
       empty_directory 'log'
       empty_directory 'tmp/pids'
     end
+
+    desc 'start', 'Start miu'
+    def start
+      require 'god'
+      run "bundle exec god -c #{Miu.default_god_config}"
+    end
+
+    desc 'god', 'Miu is a god'
+    def god(*args)
+      require 'god'
+      args.unshift "bundle exec god -p #{Miu.default_god_port}"
+      run args.join(' ')
+    end
   end
 end
 

data/lib/miu/plugin.rb

@@ -3,6 +3,9 @@ require 'miu'
 module Miu
   module Plugin
     def self.included(base)
+      STDOUT.sync = true
+      STDERR.sync = true
+
       base.extend ClassMethods
       base.called_from = begin
         call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }

data/lib/miu/plugins/null.rb

@@ -5,6 +5,8 @@ module Miu
     class Null
       include Miu::Plugin
 
+      DEFAULT_PORT = Miu.default_port + 10
+
       class Handler
         def log(tag, time, record)
         end
@@ -25,29 +27,29 @@ module Miu
       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'
+        option :port, :type => :numeric, :default => DEFAULT_PORT, :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
+          append_to_file Miu.default_god_config, <<-CONF
 
 God.watch do |w|
   w.dir = Miu.root
-  w.log = Miu.root.join('log', 'null.log')
+  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
+          append_to_file Miu.default_fluent_config, <<-CONF
 
 # miu null output plugin
 <match miu.output.null>
   type msgpack_rpc
   host localhost
-  port 30301
+  port #{DEFAULT_PORT}
 </match>
           CONF
         end

data/lib/miu/version.rb

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

data/lib/miu.rb

@@ -6,6 +6,26 @@ module Miu
       @root ||= find_root 'Gemfile'
     end
 
+    def default_port
+      22200
+    end
+
+    def default_rpc_port
+      default_port
+    end
+
+    def default_god_port
+      default_port + 1
+    end
+
+    def default_god_config
+      'config/miu.god'
+    end
+
+    def default_fluent_config
+      'config/fluent.conf'
+    end
+
     def plugins
       @plugins ||= {}
     end
@@ -22,9 +42,9 @@ module Miu
     def find_root(flag, base = nil)
       require 'pathname'
       path = base || Dir.pwd
-      while path && File.directory?(path) && File.exist?("#{path}/#{flag}")
+      while path && File.directory?(path) && !File.exist?("#{path}/#{flag}")
         parent = File.dirname path
-        path = path != parent && path
+        path = path != parent && parent
       end
       raise 'Could not find root path' unless path
       Pathname.new File.realpath(path)

data/lib/templates/Gemfile

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

data/lib/templates/config/fluent.conf

@@ -3,3 +3,10 @@
 <source>
   type forward
 </source>
+
+# miu default rpc input
+<source>
+  type msgpack_rpc
+  bind localhost
+  port <%= Miu.default_rpc_port %>
+</source>

data/lib/templates/config/miu.god

@@ -1,13 +1,13 @@
 # vim: ft=ruby
 require 'miu'
 
-God.port = 30300
+God.port = Miu.default_god_port
 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.start = "bundle exec fluentd -c #{Miu.default_fluent_config}"
   w.keepalive
 end

data/miu.gemspec

@@ -19,9 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'bundler'
   gem.add_dependency 'thor'
-  gem.add_dependency 'god'
-  gem.add_dependency 'fluentd'
-  gem.add_dependency 'msgpack-rpc'
+  gem.add_dependency 'saorin'
 
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,39 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: god
-  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: fluentd
-  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
+  name: saorin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -145,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -519439640692874562
+      hash: -3747572747096164549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -519439640692874562
+      hash: -3747572747096164549
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24