dldinternet-mixlib-logging 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de70e2156d7330fd40ff51687330b6acb53f47cd
-  data.tar.gz: 8538aac83f7b4ac5fc9ef7642addc6572022f4ce
+  metadata.gz: 06540317c3726c6cd8c4f950e5c26c46d28ff911
+  data.tar.gz: e2fcfbb530dfbbdd2d1c072c11b4a407fcbdf3af
 SHA512:
-  metadata.gz: 159ec14f195865bfe714fd25efd0ed840db58296be515a3153f99fa7c3ae7498ba705e244b3d50ef956acc89654bdcc8f257cb711712df847e04f0ba0e536682
-  data.tar.gz: f6c011bc44053550a4a3aeae12f1caeac2d3fcc9130c081bba4c2fc0a1fdaa6107ed4c698720a52ba3a618f5ea608c10a991fc0f3755e3bbc8a1c40674684c83
+  metadata.gz: 24c9f36d1993e6ebfda6db35a4a0cc1328238dbb4fbd94717d5e1fa1f3c7fd0e9a649e181915b76274ac3894fdfcd61c1faef8ac04458a3c24fe0b7184e0b780
+  data.tar.gz: de0b90da8a130ec58bb478dd97733b69e02e451f5976ce4204ecb4b5aecbc8e54a67d5eeb4470d043ac1a89f4d5348e24a23fd7e607c1aae3a995a1cfbc2c746

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    dldinternet-mixlib-logging (0.6.2)
-      logging (~> 2.0, >= 2.0.0)
+    dldinternet-mixlib-logging (0.7.0)
+      logging (~> 2.1, >= 2.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
       json (>= 1.4.6)
     json (2.0.2)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.2.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     multi_json (1.12.1)
@@ -40,4 +40,4 @@ DEPENDENCIES
   rubygems-tasks (~> 0.2)
 
 BUNDLED WITH
-   1.12.5
+   1.14.4

data/atlassian-ide-plugin.xml

@@ -0,0 +1,5 @@
+<atlassian-ide-plugin>
+  <project-configuration id="1">
+    <servers id="2" />
+  </project-configuration>
+</atlassian-ide-plugin>

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', '~> 2.0', '>= 2.0.0'
+  gem.add_dependency 'logging', '~> 2.1', '>= 2.1.0'
 
   gem.add_development_dependency 'bundler', '~> 1.2'
   gem.add_development_dependency 'rake', '~> 10.0'

data/lib/dldinternet/mixlib/logging.rb

@@ -115,6 +115,65 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
 
           end
 
+          major, minor, release, *other = ::Logging::VERSION.split '.'
+
+          if major.to_i >= 2 && minor.to_i <= 1 || major.to_i < 2
+            # This class defines a logging event.
+            #
+            remove_const :LogEvent if defined? :LogEvent
+            ::Logging::LogEvent = Struct.new( :logger, :level, :data, :time, :file, :line, :method ) {
+              # :stopdoc:
+              class << self
+                attr_accessor :caller_index
+
+                # Regular expression used to parse out caller information
+                #
+                # * $1 == filename
+                # * $2 == line number
+                # * $3 == method name (might be nil)
+                # CALLER_RGXP = %r/([-\.\/\(\)\w]+):(\d+)(?::in `([^']+)')?/o
+                #CALLER_INDEX = 2
+                # CALLER_INDEX = ((defined? JRUBY_VERSION and JRUBY_VERSION > '1.6') or (defined? RUBY_ENGINE and RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
+                # :startdoc:
+              end
+
+              # call-seq:
+              #    LogEvent.new( logger, level, [data], trace )
+              #
+              # Creates a new log event with the given _logger_ name, numeric _level_,
+              # array of _data_ from the user to be logged, and boolean _trace_ flag.
+              # If the _trace_ flag is set to +true+ then Kernel::caller will be
+              # invoked to get the execution trace of the logging method.
+              #
+              def initialize( logger, level, data, trace )
+                f = l = m = ''
+
+                if trace
+                  stack = Kernel.caller[::Logging::LogEvent.caller_index]
+                  return if stack.nil?
+
+                  match = CALLER_RGXP.match(stack)
+                  f = match[1]
+                  l = Integer(match[2])
+                  m = match[3] unless match[3].nil?
+                end
+
+                super(logger, level, data, Time.now, f, l, m)
+              end
+            }
+            ::Logging::LogEvent.caller_index = ::Logging::CALLER_INDEX
+          elsif major.to_i >= 2 && minor.to_i == 2
+            class ::Logging::LogEvent
+              # :stopdoc:
+              class << self
+                attr_accessor :caller_index
+              end
+            end
+            ::Logging::LogEvent.caller_index = ::Logging::LogEvent::CALLER_INDEX
+          else
+            raise "Unexpected Logging package version: #{::Logging::VERSION}"
+          end
+
           class ::Logging::ColorScheme
             def scheme(s=nil)
               @scheme = s if s
@@ -374,55 +433,6 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
           end
         end
 
-        module ::Logging
-
-          # This class defines a logging event.
-          #
-          remove_const :LogEvent if defined? :LogEvent
-          LogEvent = Struct.new( :logger, :level, :data, :time, :file, :line, :method ) {
-            # :stopdoc:
-            class << self
-              attr_accessor :caller_index
-            end
-
-            # Regular expression used to parse out caller information
-            #
-            # * $1 == filename
-            # * $2 == line number
-            # * $3 == method name (might be nil)
-            # CALLER_RGXP = %r/([-\.\/\(\)\w]+):(\d+)(?::in `(\w+)')?/o
-            # CALLER_INDEX = ((defined? JRUBY_VERSION and JRUBY_VERSION > '1.6') or (defined? RUBY_ENGINE and RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
-            # :startdoc:
-
-            # call-seq:
-            #    LogEvent.new( logger, level, [data], trace )
-            #
-            # Creates a new log event with the given _logger_ name, numeric _level_,
-            # array of _data_ from the user to be logged, and boolean _trace_ flag.
-            # If the _trace_ flag is set to +true+ then Kernel::caller will be
-            # invoked to get the execution trace of the logging method.
-            #
-            def initialize( logger, level, data, trace )
-              f = l = m = ''
-
-              if trace
-								# puts Kernel.caller.ai
-								stack = Kernel.caller[::Logging::LogEvent.caller_index]
-								# puts stack.ai
-                return if stack.nil?
-
-                match = CALLER_RGXP.match(stack)
-                f = match[1]
-                l = Integer(match[2])
-                m = match[3] unless match[3].nil?
-              end
-
-              super(logger, level, data, Time.now, f, l, m)
-            end
-          }
-          ::Logging::LogEvent.caller_index = CALLER_INDEX
-        end  # module Logging
-
         # -----------------------------------------------------------------------------
         def logStep(msg,cat='Step')
           logger = getLogger(@logger_args, 'logStep')
@@ -444,6 +454,10 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
           @logger = logger
         end
 
+        def initLogging(args)
+          ::Logging.init(args[:log_levels] || [ :trace, :debug, :info, :step, :warn, :error, :fatal, :todo ]) unless defined? ::Logging::MAX_LEVEL_LENGTH
+        end
+
         def getLogger(args,from='',alogger=nil)
           logger = alogger || @logger
           unless logger
@@ -463,7 +477,7 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
               end
 
               begin
-                ::Logging.init(args[:log_levels] || [ :trace, :debug, :info, :step, :warn, :error, :fatal, :todo ]) unless defined? ::Logging::MAX_LEVEL_LENGTH
+                initLogging(args)
                 if args[:origins] and args[:origins][:log_level]
                   if ::Logging::LEVELS[args[:log_level].to_s] and ::Logging::LEVELS[args[:log_level].to_s] < 2
                     puts "#{args[:origins][:log_level]} says #{args[:log_level]}".light_yellow
@@ -518,6 +532,7 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                       :trace => :blue,
                       :debug => :cyan,
                       :info  => :green,
+                      :note  => :green,
                       :step  => :green,
                       :warn  => :yellow,
                       :error => :red,

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

@@ -2,7 +2,7 @@ module Dldinternet
   module Mixlib
     module Logging
       # dldinternet-mixlib-logging version
-      VERSION = '0.6.2'
+      VERSION = '0.7.0'
 
       module Version # :nodoc: all
         MAJOR, MINOR, RELEASE, *OTHER = VERSION.split '.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dldinternet-mixlib-logging
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,12 +99,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ChangeLog.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- atlassian-ide-plugin.xml
 - dldinternet-mixlib-logging.gemspec
 - features/.gitkeep
 - features/dldinternet-mixlib-logging.feature

data/ChangeLog.md

@@ -1,4 +0,0 @@
-### 0.1.0 / 2014-06-16
-
-* Initial release:
-