logzomg 0.1.0.3.1 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3edce9006c7d9c5d0fb96daa8671efffd8693819
-  data.tar.gz: 177c2829fa844c7ce3cd52288b309281e34e183e
+  metadata.gz: 21f2c7611f4c1c92b251072d7e87d31d0cfae6fd
+  data.tar.gz: cdb1b149bd728805bab77d0e8b7aeb7247ce0f40
 SHA512:
-  metadata.gz: e79975670e86e61d65629da16c9bc4c85971e111ccf469e756a38873c0b4a1b6a8037eabd9fdebda2b18c72b571efa4fc705038dc29de5c9fb54251d6893b69d
-  data.tar.gz: 4f6872fa4d8085c88a5164cc64e62590fc578cf0dfe6588a9e086df0803b89628a1881452a743010b3c52b8df6dae853674424c413a29aa9c7b9e90a3acbc268
+  metadata.gz: 223066806ccaad8d66b95bd351f7dad256d30a34eb376de2d200b51c91caaf8aa7bf8f11d0b95f2da2edde044713def5ebfc6d8711905e2d40bf02a2ac10e7e3
+  data.tar.gz: 26adc2ac570d79416e88c36f853f0a34f7c5eb7e3e0e955dbd6346b50346697b810e2bb9d63d5a327e56633064bb78f78b48e6eadd01684308a7b3909b884406

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 /logs/
+
+/logzomg-*/

data/lib/formatters/text_formatter.rb

@@ -1,8 +1,5 @@
 require 'date'
 
-# Default TextFormatter for logzomg.rb
-# Allows color output to logfile
-
 class TextFormatter
   MAX_CHAR = 150
   MAX_CHAR_FLOAT = 145.00   # There's some problems with float decimal precision. Keep this 5 below MAX_CHAR
@@ -26,90 +23,49 @@ class TextFormatter
   # Prepend level. Append DateTime
   def format_msg(hash, level)
     @level = level                                        # Log level
-    str = ""                                              # Final String we return. This is the one we add to
-    str_keys_values = ""                                  # One long String in format "key: value  | key2: value2"
-    s_msg = []                                            # Each index in this Array is the maximum allowed amount of chars on the screen
-    
-    str_keys_values += hash[:msg].to_s + "  |  "          # Add msg first
-
-    # We loop over every key in the hash and format the key/value in the string format we want    
-    hash.each do |key, value|
-      if !key.to_s.eql?("level") && !key.to_s.eql?("msg") && !key.to_s.eql?("file")
-        key = "#{add_color_key(key)} :" if with_color     # Add color to keys if with_color is set to true
-        str_keys_values += "#{key}: #{value}  "
-      end
-    end
-
-    s_msg = split_msg(str_keys_values)                    # Split message incase it's MAX_CHAR+ chars
-
+    str = ""                                              # Final String we return. We keep appending to this
     count = 0                                             # Use to indent on 2nd+ iteration
 
+    str_keys_values = add_key_values_to_str(hash)
+    s_msg           = split_msg(str_keys_values)          # Split message incase it's MAX_CHAR+ chars
+
     s_msg.each do |n|
-      str += add_msg_identifier(str)
-      text = count >= 1 ? " " + n : n                     # Indent if 2nd+ iteration
-      str += text
-      indented = count >= 1                               # Set indented to determine space amount
-      str += right_align_date(n, hash, count+1, s_msg)
-      str += " | " + add_date(count) + "\n"
+      str += count == 0 ? "#{add_log_level(str)}#{get_date} | " : "#{add_log_level(str)}"
+      str += count == 0 ? "#{n}\n" : " " * (get_date.length) + " | #{n}\n" # Indent if 2nd+ iteration
       count += 1
     end
-    
     str
   end
 
-
   private
-    def add_date(count)
+    def get_date
       date = short_date ? DateTime.now.strftime('%b-%e %H:%M:%S') : DateTime.now.to_s
-      count > 0 ? "" : date
     end
 
-    # Adds spaces to right align date depending on str length and row number
-    # 
-    # Since we add colouring to each key we're adding invisible characters
-    # Each colour adds 9 extra characters so we have to handle this
-    def right_align_date(msg, hash, itr, full_msgs)
-      extra = 0
-      # If msg is first don't right_align since there's always a line 2
-      if with_color
-        if msg == full_msgs.first && full_msgs.size > 1     # Triggers on first line of multiline
-          extra = 0
-        elsif itr == 1                                      # Triggers on first itr if it's one-line with args
-          extra = 9 * get_size(hash)
-        elsif itr == full_msgs.length && get_size(hash) > 0 # Triggers on last line of multiline msg
-          extra = 9
-        end
-      end
-
-      s = itr > 1 ? MAX_CHAR - 2 : MAX_CHAR - 1
-      " " * (s - msg.length + extra)
-    end
+    # Creates a string with format "msg: "Blabla" | key: value  key2: value2" we can split into array indices afterwards
+    def add_key_values_to_str(hash)
+      str_keys_values = ""                                # One long String in format 
 
-    # Returns size but without certain keys that wont be displayed
-    def get_size(hash)
-      size = 0
-      hash.keys.each do |n|
-        size += 1 unless n.to_s.eql?("file") || n.to_s.eql?("level") || n.to_s.eql?("msg")
+      str_keys_values += hash[:msg].to_s + " | "          # Add msg first
+      # We loop over every key in the hash and format the key/value in the string format we want    
+      hash.each do |key, value|
+        if !key.to_s.eql?("level") && !key.to_s.eql?("msg") && !key.to_s.eql?("file")
+          key = "#{add_color_key(key)}" if with_color     # Add color to keys if with_color is set to true
+          str_keys_values += "#{key}: #{value}  "
+        end
       end
-      size
+      str_keys_values
     end
 
     # Adds log level to start of log
     # Add color if color is true
-    def add_msg_identifier(str)
+    def add_log_level(str)
       # Need a check since debug has a different identifier than the rest
       str = @level == 'debug' ? 'DBUG' : @level[0..3].upcase
-      str = add_color_level(str) if with_color
+      str = add_color_key(str) if with_color
       str += + " | "
     end 
 
-    # Adds color to level if color is true
-    def add_color_level(str)
-      close_color = "\e[0m"
-      str.prepend("\033[" + COLORS[@level.to_sym] + "m")
-      str += close_color
-    end
-
     # Adds color to hash key
     def add_color_key(key)
       "\033[" + COLORS[@level.to_sym] + "m" + key.to_s + "\e[0m"
@@ -120,6 +76,6 @@ class TextFormatter
     def split_msg(msg)
       sub_end = MAX_CHAR - 5
       # Goes back to start of word if matches inside a word. If it matches inside a coloured key go back to start of word before colour
-      msg.scan(/.{0,#{Regexp.escape(sub_end.to_s)}}[^\\033\[33m\]a-z\\e\[0m$a-z.!?,;](?:\b|$)/mi)
+      msg.scan(/.{0,#{Regexp.escape(sub_end.to_s)}}[^\\033\[0-90-9m\]\w\\e\[0m:\$](?:\ |$)/mi)
     end 
 end

data/lib/logzomg/version.rb

@@ -1,3 +1,3 @@
 module Logzomg
-  VERSION = "0.1.0.3.1"
+  VERSION = "0.1.0.4"
 end

data/lib/logzomg.rb

@@ -12,8 +12,7 @@ module Logzomg
     attr_accessor :log_path
 
     def initialize(**args, &block)
-      # Set some default values
-      @log_path = File.expand_path(get_path + '/log/')
+      @log_path = File.expand_path('../../logs/', __FILE__)
       @level = args[:level] ? args[:level] : "warning"
       @formatter = args[:formatter] ? args[:formatter] : TextFormatter.new {|f| f.with_color = true}
       if block_given?
@@ -60,6 +59,9 @@ module Logzomg
                 "felis sit amet luctus vehicula, sapien est dictum lorem, nec blandit nunc mi id enim. Curabitur quis laoreet erat. Maecenas varius cursus blandit." + 
                 "Aliquam eleifend mauris ut nisl mollis, quis placerat nisi bibendum.",
                 long:     true,
+                what:     true,
+                bugged:   false,
+                nigga:    "what",
                 level:    "debug"
               })
       self.log({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logzomg
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3.1
+  version: 0.1.0.4
 platform: ruby
 authors:
 - Rasmus
@@ -73,6 +73,8 @@ files:
 - lib/logzomg/version.rb
 - logzomg-0.1.0.1.gem
 - logzomg-0.1.0.2.gem
+- logzomg-0.1.0.3.1.gem
+- logzomg-0.1.0.3.gem
 - logzomg-0.1.0.gem
 - logzomg.gemspec
 homepage: https://github.com/Evilbits/logzomg