zlog 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0874b0c865dbecbde95076b656da15049f7f5b
-  data.tar.gz: 01ee824593c7c3e6d13bb0cce36b68b9b3a347c6
+  metadata.gz: 09e454b71eb8ad7237defaeebfb4c5a04ed1e4c1
+  data.tar.gz: c634bc81b2f2242fa3511a8164712480edcf7661
 SHA512:
-  metadata.gz: a6c09ba6d320c44e90d83042c4f7bb8b0aa5a0e889ef6726347bfd4d2b45fb289891878eb082f50a8dba32ec1c5c5ac52c187064d47d1e81f53daffd3053c663
-  data.tar.gz: 95808d8600e37ef8eefb302b36ca787a9fea72d133f0c5086476f74c7c7648c5a0502e9d3d30a6a157c665781cd6f6d95960b5bd36293c8b6bfb4c878f2fa1bd
+  metadata.gz: 594b912a1186fab36e5b40f9c2b24f19528cdb4d6c7ab33fbb835cb9bb526542649e48994f838b24917268316e577d7867d93cf293b27c9901fc497ee3f892b2
+  data.tar.gz: 9675234eacea1b2939be8841818237ce67f8fefa5470d892e4b9a065325e20ded7687a89810b20cd93f747fdec198c5d2d5c8e11d9b27a60f979011b3bd2a367

data/.gitignore

@@ -1,3 +1,2 @@
-*.gem
 experiments
 Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7
+
+* improvement: correctly ordered log levels (now: ... warn ok section error ...)
+* bugfix: don't set root log level when initializing stdout logger; make sure logging to other appenders is not affected here
+* bugfix: prevent duplicate entries of stdout appender + prevent removal of other appenders when initializing zlog stdout
+
 ## 0.6
 
 * improvement: fixed versions of gem file dependencies

data/README.md

@@ -15,6 +15,12 @@ Logging configuration on top of ruby's `logging` gem (see [github](https://githu
 
 # installation
 
+From rubygems:
+
+    gem install zlog
+
+From source:
+
     gem build *.gemspec && gem install *gem
 
 # example

data/example/example.file.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require_relative '../lib/zlog'
+
+FILENAME = 'example.file.log'
+
+# configure logging to stdout, so we see what's going on
+Zlog::init_stdout loglevel: :info
+
+# configure file appender
+Logging.appenders.rolling_file(
+  FILENAME,
+  age: 'daily',
+  layout: Logging.layouts.json,
+  loglevel: :debug
+)
+Logging.logger.root.add_appenders FILENAME
+
+# add some log entries
+log1 = Logging.logger['Log1-debug']
+log2 = Logging.logger['Log2-info']
+log3 = Logging.logger['Log3-warn++']
+
+log1.debug "debugging info, this won't show up on console"
+log2.info "writing some info"
+log3.warn "warn me, we are getting close"
+log3.error "error! nah, kidding"
+log3.ok "finished with example"
+
+# read back the file to stdout
+puts "\n> cat #{FILENAME}"
+puts File::read(FILENAME)

data/lib/zlog/logging.rb

@@ -2,8 +2,6 @@
 # http://stackoverflow.com/questions/2281490/how-to-add-a-custom-log-level-to-logger-in-ruby
 module Logging
   class Logger
-    def ok msg;       add 5, msg    end
-    def section msg;  add 6, msg    end
     def abort msg, exit_code = 1
       fatal msg
       exit exit_code
@@ -15,3 +13,5 @@ module Logging
 
   end
 end
+
+Logging.init :debug, :info, :warn, :ok, :section, :error, :fatal

data/lib/zlog/simple_layouts.rb

@@ -56,16 +56,16 @@ module Zlog::Layouts::SimpleCore
 
   # standard order: ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"]
 
-  LOGLEVEL2NAME = [:debug, :info, :warning, :error, :fatal, :ok, :section]
+  LOGLEVEL2NAME = [:debug, :info, :warning, :ok, :section, :error, :fatal]
 
   STDOUT_PATTERN_NOCOLORS = {
     :debug    => ".. %s",
     :info     => "-- %s",
     :warning  => "ww %s",
-    :error    => "ee %s",
-    :fatal    => "ff %s",
     :ok       => "++ %s",
     :section  => "\n== %s",
+    :error    => "ee %s",
+    :fatal    => "ff %s",
     :name     => "%s: "
   }
 
@@ -73,10 +73,10 @@ module Zlog::Layouts::SimpleCore
     :debug   => "\033[37m.. %s\033[0m",
     :info    => "\033[0m-- %s\033[0m",
     :warning => "\033[1;33mww %s\033[0m",
-    :error   => "\033[1;31mee %s\033[0m",
-    :fatal   => "\033[1;41mff\033[0m\033[1;31 %s\033[0m",
     :ok      => "\033[1;32m++ %s\033[0m",
     :section => "\n\033[1;34m== %s\033[0m",
+    :error   => "\033[1;31mee %s\033[0m",
+    :fatal   => "\033[1;41mff\033[0m\033[1;31 %s\033[0m",
     :name    => "\033[37m%s: "
   }
 
@@ -84,10 +84,10 @@ module Zlog::Layouts::SimpleCore
     :debug   => "\033[38;5;246m.. %s\033[0m",
     :info    => "\033[38;5;255m-- %s\033[0m",
     :warning => "\033[38;5;226mww %s\033[0m",
-    :error   => "\033[38;5;196mee %s\033[0m",
-    :fatal   => "\033[48;5;196mff\033[0m\033[38;5;196m %s\033[0m",
     :ok      => "\033[38;5;46m++ %s\033[0m",
     :section => "\n\033[38;5;33m== %s\033[0m",
+    :error   => "\033[38;5;196mee %s\033[0m",
+    :fatal   => "\033[48;5;196mff\033[0m\033[38;5;196m %s\033[0m",
     :name    => "\033[38;5;246m%s: "
   }
 end
@@ -119,4 +119,4 @@ module Zlog::Layouts
       format_simple event, true
     end
   end
-end
+end

data/lib/zlog/zlog.rb

@@ -1,11 +1,16 @@
 module Zlog
-  VERSION = "0.6"
+  VERSION = "0.7"
 
   def self.init_stdout opts = {named: false, loglevel: nil}
-    Logging.logger.root.appenders = Logging.appenders.stdout(
+    # configure the default stdout appender
+    Logging.appenders.stdout(
       level: opts[:loglevel],
       layout: (opts[:named]) ? Zlog::Layouts.named : Zlog::Layouts.simple
-      )
-    Logging.logger.root.level = opts[:loglevel] if not opts[:loglevel].nil?
+    )
+    # find all non-stdout appenders
+    # this prevents duplicates of stdout appender
+    as = Logging.logger.root.appenders.find_all{|i| i.name != "stdout" }
+    # add back all appenders + our own stdout appender
+    Logging.logger.root.appenders = as + ["stdout"]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zlog
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -37,8 +37,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/example.file.rb
 - example/example.output.png
-- example/example.rb
+- example/example.simple+stdout.rb
 - lib/zlog.rb
 - lib/zlog/layouts.rb
 - lib/zlog/logging.rb