logger_pipe 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7068613fe359a54637b22307dbea224fb24c54
-  data.tar.gz: 89728bb6cc659b443ffd23741f665f2212fc40e8
+  metadata.gz: fd276efaaeaec72d772ef2850226516e2fdbd75d
+  data.tar.gz: 3a8b2f21d9a5e920db4dd4ead277e89a78a0941d
 SHA512:
-  metadata.gz: e054919d64f00990972b84fcdbd2124307a9b94ccff3633584ed4709af9119782751c92a4b2cfd6c220b937e3197230962c58f7a6f9f4d990a2888282138be39
-  data.tar.gz: 5f535fa69f4fcb9e6444d03545483afa358aade7e1e2527b6d8b37140e467a5184cd906f7c96aa62e7204a202b1a494c35a5557e7760f21206121502903bc23a
+  metadata.gz: bf66b0f214bb5dbb5370cfec1e4339bffd2d9af0af26354e583e3f35b0732d60496b38eabb753a4b168112f87c1dfe8629fcf57a26898bd885c3d7e2396f3201
+  data.tar.gz: d28ec1066da06d0759b41b727e2ff31f684b815f27e74193143d248908ff0c8ceafaca9854af359d3d835f284eaafe1624d4c38bb34ae565a9dc6d3bb32f4106

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in logger_pipe.gemspec
 gemspec
+
+group :development do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
+  gem "simplecov"
+  gem "fuubar"
+end

data/lib/logger_pipe/runner.rb

@@ -2,6 +2,7 @@
 require "logger_pipe"
 
 require "timeout"
+require 'tempfile'
 
 module LoggerPipe
 
@@ -28,48 +29,57 @@ module LoggerPipe
         return nil
       end
       logger.info("executing: #{cmd}")
-      buf = []
+      @buf = []
       # systemをタイムアウトさせることはできないので、popenの戻り値を使っています。
       # see http://docs.ruby-lang.org/ja/2.0.0/class/Timeout.html
-      com, pid = nil, nil
-      begin
-        Timeout.timeout( @timeout ) do
+      @com, @pid = nil, nil
+      stderr_buffer do |stderr_fp|
+        timeout do
 
           # popenにブロックを渡さないと$?がnilになってしまうので敢えてブロックで処理しています。
-          com = IO.popen(cmd) do |com|
-            pid = com.pid
+          @com = IO.popen("#{cmd} 2> #{stderr_fp.path}") do |com|
+            @com = com
+            @pid = com.pid
             while line = com.gets
-              buf << line
+              @buf << line
               logger.debug(line.chomp)
             end
           end
           if $?.exitstatus == 0
+            logging_stderr(stderr_fp)
             logger.info("\e[32mSUCCESS: %s\e[0m" % [cmd])
-            return buf.join
+            return @buf.join
           else
+            logging_stderr(stderr_fp)
             msg = "\e[31mFAILURE: %s\e[0m" % [cmd]
             logger.error(msg)
-            raise Failure.new(msg, buf)
+            raise Failure.new(msg, @buf)
           end
 
         end
+      end
+    end
+
+    def timeout(&block)
+      begin
+        Timeout.timeout(@timeout, &block)
       rescue Timeout::Error => e
-        logger.error("[#{e.class.name} #{e.message}] now killing process #{pid}: #{cmd}")
+        logger.error("[#{e.class.name} #{e.message}] now killing process pid:#{@pid.inspect}: #{cmd}")
         begin
-          Process.kill('SIGINT', pid) if pid
+          Process.kill('SIGINT', @pid) if @pid
         rescue Exception => err
           logger.error("[#{err.class.name}] #{err.message}")
         end
         begin
           Timeout.timeout(10) do
-            result = com.read
+            result = @com.read
           end
         rescue Exception => err
           logger.error("failure to get result [#{err.class.name}] #{err.message}")
           result = "<failure to get result>"
         end
         begin
-          msg = "\e[31mEXECUTION Timeout: %s\e[0m\n%s\n[result]: %s" % [cmd, buf.join.strip, result]
+          msg = "\e[31mEXECUTION Timeout: %s\e[0m\n%s\n[result]: %s" % [cmd, @buf.join.strip, result]
           logger.error(msg)
         rescue Exception => err
           logger.error("[#{err.class.name}] #{err.message}")
@@ -78,6 +88,20 @@ module LoggerPipe
       end
     end
 
+    def stderr_buffer
+      Tempfile.open("logger_pipe.stderr.log") do |f|
+        f.close
+        return block_given? ? yield(f) : nil
+      end
+    end
+
+    def logging_stderr(f)
+      f.open
+      c = f.read
+      if !c.nil? && !c.empty?
+        logger.info("--- begin stderr ---\n#{c}\n--- end stderr ---")
+      end
+    end
   end
 
 end

data/lib/logger_pipe/version.rb

@@ -1,3 +1,3 @@
 module LoggerPipe
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/logger_pipe_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 require 'stringio'
@@ -37,6 +38,24 @@ describe LoggerPipe do
       end
     end
 
+    context "stderr" do
+      let(:cmd){ File.expand_path("../stderr_test.sh", __FILE__) }
+      it "returns STDOUT on success" do
+        res = LoggerPipe.run(logger, "#{cmd} 0")
+        # puts buffer.string
+        expect(buffer.string).to match /bar\n/
+        expect(res).to eq "foo\nbaz\n"
+      end
+
+      it "buffer include stderr content on error" do
+        expect{
+          LoggerPipe.run(logger, "#{cmd} 1")
+        }.to raise_error(LoggerPipe::Failure)
+        # puts buffer.string
+        expect(buffer.string).to match /bar\n/
+      end
+    end
+
     context "dry_run: true" do
       let(:cmd){ "date +'Foo: %Y-%m-%dT%H:%M:%S'; sleep 1; date +'Bar: %Y-%m-%dT%H:%M:%S'" }
       it "returns nil" do

data/spec/stderr_test.sh

@@ -0,0 +1,7 @@
+#! /bin/sh
+
+echo "foo" >&1
+echo "bar" >&2
+echo "baz" >&1
+
+exit $1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logger_pipe
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - logger_pipe.gemspec
 - spec/logger_pipe_spec.rb
 - spec/spec_helper.rb
+- spec/stderr_test.sh
 homepage: https://github.com/groovenauts/logger_pipe
 licenses:
 - MIT
@@ -99,3 +100,4 @@ summary: logger_pipe helps to connect child process STDOUT to Logger on realtime
 test_files:
 - spec/logger_pipe_spec.rb
 - spec/spec_helper.rb
+- spec/stderr_test.sh