logsly 1.2.0 → 1.3.0

data/test/unit/logsly_tests.rb

@@ -1,7 +1,7 @@
 require 'assert'
 require 'logsly'
 
-require 'logging'
+require 'logsly/logging182'
 require 'logsly/colors'
 require 'logsly/outputs'
 require 'test/support/logger'
@@ -125,30 +125,30 @@ module Logsly
       assert_equal [:stdout], log.outputs
     end
 
-    should "create a Logging::Logger" do
+    should "create a Logsly::Logging182::Logger" do
       assert_not_nil subject.logger
-      assert_kind_of Logging::Logger, subject.logger
+      assert_kind_of Logsly::Logging182::Logger, subject.logger
     end
 
-    should "create the Logging::Logger with a unique name" do
+    should "create the Logsly::Logging182::Logger with a unique name" do
       exp = "#{subject.class.name}-testy_log_logger-#{subject.object_id}"
       assert_equal exp, subject.logger.name
     end
 
     should "set the logger's level" do
-      assert_equal Logging::LEVELS['info'], subject.logger.level
+      assert_equal Logsly::Logging182::LEVELS['info'], subject.logger.level
 
       log = TestLogger.new('test', :level => :debug)
-      assert_equal Logging::LEVELS['debug'], log.logger.level
+      assert_equal Logsly::Logging182::LEVELS['debug'], log.logger.level
     end
 
     should "set mdc key/value pairs" do
       key = Factory.string
-      assert_nil Logging.mdc[key]
+      assert_nil Logsly::Logging182.mdc[key]
 
       value = Factory.string
       subject.mdc(key, value)
-      assert_equal value, Logging.mdc[key]
+      assert_equal value, Logsly::Logging182.mdc[key]
     end
 
     should "not have a file path if no file appender is specified" do
@@ -173,7 +173,7 @@ module Logsly
 
     should "add a named stdout appender" do
       log = TestLogger.new(:test, :outputs => 'my_stdout')
-      assert_includes_appender Logging::Appenders::Stdout, log
+      assert_includes_appender Logsly::Logging182::Appenders::Stdout, log
       assert_nil log.file_path
     end
 
@@ -181,14 +181,14 @@ module Logsly
       log     = TestLogger.new(:test, :outputs => 'my_file')
       filelog = extract_appender_from_logger(log, :file)
 
-      assert_includes_appender Logging::Appenders::File, log
+      assert_includes_appender Logsly::Logging182::Appenders::File, log
       assert_equal 'log/development-test.log', filelog.name
       assert_equal 'log/development-test.log', log.file_path
     end
 
     should "add a named syslog appender" do
       log = TestLogger.new(:test, :outputs => 'my_syslog')
-      assert_includes_appender Logging::Appenders::Syslog, log
+      assert_includes_appender Logsly::Logging182::Appenders::Syslog, log
       assert_nil log.file_path
     end
 
@@ -215,11 +215,11 @@ module Logsly
     def extract_appender_from_logger(logger, type)
       klass = case type
       when :syslog
-        Logging::Appenders::Syslog
+        Logsly::Logging182::Appenders::Syslog
       when :file
-        Logging::Appenders::File
+        Logsly::Logging182::Appenders::File
       when :stdout
-        Logging::Appenders::Stdout
+        Logsly::Logging182::Appenders::Stdout
       end
 
       logger.appenders.detect{ |a| a.is_a?(klass) }

data/test/unit/outputs_tests.rb

@@ -1,7 +1,7 @@
 require 'assert'
 require 'logsly/outputs'
 
-require 'logging'
+require 'logsly/logging182'
 require 'logsly'
 
 module Logsly::Outputs
@@ -40,21 +40,31 @@ module Logsly::Outputs
     desc "given a build"
     setup do
       Logsly.colors('a_color_scheme') do
-        debug :white
+        debug_line :white
       end
       @out = Base.new do |*args|
-        pattern args.to_s
+        pattern args.first
         colors  'a_color_scheme'
       end
     end
 
-    should "build a Logging pattern layout" do
-      data = BaseData.new('%d : %m\n', &@out.build)
+    should "build a Logsly::Logging182 pattern layout" do
+      data = BaseData.new('[%c{2}] [%l] %d : %m :\n', &@out.build)
       lay = subject.to_layout(data)
 
-      assert_kind_of Logging::Layout, lay
-      assert_equal   '%d : %m\n', lay.pattern
-      assert_kind_of Logging::ColorScheme, lay.color_scheme
+      assert_kind_of Logsly::Logging182::Layout, lay
+      assert_kind_of Logsly::Logging182::ColorScheme, lay.color_scheme
+      assert_equal '[%c{2}] [%l] %d : %m :\n', lay.pattern
+
+      assert_nothing_raised do
+        event = ::Logsly::Logging182::LogEvent.new(
+          Factory.string,
+          ::Logsly::Logging182::LEVELS['debug'],
+          {},
+          []
+        )
+        lay.format(event)
+      end
     end
 
   end
@@ -122,13 +132,13 @@ module Logsly::Outputs
       assert_kind_of Base, subject
     end
 
-    should "build a Logging stdout appender, passing args to the builds" do
+    should "build a Logsly::Logging182 stdout appender, passing args to the builds" do
       appender = subject.to_appender @logger
 
-      assert_kind_of Logging::Appenders::Stdout, appender
-      assert_kind_of Logging::Layouts::Pattern,  appender.layout
-      assert_equal   '%d : %m\n',                appender.layout.pattern
-      assert_kind_of Logging::ColorScheme,       appender.layout.color_scheme
+      assert_kind_of Logsly::Logging182::Appenders::Stdout, appender
+      assert_kind_of Logsly::Logging182::Layouts::Pattern,  appender.layout
+      assert_kind_of Logsly::Logging182::ColorScheme,       appender.layout.color_scheme
+      assert_equal '%d : %m\n', appender.layout.pattern
     end
 
   end
@@ -158,14 +168,14 @@ module Logsly::Outputs
       assert_kind_of Base, subject
     end
 
-    should "build a Logging file appender, passing args to the builds" do
+    should "build a Logsly::Logging182 file appender, passing args to the builds" do
       appender = subject.to_appender @logger
 
-      assert_kind_of Logging::Appenders::File,  appender
-      assert_equal   'log/dev.log',             appender.name
-      assert_kind_of Logging::Layouts::Pattern, appender.layout
-      assert_equal   '%d : %m\n',               appender.layout.pattern
-      assert_kind_of Logging::ColorScheme,      appender.layout.color_scheme
+      assert_kind_of Logsly::Logging182::Appenders::File,  appender
+      assert_kind_of Logsly::Logging182::Layouts::Pattern, appender.layout
+      assert_kind_of Logsly::Logging182::ColorScheme,      appender.layout.color_scheme
+      assert_equal 'log/dev.log', appender.name
+      assert_equal '%d : %m\n',   appender.layout.pattern
     end
 
   end
@@ -208,13 +218,13 @@ module Logsly::Outputs
       assert_kind_of Base, subject
     end
 
-    should "build a Logging syslog appender, passing args to the builds" do
+    should "build a Logsly::Logging182 syslog appender, passing args to the builds" do
       appender = subject.to_appender @logger
 
-      assert_kind_of Logging::Appenders::Syslog, appender
-      assert_kind_of Logging::Layouts::Pattern,  appender.layout
-      assert_equal   '%d : %m\n',                appender.layout.pattern
-      assert_kind_of Logging::ColorScheme,       appender.layout.color_scheme
+      assert_kind_of Logsly::Logging182::Appenders::Syslog, appender
+      assert_kind_of Logsly::Logging182::Layouts::Pattern,  appender.layout
+      assert_kind_of Logsly::Logging182::ColorScheme,       appender.layout.color_scheme
+      assert_equal '%d : %m\n', appender.layout.pattern
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logsly
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-06-13 00:00:00 Z
+date: 2016-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -33,15 +33,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: logging
+  name: little-plugger
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.7"
+        version: 1.1.4
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.12.1
+  type: :runtime
+  version_requirements: *id004
 description: Create custom loggers.
 email: 
 - kelly@kellyredding.com
@@ -59,6 +69,35 @@ files:
 - README.md
 - lib/logsly.rb
 - lib/logsly/colors.rb
+- lib/logsly/logging182.rb
+- lib/logsly/logging182/appender.rb
+- lib/logsly/logging182/appenders.rb
+- lib/logsly/logging182/appenders/buffering.rb
+- lib/logsly/logging182/appenders/console.rb
+- lib/logsly/logging182/appenders/email.rb
+- lib/logsly/logging182/appenders/file.rb
+- lib/logsly/logging182/appenders/growl.rb
+- lib/logsly/logging182/appenders/io.rb
+- lib/logsly/logging182/appenders/rolling_file.rb
+- lib/logsly/logging182/appenders/string_io.rb
+- lib/logsly/logging182/appenders/syslog.rb
+- lib/logsly/logging182/color_scheme.rb
+- lib/logsly/logging182/config/configurator.rb
+- lib/logsly/logging182/config/yaml_configurator.rb
+- lib/logsly/logging182/diagnostic_context.rb
+- lib/logsly/logging182/layout.rb
+- lib/logsly/logging182/layouts.rb
+- lib/logsly/logging182/layouts/basic.rb
+- lib/logsly/logging182/layouts/parseable.rb
+- lib/logsly/logging182/layouts/pattern.rb
+- lib/logsly/logging182/log_event.rb
+- lib/logsly/logging182/logger.rb
+- lib/logsly/logging182/proxy.rb
+- lib/logsly/logging182/rails_compat.rb
+- lib/logsly/logging182/repository.rb
+- lib/logsly/logging182/root_logger.rb
+- lib/logsly/logging182/stats.rb
+- lib/logsly/logging182/utils.rb
 - lib/logsly/outputs.rb
 - lib/logsly/version.rb
 - log/.gitkeep
@@ -82,13 +121,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id004 
+  - &id005 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id004
+  - *id005
 requirements: []
 
 rubyforge_project: