fluent-exec 0.0.1 → 0.0.2

data/README.md

@@ -10,7 +10,7 @@ Install fluent-exec as a gem:
 
 ## Usage
 
-    $ fluent-exec echo.test echo 'testing...'
+    $ fluent-exec -t echo.test echo 'testing...'
     testing...
 
 will log this record with tag `echo.test`:
@@ -23,6 +23,14 @@ will log this record with tag `echo.test`:
       "runtime": 0.004784
     }
 
+Lookup `fluent-exec --help` for more info.
+
+    Usage: fluent-exec [options] [--] command...
+    
+        -t, --tag TAG                    Tag to use (default fluent.exec)
+        -h, --host HOST                  Host to send (default localhost)
+        -p, --port PORT                  Port to send (default 24224)
+
 ## Contributing
 
 1. Fork it

data/lib/fluent-exec/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Exec
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/fluent-exec.rb

@@ -1,27 +1,57 @@
 # -*- coding: utf-8 -*-
 require "fluent-exec/version"
 require "fluent-logger"
+require "optparse"
 require "open3"
 
 module Fluent
   module Exec
+    DEFAULT_OPTS = {
+      :host => 'localhost',
+      :port => 24224,
+      :tag => 'fluent.exec'
+    }
+    
     class CLI
-      HOST = 'localhost'
-      PORT = 24224
+      def initialize
+        @host = DEFAULT_OPTS[:host]
+        @port = DEFAULT_OPTS[:port]
+        @tag = DEFAULT_OPTS[:tag]
+        init_optp
+      end
+      
+      def init_optp
+        @optp = OptionParser.new        
+        @optp.banner = "Usage: fluent-exec [options] [--] command..."
+        @optp.separator ""
+        @optp.on('-t', '--tag TAG', "Tag to use (default #{DEFAULT_OPTS[:tag]})") {|v| @tag = v}
+        @optp.on('-h', '--host HOST', "Host to send (default #{DEFAULT_OPTS[:host]})") {|v| @host = v}
+        @optp.on('-p', '--port PORT', /^\d+$/, "Port to send (default #{DEFAULT_OPTS[:port]})") {|v| @port = v}
+      end
 
-      def run(args)
-        tag = args.shift
-        cmd = args
+      def parse!(args)
+        begin
+          @cmd = @optp.order args
+        rescue => ex
+          $stderr.puts ex.to_s
+          $stderr.puts @optp.help
+          exit 1
+        end
+      end
+      
+      def exec
         env = {}
         in_str  = ''
         out_str = ''
         err_str = ''
 
         begin_time = Time.now
-        sin, sout, serr, thr = Open3.popen3(env, *cmd)
+        sin, sout, serr, thr = Open3.popen3(env, *@cmd)
 
         sin_t = Thread.new do
-          sin.write s while s = $stdin.read(1024)
+          while s = $stdin.read(1024)
+            sin.write s
+          end
           sin.close
         end
 
@@ -45,21 +75,27 @@ module Fluent
         sout_t.join
         serr_t.join
         es = status.exitstatus
+        {
+          :command => @cmd,
+          :exitstatus => es,
+          :stdout => out_str,
+          :stderr => err_str,
+          :runtime => end_time - begin_time,
+        }
+      end
+
+      def run(args)
+        parse! args
+        record = exec
         #コマンドの実行を優先？
         #fluentdサーバに接続できない場合はどうする？
         # failover (file|stdout)?
         begin
-          log = Fluent::Logger::FluentLogger.new(nil, :host => HOST, :port => PORT)
-          log.post tag, {
-            :command => ARGV,
-            :exitstatus => es,
-            :stdout => out_str,
-            :stderr => err_str,
-            :runtime => end_time - begin_time,
-          }
+          log = Fluent::Logger::FluentLogger.new(nil, :host => @host, :port => @port)
+          log.post @tag, record
         rescue => ex
         end
-        exit es
+        exit record[:exitstatus]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-exec
 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: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-logger