rumbrl 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ed542d2cf2c1f5c60ace389fc31b6a1193f3b4
-  data.tar.gz: 56739345db59ef3d3f9099da0b5a1690a6f24a4f
+  metadata.gz: 03e831d9e6274fc66ee8ea2b21ee5c587ca15873
+  data.tar.gz: 6683cc58b620f25cd70fa7c0eaff2bbd862503ac
 SHA512:
-  metadata.gz: 9f8e21cfb001c4b183cffc44037fc65958b0cdb350bac281c18524b86ad6029c4da9caf18ed79953b5da88a60bf2917c3091fe2ae4addc8be25ecf0f25730199
-  data.tar.gz: 83593613546ba256221a364cb5dece3c7605eca8b0e1b17a4b676933a3a91dfb5ef03debd6fc5c94de6ed5fd424ff5f695f415b2d093bbf5425c12de97c9e1fc
+  metadata.gz: 9d825450fe6a0272312f35a0220b6f88f92f1bfec062a9ad0a1612f5a11e68cacf3acabc8fc2e40748513f2976a94277047b83043f23c6a253a9f50aa0f232b4
+  data.tar.gz: 7a639eb992efe00f05a819c010a233e5b52fd19fbf086386e134ff85a30264b8803a80ab6fc1fa482510c227e3d82b1e3814d4a3fc7a69e46990543c5f4db71f

data/.rubocop.yml

@@ -0,0 +1,3 @@
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 15

data/lib/rumbrl/env.rb

@@ -17,8 +17,12 @@ module Rumbrl
       ENV.fetch('LOG_TIME_FORMAT', '[%F %T %z]')
     end
 
-    def self.log_format
+    def self.data_format
       ENV.fetch('LOG_DATA_FORMAT', '[%s] [%s]')
     end
+
+    def self.log_format
+      ENV.fetch('LOG_FORMAT', nil)
+    end
   end
 end

data/lib/rumbrl/factory.rb

@@ -6,7 +6,7 @@ module Rumbrl
   # broken regulations & underaged workers abound
   class Factory
     attr_reader :dest, :name
-    attr_accessor :size, :age, :level, :log_format, :time_format
+    attr_accessor :size, :age, :level, :log_format, :data_format, :time_format
 
     def self.create(nm, path: nil, age: nil, size: nil, level: nil)
       new(nm, path: path, age: age, size: size, level: level).generate
@@ -15,6 +15,7 @@ module Rumbrl
     def initialize(nm, path: nil, age: nil, size: nil, level: nil)
       @name = nm
       @log_format = Env.log_format
+      @data_format = Env.data_format
       @time_format = Env.time_format
       @size ||= (size || Env.shift_size)
       @age ||= (age || Env.shift_age)
@@ -30,7 +31,7 @@ module Rumbrl
     private
 
     def generate_logger
-      logger = Log.new(dest, age, size, log_format)
+      logger = Log.new(dest, age, size, data_format, log_format)
       logger.level = level
       logger.datetime_format = time_format
       logger

data/lib/rumbrl/log.rb

@@ -11,6 +11,7 @@ module Rumbrl
     attr_reader :logger, :data_format
 
     def_delegators :logger,
+                   :datetime_format,
                    :datetime_format=,
                    :level=,
                    :log,
@@ -19,9 +20,11 @@ module Rumbrl
                    :fatal?,
                    :info?
 
-    def initialize(path, age, size, data_format)
+    def initialize(path, age, size, data_format, log_format = nil)
       @logger = ::Logger.new(log_file(path), shift_age: age, shift_size: size)
       @data_format = data_format
+
+      @logger.formatter = log_formatter(log_format) if log_format
     end
 
     def method_missing(name, *args)
@@ -45,5 +48,25 @@ module Rumbrl
     def format_message(message, data)
       sprintf @data_format, message, data
     end
+
+    def log_formatter(log_format)
+      proc do |severity, datetime, progname, message|
+        datetime = datetime.strftime(datetime_format) if datetime_format
+
+        values = {
+          severity: severity,
+          datetime: datetime,
+          pid: Process.pid,
+          progname: progname,
+          message: message
+        }
+
+        values.each do |k, v|
+          log_format = log_format.gsub(/%#{k.to_s}%/, v.to_s)
+        end
+
+        "#{log_format}\n"
+      end
+    end
   end
 end

data/lib/rumbrl/version.rb

@@ -2,5 +2,5 @@
 
 # version const for gem
 module Rumbrl
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/spec/rumbrl/log_spec.rb

@@ -1,13 +1,18 @@
 require_relative '../spec_helper'
 
+# message is a regex string
+def default_log_string(message)
+  datetime = Time.now.strftime('%Y-%m-%dT%H:%M:%S.')
+  message = 'message \["data"\]'
+  /I, \[#{datetime}[0-9]+ ##{Process.pid}\]  INFO -- : #{message}\n/
+end
+
 describe Rumbrl::Log do
   let(:log) { Rumbrl::Log.new 'path/to/log', 'weekly', 123, '%s %s' }
-  let!(:logger_double) { double }
 
   before(:each) do
-    allow(logger_double).to receive(:level=)
-    allow(logger_double).to receive(:datetime_format=)
-    allow(::Logger).to receive(:new).and_return logger_double
+    allow_any_instance_of(Logger::LogDevice).to receive(:write)
+
     # TODO: make this...less hacky
     allow(::File).to receive(:open).and_return(STDOUT)
   end
@@ -38,10 +43,42 @@ describe Rumbrl::Log do
           .to raise_error(RuntimeError, /message and data/)
       end
 
-      it 'does things woo' do
-        expect(logger_double).to receive(:info)
+      it 'logs correctly using default log_format' do
+        expect_any_instance_of(Logger::LogDevice)
+          .to receive(:write).with(default_log_string('message \["data"\]'))
+
+        log.info('message', ['data'])
+      end
+
+      it 'logs correctly using custom log_format' do
+        log = Rumbrl::Log.new('path/to/log', 'weekly', 123,
+                              '%s %s', '%severity% %message%')
+
+        expected_string = "INFO message [\"data\"]\n"
+
+        expect_any_instance_of(Logger::LogDevice)
+          .to receive(:write).with(expected_string)
+
         log.info('message', ['data'])
       end
+
+      it 'logs correctly with custom datetime and custom log_format' do
+        allow(ENV).to receive(:fetch).and_call_original
+        allow(ENV).to receive(:fetch)
+          .with('LOG_TIME_FORMAT', anything).and_return('[%F]')
+        allow(ENV).to receive(:fetch)
+          .with('LOG_FORMAT', anything).and_return('%datetime% %message%')
+
+        log = Rumbrl::Factory.create('STDOUT')
+
+        datetime = Time.now.strftime('%Y-%m-%d')
+        expected_string = "[#{datetime}] [message] [data]\n"
+
+        expect_any_instance_of(Logger::LogDevice)
+          .to receive(:write).with(expected_string)
+
+        log.info('message', 'data')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rumbrl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - chr0n1x
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .ruby-version
 - .singularityrc
 - Gemfile