slog 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807f84e2e864292179810e7450ac37696a2f5f16
-  data.tar.gz: a788a44e6f8d9bff31b07c8d99524345662cb795
+  metadata.gz: 28b7cbba69916bb491bcd136723d67836a96f3d1
+  data.tar.gz: 0e6c43f58208fc56a01870f1e0afc0cafe40967d
 SHA512:
-  metadata.gz: 8403f63e3dcfd2ffdc5837933884ae6bc85ab22853e7ae1e5ff731c7548dfd901ff90a684f3e2e18e370d9937bc7bd4edd4d6dd8c950ca709795d2d7824328fb
-  data.tar.gz: acaf99f7d3cc3732b0b9a276f91e6c4279dcc4bf2ac5952592abdfe301ac2e884bf9e059c5430f7b5c2cb5eb76b6cce11202fef3ae28cb656c1af69443d71af2
+  metadata.gz: 15d26360ccbb40a3c116a99138d43692708809cceb018397aa73b175d6ee719e8529d3094f8ba2911c1eecb8f5e8a2e12f467cfe51db1d84006f96a6dc954eee
+  data.tar.gz: 067230f49eba3e25075c1f9453f7fad893929bf140295468f2440105a01d0700ea8488ee07abaaa62d24df2d1abfb16f79248a84a871ffbefc443d05b5b80bdb

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/slog/logger.rb

@@ -34,38 +34,48 @@ module Slog
     # A little different than the canonical Logger. Add options to set the
     # log level and to disable both colorization and pretty JSON output. In
     # this form, it's perfect for use with either Logstash or Franz.
-    def initialize \
-      out: $stdout,                     # Output handle
-      shift_age: 7,                     # Max seven logs
-      shift_size: 1_048_576,            # 1024 KiB
-      colorize: true,                   # Disable for files
-      prettify: true,                   # Disable for files
-      level: :info,                     # INFO
-      level_transform: 'downcase',      # Any String method
-      level_field: 'level',             # nil to disable
-      message_field: 'message',         # nil to disable
-      timestamp_field: '@timestamp',    # nil to disable
-      timestamp_format: '%FT%T.%3N%:z', # ISO-8601
-      color_map: {
-        'debug' => [ :blue,    :default ],
-        'info'  => [ :green,   :default ],
-        'warn'  => [ :yellow,  :default ],
-        'error' => [ :red,     :default ],
-        'fatal' => [ :red,     :black   ],
-        'trace' => [ :magenta, :default ]
+    def initialize conf={}
+      defaults = {
+        out: $stdout,                     # Output handle
+        shift_age: 7,                     # Max seven logs
+        shift_size: 1_048_576,            # 1024 KiB
+        colorize: nil,                    # nil to guess
+        prettify: nil,                    # nil to guess
+        level: :info,                     # INFO
+        level_transform: 'downcase',      # Any String method
+        level_field: 'level',             # nil to disable
+        message_field: 'message',         # nil to disable
+        timestamp_field: '@timestamp',    # nil to disable
+        timestamp_format: '%FT%T.%3N%:z', # ISO-8601
+        color_map: {
+          'debug' => [ :blue,    :default ],
+          'info'  => [ :green,   :default ],
+          'warn'  => [ :yellow,  :default ],
+          'error' => [ :red,     :default ],
+          'fatal' => [ :red,     :black   ],
+          'trace' => [ :magenta, :default ]
+        }
       }
 
-      @prettify = prettify
-      @colorize = colorize
-      @color_map = color_map
-      @level_field = level_field
-      @level_transform = level_transform
-      @message_field = message_field
-      @timestamp_field = timestamp_field
-      @timestamp_format = timestamp_format
-
-      super out, shift_age, shift_size
-      self.level = level
+      conf = defaults.merge(conf)
+
+      begin
+        conf[:colorize] = true if conf[:out].tty? && conf[:colorize].nil?
+        conf[:prettify] = true if conf[:out].tty? && conf[:prettify].nil?
+      rescue NoMethodError
+      end
+
+      @prettify = conf[:prettify]
+      @colorize = conf[:colorize]
+      @color_map = conf[:color_map]
+      @level_field = conf[:level_field]
+      @level_transform = conf[:level_transform]
+      @message_field = conf[:message_field]
+      @timestamp_field = conf[:timestamp_field]
+      @timestamp_format = conf[:timestamp_format]
+
+      super conf[:out], conf[:shift_age], conf[:shift_size]
+      self.level = conf[:level]
 
       set_formatter
     end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: slog
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sean Clemmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: colorize
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy structured logging.
@@ -30,8 +30,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
+- .gitignore
+- .rubocop.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -47,24 +47,24 @@ homepage: https://github.com/sczizzo/slog
 licenses:
 - ISC
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.6
+signing_key:
 specification_version: 4
 summary: Easy structured logging
 test_files: