fluent-exec 0.0.2 → 0.0.3

data/fluent-exec.gemspec

@@ -8,9 +8,10 @@ Gem::Specification.new do |gem|
   gem.version       = Fluent::Exec::VERSION
   gem.authors       = ["Takenari Shinohara"]
   gem.email         = ["takenari.shinohara@gmail.com"]
-  gem.description   = "Log command's exit status, output and runtime to fluentd."
-  gem.summary       = "Log command's exit status, output and runtime to fluentd."
+  gem.description   = "Execute Command and log exit status, output and runtime to fluentd."
+  gem.summary       = "Execute Command and log exit status, output and runtime to fluentd."
   gem.homepage      = "https://github.com/tshinohara/fluent-exec"
+  gem.required_ruby_version = "~>1.9.1"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent-exec.rb

@@ -38,6 +38,16 @@ module Fluent
           exit 1
         end
       end
+
+      def io_copy_thr(from, to, str=nil)
+        Thread.new do
+          while s = from.read(1024)
+            to.write s
+            str << s if str
+          end
+          to.close
+        end        
+      end
       
       def exec
         env = {}
@@ -48,26 +58,9 @@ module Fluent
         begin_time = Time.now
         sin, sout, serr, thr = Open3.popen3(env, *@cmd)
 
-        sin_t = Thread.new do
-          while s = $stdin.read(1024)
-            sin.write s
-          end
-          sin.close
-        end
-
-        sout_t = Thread.new do
-          while s = sout.read(1024)
-            out_str << s
-            $stdout.write s
-          end
-        end
-
-        serr_t = Thread.new do
-          while s = serr.read(1024)
-            err_str << s
-            $stderr.write s
-          end
-        end
+        sin_t = io_copy_thr $stdin, sin
+        sout_t = io_copy_thr sout, $stdout, out_str
+        serr_t = io_copy_thr serr, $stderr, err_str
 
         status = thr.value
         end_time = Time.now
@@ -87,9 +80,6 @@ module Fluent
       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, record

data/lib/fluent-exec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-exec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,7 +27,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
-description: Log command's exit status, output and runtime to fluentd.
+description: Execute Command and log exit status, output and runtime to fluentd.
 email:
 - takenari.shinohara@gmail.com
 executables:
@@ -53,9 +53,9 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,6 +67,6 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Log command's exit status, output and runtime to fluentd.
+summary: Execute Command and log exit status, output and runtime to fluentd.
 test_files: []
 has_rdoc: