reox 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fac68a676c75fe48af498ef202233500dd9fa811ab8ce0dc76ce6f59e99a38d
-  data.tar.gz: ac42d321c4f9701b8cbffeab8e21ee15b0915693d279526642bb0474bc42f311
+  metadata.gz: 9ce8289e033cd4a41d292664abaa3da11cc557f410329a7827bd9d209e7b6aa1
+  data.tar.gz: 842630f74649820d5ac955641af2e1329d121f54da788f267235f0a2d2676490
 SHA512:
-  metadata.gz: 5d42daa03485f90d5345d6a88b4afb312d51d56d5ed44ff40304e2b4beb8c7c797defdc2d57d4ac94816f148ca63e734aa40e5c4d8d861d20667f55f5ce328ec
-  data.tar.gz: c84e22355eb136486e0f5fe1e95bf5ddb005d1f23e41dd46ef69f84c33ece92e5eabdab885ba83196a9eeba4deb28ae1014f3e9d127430488294d26a3b28e352
+  metadata.gz: d9dac730088b5e7d2d6e77e28228dd2357a3fc25061a9c6c0b26b306d6a922e2bf659e8a4205ade4905f243949bb5b3ad487beb296ad6e4d9e3e5eef291616c2
+  data.tar.gz: 833a76a755fe0a2daafce2b951a84e2f90c021452271a1457b31d8af90cfc47e773dc43316a3933603c174271a2ebd5783dbb042c61bd91e0b85d7aaa4a5783e

data/lib/reox.rb

@@ -1,48 +1,43 @@
 require_relative 'reox_io'
 require_relative 'reox_file'
 
+# Reox is the driver class, it hijacks and restore streams
 class Reox
-    
-    FILE_NAMES = %w(input.log output.log error.log)
-
-    def self.record 
-        hijack_streams
-        yield
-        restore_streams
-    end
-
-
-    def self.record!
-        hijack_streams
-    end
-
-    def self.stop!
-        restore_streams
-    end 
-
-
-    private 
-
-    def self.hijack_streams
-        input_log,output_log,error_log = setup_files
-        $stdout = ReoxIO.new(STDOUT,output_log) unless $stdout.is_a? ReoxIO
-        $stderr = ReoxIO.new(STDERR,error_log) unless $stderr.is_a? ReoxIO
-    end 
-
-    def self.restore_streams
-        $stdout = STDOUT if $stdout.is_a? ReoxIO
-        $stderr = STDOUT if $stderr.is_a? ReoxIO
-    end 
-
-    def self.setup_files
-        FILE_NAMES.map do |file_name|
-            setup_file(file_name)
-        end 
-    end
-
-    def self.setup_file(file_name)
-        file = ReoxFile.open(File.join(Dir.pwd,file_name),mode: 'a')
-        file.sync = true
-        file
+  FILE_NAMES = %w[output.log error.log].freeze
+  def self.record(opts = {})
+    hijack_streams(opts)
+    yield
+    restore_streams
+  end
+
+  def self.record!(opts = {})
+    hijack_streams(opts)
+  end
+
+  def self.stop!
+    restore_streams
+  end
+
+  private_class_method def self.hijack_streams(opts)
+    output_log, error_log = setup_files
+    $stdout = ReoxIO.new([STDOUT, output_log], opts.merge!(type: ReoxIO::OUT)) unless $stdout.is_a? ReoxIO
+    $stderr = ReoxIO.new([STDERR, error_log], opts.merge!(type: ReoxIO::ERR)) unless $stderr.is_a? ReoxIO
+  end
+
+  private_class_method def self.restore_streams
+    $stdout = STDOUT if $stdout.is_a? ReoxIO
+    $stderr = STDERR if $stderr.is_a? ReoxIO
+  end
+
+  private_class_method def self.setup_files
+    FILE_NAMES.map do |file_name|
+      setup_file(file_name)
     end
-end
+  end
+
+  private_class_method def self.setup_file(file_name)
+    file = ReoxFile.open(File.join(Dir.pwd, file_name), mode: 'a')
+    file.sync = true
+    file
+  end
+end

data/lib/reox_file.rb

@@ -1,2 +1,2 @@
-class ReoxFile < File 
-end
+class ReoxFile < File
+end

data/lib/reox_io.rb

@@ -1,28 +1,46 @@
 # Insipired from https://stackoverflow.com/a/6407200
+require 'logger'
 require_relative 'reox_file'
+
+# ReoxIO mimics the IO class for STDOUT and STDERR,
+# As well as injects the ReoxFile with logs
 class ReoxIO
-   $LOG_SEPARATOR = " --> ".freeze
-   def initialize(*streams)
-     @streams = streams
-     @verbose = true
-   end 
-
-   def write(*content)
-     @streams.each do |stream| 
-      if @verbose and stream.is_a? ReoxFile and not content.join.strip.empty?
-        stream.write([caller[2],$LOG_SEPARATOR,*content].join)
+  OUT = :out
+  ERR = :err
+
+  def initialize(streams, opts = {})
+    @streams = streams
+    @verbose = opts[:verbose] || false
+    @type = opts[:type] || OUT
+    @formatter = Logger::Formatter.new if @verbose
+  end
+
+  def write(*content)
+    @streams.each do |stream|
+      if @verbose && stream.is_a?(ReoxFile) && !content.join.strip.empty?
+        message = get_log_message(severity_level, caller(3..3).first, content.join)
+        stream.write(message)
       else
         stream.write(*content)
-      end    
-     end 
-   end
+      end
+    end
+  end
 
-   def flush
+  def flush
     @streams.each(&:flush)
-   end
+  end
+
+  def close
+    @streams.each(&:close)
+  end
+
+  private
+
+  def severity_level
+    @type == OUT ? :INFO : :ERROR
+  end
 
-   def close
-    @streams.each(&:close) 
-   end
-      
-end
+  def get_log_message(severity, progname, msg)
+    @formatter.call(severity, Time.now, progname, msg)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reox
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jatin Dhankhar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies: []
 description: A simple stream logger library
 email: jatin@jatindhankhar.in