miu 0.0.2 → 0.0.3

data/bin/miu

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

data/lib/miu/cli.rb

@@ -6,6 +6,16 @@ module Miu
     include ::Thor::Actions
     add_runtime_options!
 
+    class << self
+      def source_root
+        File.expand_path('../../templates', __FILE__)
+      end
+
+      def destination_root
+        Miu.root
+      end
+    end
+
     map ['--version', '-v'] => :version
 
     desc 'version', 'Show version'
@@ -24,32 +34,10 @@ module Miu
 
     desc 'init', 'Generates a miu configuration files'
     def init
-      empty_directory 'config'
+      copy_file 'Gemfile'
+      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

data/lib/miu/plugin.rb

@@ -4,12 +4,52 @@ module Miu
   module Plugin
     def self.included(base)
       base.extend ClassMethods
+      base.called_from = begin
+        call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
+        File.dirname(call_stack.detect { |p| p !~ %r(miu[\w.-]*/lib/miu/plugins) })
+      end
     end
 
     module ClassMethods
+      attr_accessor :called_from
+
       def register(*args, &block)
-        args.insert 1, self.class
-        Miu.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
       end
     end
   end

data/lib/miu/version.rb

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

data/lib/miu.rb

@@ -1,48 +1,33 @@
 require 'miu/version'
 
 module Miu
-  autoload :CLI, 'miu/cli'
-
   class << self
     def root
-      require 'pathname'
-      Pathname.new(File.expand_path('../../', __FILE__))
+      @root ||= find_root 'Gemfile'
     end
 
     def plugins
       @plugins ||= {}
     end
 
-    def register(name, type, options = {}, &block)
+    def register(name, plugin, options = {}, &block)
       name = name.to_s
       usage = options[:usage] || "#{name} [COMMAND]"
-      desc = options[:desc] || type.to_s
+      desc = options[:desc] || plugin.to_s
 
-      plugins[name] = type
-      Miu::CLI.register generate_subcommand(name, &block), name, usage, desc if block
+      plugins[name] = plugin
+      Miu::CLI.register generate_subcommand(name, plugin, &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
+    def find_root(flag, base = nil)
+      require 'pathname'
+      path = base || Dir.pwd
+      while path && File.directory?(path) && File.exist?("#{path}/#{flag}")
+        parent = File.dirname path
+        path = path != parent && path
       end
+      raise 'Could not find root path' unless path
+      Pathname.new File.realpath(path)
     end
   end
 end

data/lib/templates/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'miu'

data/lib/templates/config/fluent.conf

@@ -0,0 +1,5 @@
+# built-in TCP input
+# $ echo <json> | fluent-cat <tag>
+<source>
+  type forward
+</source>

data/lib/templates/config/miu.god

@@ -0,0 +1,13 @@
+# 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

data/miu.gemspec

@@ -17,6 +17,7 @@ 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 'god'
   gem.add_dependency 'fluentd'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +127,9 @@ files:
 - lib/miu/plugins.rb
 - lib/miu/plugins/null.rb
 - lib/miu/version.rb
+- lib/templates/Gemfile
+- lib/templates/config/fluent.conf
+- lib/templates/config/miu.god
 - miu.gemspec
 homepage: ''
 licenses: []
@@ -126,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1753892730624338277
+      hash: -519439640692874562
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1753892730624338277
+      hash: -519439640692874562
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24