dldinternet-mixlib-logging 0.4.3 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2M2MzFmNWY5ZWY4ZTkxYzU3Y2NlZDk2NjcxOGExNmEwYTYzMzc2OQ==
+    NzM1ZTA1NTdkOTI1ZjIwOTdmMTVhZDAzYzg3ZGE4OGY4MWJjYjM5ZQ==
   data.tar.gz: !binary |-
-    Zjg4ZjlkZmVmZmM2M2M5NjZkYjdlYzE4ODdhYTI0YmNkMGQwODE5Nw==
+    YjEwN2M3OGQ5YjRmMGIyZDBmOWE4YTlmNWYwYTYzZDhlMjAyNTU2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MWQ5OGZlZjExMWNiMzNmNmQ2MDZjN2M5OGJiZjI4NDNlZDQ1MTdjNWRlOTE4
-    ZjU0MzBkNzdlMTIwMjIyMGZjNjk1MmJhM2IzOGZkYzI3YTMwMWQzMjQxMzY5
-    MWY0YTU5YTYzMGQ1NzllODkzMWJhMjU4OGRhNGFmZGI0MmFjMGM=
+    MzZkY2I2MDA4MWIwMDU0NDJlYmE0ZGJiYmIzZTIzMmQ1MzEyZDgxNTBiZWIx
+    NzViNzI4MjcwODM5MTM1NGQzMDA5Yzc2M2RiOWZjZDQ0OGUyMzc5ZjI1OGRl
+    NjA4YjU3MThkOGRlMDA0MGYzYjk4NGEwNmQ1M2E5ZDVhNzRhNDY=
   data.tar.gz: !binary |-
-    YzQ2Y2E5ZjAwYzQyZDFlZjY0ZjhiNTRkYmU3ZGY5NjkzNDM2YmVmMWUyNTI1
-    ZjE2N2JiMjQyYjUzOGMzMmFhZDM5ZjIwYjI1MjZjZmFhZThmMGVmMWY2ZGVh
-    YjA3YmU1Y2Q5OGY4NDNiYTBkMjEyN2M3Nzc0NTA0NzE3NTQwN2U=
+    MGYyZTFiNGJlMjAzNjQ2NjgwMDBjZTU0MGUyYzIxZTQ1ZjYwN2M2YTQ0ZGFk
+    NTkxZjY4ODgzZjRlMTM2MGU2Y2IzMGYzZGM3NTFhMzVmNTc3OWZiMzhiYzI1
+    NDE5NjZmMWEzMjhlZGYzMTMwZGUwODU5MjUzMDVjZmQ2YTIxMmI=

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    dldinternet-mixlib-logging (0.5.0)
+      logging (~> 2.0, >= 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    cucumber (0.10.7)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.2.5)
+    gherkin (2.4.21)
+      json (>= 1.4.6)
+    json (1.8.1)
+    little-plugger (1.1.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    multi_json (1.11.2)
+    rake (10.3.2)
+    rubygems-tasks (0.2.4)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    tins (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.2)
+  cucumber (~> 0.10, >= 0.10.2)
+  dldinternet-mixlib-logging!
+  rake (~> 10.0)
+  rubygems-tasks (~> 0.2)
+
+BUNDLED WITH
+   1.11.2

data/dldinternet-mixlib-logging.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'logging', '~> 1.8', '>= 1.8.2'
+  gem.add_dependency 'logging', '~> 2.0', '>= 2.0.0'
 
   gem.add_development_dependency 'bundler', '~> 1.2'
   gem.add_development_dependency 'rake', '~> 10.0'

data/lib/dldinternet/mixlib/logging.rb

@@ -160,41 +160,43 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                 logger
               end
 
-              # Overrides the new method such that only one Logger will be created
-              # for any given logger name.
-              #
-              def new( *args )
-                return super if args.empty?
-
-                repo = ::Logging::Repository.instance
-                name = repo.to_key(args.shift)
-                opts = args.last.instance_of?(Hash) ? args.pop : {}
-
-                @mutex.synchronize do
-                  logger = repo[name]
-                  if logger.nil?
-
-                    master = repo.master_for(name)
-                    if master
-                      if repo.has_logger?(master)
-                        logger = repo[master]
-                      else
-                        logger = super(master)
-                        repo[master] = logger
-                        repo.children(master).each {|c| c.__send__(:parent=, logger)}
-                      end
-                      repo[name] = logger
-                    else
-                      logger = super(name, opts)
-                      repo[name] = logger
-                      repo.children(name).each {|c| c.__send__(:parent=, logger)}
-                    end
-                  end
-                  logger
-                end
-              end
-
-            end
+							unless ::Logging::VERSION =~ /^2/
+								# Overrides the new method such that only one Logger will be created
+								# for any given logger name.
+								#
+								def new( *args )
+									return super if args.empty?
+
+									repo = ::Logging::Repository.instance
+									name = repo.to_key(args.shift)
+									opts = args.last.instance_of?(Hash) ? args.pop : {}
+
+									@mutex.synchronize do
+										logger = repo[name]
+										if logger.nil?
+
+											master = repo.master_for(name)
+											if master
+												if repo.has_logger?(master)
+													logger = repo[master]
+												else
+													logger = super(master)
+													repo[master] = logger
+													repo.children(master).each {|c| c.__send__(:parent=, logger)}
+												end
+												repo[name] = logger
+											else
+												logger = super(name, opts)
+												repo[name] = logger
+												repo.children(name).each {|c| c.__send__(:parent=, logger)}
+											end
+										end
+										logger
+									end
+								end
+
+							end
+						end
 
             # call-seq:
             #    Logger.new( name )
@@ -282,6 +284,12 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                 'x' => :ndc,
             }.freeze
 
+            if ::Logging::VERSION =~ /^2/
+							class FormatMethodBuilder
+								DIRECTIVE_TABLE = ::Logging::Layouts::Pattern::DIRECTIVE_TABLE
+								COLOR_ALIAS_TABLE = ::Logging::Layouts::Pattern::COLOR_ALIAS_TABLE
+							end
+						end
           ensure
             $VERBOSE = verbose
           end
@@ -485,7 +493,11 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                 logger.add_appenders appender
 
                 logger.level = args[:log_level] ? args[:log_level] : :warn
-                logger.trace = true if args[:trace]
+								unless ::Logging::VERSION =~ /^2/
+									logger.trace = true if args[:trace]
+								else
+									logger.caller_tracing = true if args[:trace]
+								end
                 @logger_args = args
               rescue Gem::LoadError
                 logger = FakeLogger.new

data/lib/dldinternet/mixlib/logging/version.rb

@@ -2,7 +2,7 @@ module Dldinternet
   module Mixlib
     module Logging
       # dldinternet-mixlib-logging version
-      VERSION = '0.4.3'
+      VERSION = '0.5.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dldinternet-mixlib-logging
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ files:
 - .gitignore
 - ChangeLog.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A logging mixlib