timestamped_out 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64ce4f00d4d9ae6802e3ee51e08a76129aa4a13
-  data.tar.gz: 777ad3ffc008b8e89e3d1abda40aaeefe4b6d639
+  metadata.gz: 140f805dbd7c2fcbd5f47704d7f1e72bb5bc7246
+  data.tar.gz: 6ec21b1653a47f803baaafe77630f41fc81163e0
 SHA512:
-  metadata.gz: af5beba41eac6d4bf8f54325d52b330b7f03473e18f23ca2050bd0b6afa2ec6b03e264f4190cb4fe8bd76c7abc51095069ac55c6e0e4a1bc5ea3310c3bdaf1f0
-  data.tar.gz: 69bdf9fd1e41dc783ccbb0e2d8a6a1b7f178c673f41af7202d03c9d2153d0cc59699b3e0a8794cbcbc3848312412a09a0a40291fb3bfdab8ebc1780335b131e0
+  metadata.gz: ba223cbd2f97776a5052160fd0f9368867043c72505b7740fd31ebff447be8c74649f90be294ca346b497468668e4d3679b1ffa3afc1ecb36447e64484ba4982
+  data.tar.gz: 7e9fb68aaecb243fb6e47fb21edf95118e384ef12285270957c6cbd58d13667b0e490abb4f956ffdc2b899814792b800a8d3d59a0b8501e75ad661e52566c493

data/README.md

@@ -20,18 +20,35 @@ Or install it yourself as:
 
 ## Usage
 
+Prints STDOUT as INFO:
+
 ```ruby
     TimestampedOut.new.call do
       print "\nTest"
     end
-    2016-05-29 14:34:18 UTC 24342 TID-ovyq9cdtw INFO: Test => #<TimestampedOut:0x007fb6ca83e4a0>
+    2016-06-23 17:08:10 +0200 95434 TID-out0sge0o INFO: Test
 ```
 
+Prints STDERR (including backtrace) as ERROR:
+
 ```ruby
     TimestampedOut.new.call do
       1 / 0
     end
-    2016-05-29 14:34:56 UTC 24342 TID-ovyq9cdtw ERROR: divided by 0
+    2016-06-23 17:20:42 +0200 95986 TID-ow6a19fy4 ERROR: divided by 0
+    ...backtrace...
+```
+
+Works also with embedded shell commands:
+
+```ruby
+    TimestampedOut.new.call do
+      system 'echo "abc"'
+      result = `echo "2"`
+      p result.to_i * 3
+    end
+    2016-06-23 17:23:07 +0200 95986 TID-ow6a2el10 INFO: abc
+    2016-06-23 17:23:07 +0200 95986 TID-ow6a2el10 INFO: 6
 ```
 
 ## Development
@@ -44,8 +61,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/maicher/timestamped_out. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/timestamped_out/version.rb

@@ -1,3 +1,3 @@
 class TimestampedOut
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/timestamped_out.rb

@@ -1,45 +1,49 @@
 require 'timestamped_out/version'
 
 class TimestampedOut
-  class TimestampedStringIO < StringIO
-    def initialize(stdout, level)
-      @stdout = stdout
-      @level = level
-    end
-
-    def write(str)
-      timestamped_str =
-        if str.length == 1 && str == "\n"
-          ''
-        elsif str[0] == "\n"
-          prepend_timestamp(str[1..-1])
-        elsif str[-1] == "\n"
-          prepend_timestamp(str[0..-2])
-        else
-          prepend_timestamp(str)
-        end
+  DEFAULT_FORMATTER = lambda { |severity, datetime, progname, message| "#{datetime} #{Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{progname} #{severity}: #{message}\n" }
 
-      @stdout.write(timestamped_str)
-    end
-
-    private
+  attr_accessor :formatter
 
-    def prepend_timestamp(str)
-      "\n#{Time.now} #{Process.pid} TID-#{Thread.current.object_id.to_s(36)} #{@level}: #{str}"
-    end
+  def initialize(formatter = DEFAULT_FORMATTER)
+    self.formatter = formatter
   end
 
   def call
-    buffered_stdout = $stdout
-    buffered_stderr = $stderr
-    $stdout = TimestampedStringIO.new(buffered_stdout, 'INFO')
-    $stderr = TimestampedStringIO.new(buffered_stderr, 'ERROR')
+    old_stdout = STDOUT.clone
+    pipe_r, pipe_w = IO.pipe
+    pipe_r.sync = true
+    output = ''
+    reader = Thread.new do
+      begin
+        loop do
+          output << formatter.call('INFO', Time.now, '', pipe_r.readpartial(1024))
+        end
+      rescue EOFError
+      end
+    end
+    STDOUT.reopen(pipe_w)
     yield
     self
-  rescue Exception => e
-    $stderr.write "\n#{e}\n#{e.backtrace.join("\n")}"
+  rescue StandardError => e
+    STDERR.write formatter.call('ERROR', Time.now, '', "#{e}\n#{e.backtrace.join("\n")}")
   ensure
-    $stdout = buffered_stdout
-    $stderr = buffered_stderr
+    STDOUT.reopen(old_stdout)
+    pipe_w.close
+    reader.join
+    STDOUT.write(output)
+    return self
+  end
+
+  def with_timestamp(str, level)
+    if str.length == 1 && str == "\n"
+      ''
+    elsif str[0] == "\n"
+      prepend_timestamp(str[1..-1], level)
+    elsif str[-1] == "\n"
+      prepend_timestamp(str[0..-2], level)
+    else
+      prepend_timestamp(str, level)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timestamped_out
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kjm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler