logsly 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2dfa76f82b146db11ebe7e52e8ac9bb51f0fc9c8
+  data.tar.gz: 9dbc80bdfe08dce4f6acacf50f29aca0b90965ea
+SHA512:
+  metadata.gz: 1629d93cc3f4b0f8979ac796ef219ccf05aecc85750829029f20c1f5c48d8dd05117b65e27112ca7509530152dbec2a01ad04b068b127e7a41ce513667bb16c8
+  data.tar.gz: 0abc0262c174e4e12a31c8a81f659888379ce5ec9538bbbbffab0c2d4efd1b0b414c3b27befa7a15a7be6c9dbdfbb02075bff6d4cdeac44858511c22272d2518

data/Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
-gem 'pry'
+gem 'rake', "~> 10.4.0"
+gem 'pry', "~> 0.9.0"

data/README.md

@@ -19,7 +19,7 @@ logger = MyLogger.new(:outputs => ['my_stdout'])
 logger.info "whatever"
 
 # build another logger and use it
-bg_logger = MyLogger.new('bg', :level => 'debug', :outputs => ['my_logger_stdout'])
+bg_logger = MyLogger.new('bg', :level => 'debug', :outputs => ['my_stdout'])
 bg_logger.debug "something"
 ```
 

data/lib/logsly.rb

@@ -1,7 +1,8 @@
 require 'ns-options'
 require 'logging'
 require 'logsly/version'
-require 'logsly/settings'
+require 'logsly/colors'
+require 'logsly/base_output'
 
 module Logsly
 
@@ -12,6 +13,43 @@ module Logsly
     end
   end
 
+  module Settings
+    include NsOptions::Proxy
+
+    option :colors,  ::Hash, :default => ::Hash.new(NullColors.new)
+    option :outputs, ::Hash, :default => ::Hash.new(NullOutput.new)
+  end
+
+  def self.reset
+    Settings.reset
+    Logging.reset
+  end
+
+  def self.colors(name, &block)
+    require 'logsly/colors'
+    Settings.colors[name.to_s] = Colors.new(name, &block) if !block.nil?
+    Settings.colors[name.to_s]
+  end
+
+  def self.stdout(name, &block)
+    require 'logsly/stdout_output'
+    Settings.outputs[name.to_s] = StdoutOutput.new(&block)
+  end
+
+  def self.file(name, &block)
+    require 'logsly/file_output'
+    Settings.outputs[name.to_s] = FileOutput.new(&block)
+  end
+
+  def self.syslog(name, &block)
+    require 'logsly/syslog_output'
+    Settings.outputs[name.to_s] = SyslogOutput.new(&block)
+  end
+
+  def self.outputs(name)
+    Settings.outputs[name.to_s]
+  end
+
   module LoggerMethods
 
     def initialize(log_type, opts_hash=nil)
@@ -30,6 +68,16 @@ module Logsly
       end
     end
 
+    def mdc(key, value)
+      Logging.mdc[key] = value
+    end
+
+    def file_path
+      @file_path ||= if (appender = get_file_appender)
+        appender.name if appender.respond_to?(:name)
+      end
+    end
+
     # delegate all calls to the @logger
 
     def method_missing(method, *args, &block)
@@ -65,6 +113,10 @@ module Logsly
       end
     end
 
+    def get_file_appender
+      @logger.appenders.detect{ |a| a.kind_of?(Logging::Appenders::File) }
+    end
+
   end
 
 end

data/lib/logsly/colors.rb

@@ -8,10 +8,6 @@ require 'ns-options'
 
 module Logsly
 
-  class NullColors < OpenStruct
-    def to_scheme(*args); nil;  end
-  end
-
   class Colors
 
     attr_reader :name, :build
@@ -28,6 +24,10 @@ module Logsly
 
   end
 
+  class NullColors < OpenStruct
+    def to_scheme(*args); nil;  end
+  end
+
   class ColorsData
     include NsOptions::Proxy
 

data/lib/logsly/version.rb

@@ -1,3 +1,3 @@
 module Logsly
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/logsly.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |gem|
   gem.description = %q{Create custom loggers.}
   gem.summary     = %q{Create custom loggers.}
   gem.homepage    = "http://github.com/redding/logsly"
+  gem.license     = 'MIT'
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.0"])
+  gem.add_development_dependency("assert", ["~> 2.15"])
 
   gem.add_dependency("ns-options",  ["~> 1.1"])
   gem.add_dependency("logging",     ["~> 1.7"])

data/test/helper.rb

@@ -6,3 +6,5 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
 # require pry for debugging (`binding.pry`)
 require 'pry'
+
+require 'test/support/factory'

data/test/support/factory.rb

@@ -0,0 +1,6 @@
+require 'assert/factory'
+
+module Factory
+  extend Assert::Factory
+
+end

data/test/unit/base_output_tests.rb

@@ -1,59 +1,17 @@
 require 'assert'
-require 'logging'
-require 'logsly/settings'
 require 'logsly/base_output'
 
-class Logsly::BaseOutput
-
-  class DataTests < Assert::Context
-    desc "the BaseOutputData handler"
-    setup do
-      Logsly.colors('a_color_scheme') do
-        debug :white
-      end
-      @arg = '%d : %m\n'
-      @lay = Logsly::BaseOutputData.new(@arg) do |*args|
-        pattern args.first
-        colors  'a_color_scheme'
-      end
-    end
-    subject { @lay }
-
-    should have_readers :pattern, :colors
-
-    should "know its defaults" do
-      lay = Logsly::BaseOutputData.new {}
-      assert_equal '%m\n', lay.pattern
-      assert_nil lay.colors
-    end
-
-    should "instance exec its build with args" do
-      assert_equal '%d : %m\n',      subject.pattern
-      assert_equal 'a_color_scheme', subject.colors
-    end
-
-    should "know its layout pattern opts hash" do
-      expected = {
-        :pattern      => subject.pattern,
-        :color_scheme => "#{subject.colors}-#{@arg.object_id}"
-      }
-      assert_equal expected, subject.to_pattern_opts
-
-      out = Logsly::BaseOutputData.new do
-        pattern '%m\n'
-      end
-      out_expected = {:pattern => out.pattern}
-      assert_equal out_expected, out.to_pattern_opts
-    end
+require 'logging'
+require 'logsly'
 
-  end
+class Logsly::BaseOutput
 
-  class BaseTests < Assert::Context
-    desc "the BaseOutput handler"
+  class UnitTests < Assert::Context
+    desc "Logsly::BaseOutput"
     setup do
       @out = Logsly::BaseOutput.new {}
     end
-    subject { @out }
+    subject{ @out }
 
     should have_reader :build
     should have_imeths :to_layout, :to_appender
@@ -73,7 +31,7 @@ class Logsly::BaseOutput
 
   end
 
-  class BuildTests < BaseTests
+  class BuildTests < UnitTests
     desc "given a build"
     setup do
       Logsly.colors('a_color_scheme') do
@@ -96,5 +54,48 @@ class Logsly::BaseOutput
 
   end
 
+  class BaseOutputDataTests < Assert::Context
+    desc "BaseOutputData"
+    setup do
+      Logsly.colors('a_color_scheme') do
+        debug :white
+      end
+      @arg = '%d : %m\n'
+      @lay = Logsly::BaseOutputData.new(@arg) do |*args|
+        pattern args.first
+        colors  'a_color_scheme'
+      end
+    end
+    subject{ @lay }
+
+    should have_readers :pattern, :colors
+
+    should "know its defaults" do
+      lay = Logsly::BaseOutputData.new {}
+      assert_equal '%m\n', lay.pattern
+      assert_nil lay.colors
+    end
+
+    should "instance exec its build with args" do
+      assert_equal '%d : %m\n',      subject.pattern
+      assert_equal 'a_color_scheme', subject.colors
+    end
+
+    should "know its layout pattern opts hash" do
+      expected = {
+        :pattern      => subject.pattern,
+        :color_scheme => "#{subject.colors}-#{@arg.object_id}"
+      }
+      assert_equal expected, subject.to_pattern_opts
+
+      out = Logsly::BaseOutputData.new do
+        pattern '%m\n'
+      end
+      out_expected = {:pattern => out.pattern}
+      assert_equal out_expected, out.to_pattern_opts
+    end
+
+  end
+
 end
 

data/test/unit/colors_tests.rb

@@ -1,17 +1,62 @@
 require 'assert'
-require 'logging'
 require 'logsly/colors'
 
+require 'logging'
+
 class Logsly::Colors
 
-  class DataTests < Assert::Context
-    desc "the ColorsData handler"
+  class UnitTests < Assert::Context
+    desc "Logsly::Colors"
+    setup do
+      @colors = Logsly::Colors.new('test_colors') do |*args|
+        debug args.first
+      end
+    end
+    subject{ @colors }
+
+    should have_readers :name, :build
+    should have_imeths  :to_scheme
+
+    should "know its name" do
+      assert_equal 'test_colors', subject.name
+    end
+
+    should "know its build" do
+      build_proc = Proc.new {}
+      out = Logsly::Colors.new 'test', &build_proc
+
+      assert_same build_proc, out.build
+    end
+
+  end
+
+  class BuildTests < UnitTests
+    desc "given a build"
+    setup do
+      @colors = Logsly::Colors.new 'test' do |fatal_color|
+        fatal [fatal_color, :on_red]
+        date  :blue
+      end
+    end
+
+    should "build a unique Logging color scheme based on called args" do
+      arg = 'white'
+      scheme_name = subject.to_scheme(arg)
+
+      assert_equal   "test-#{arg.object_id}", scheme_name
+      assert_kind_of Logging::ColorScheme, Logging.color_scheme(scheme_name)
+    end
+
+  end
+
+  class ColorsDataTests < Assert::Context
+    desc "ColorsData"
     setup do
       @data = Logsly::ColorsData.new('white') do |color|
         debug color
       end
     end
-    subject { @data }
+    subject{ @data }
 
     should have_imeths :to_scheme_opts
     should have_imeths :debug, :info, :warn, :error, :fatal
@@ -64,49 +109,5 @@ class Logsly::Colors
 
   end
 
-  class BaseTests < Assert::Context
-    desc "the Colors handler"
-    setup do
-      @colors = Logsly::Colors.new('test_colors') do |*args|
-        debug args.first
-      end
-    end
-    subject { @colors }
-
-    should have_readers :name, :build
-    should have_imeths  :to_scheme
-
-    should "know its name" do
-      assert_equal 'test_colors', subject.name
-    end
-
-    should "know its build" do
-      build_proc = Proc.new {}
-      out = Logsly::Colors.new 'test', &build_proc
-
-      assert_same build_proc, out.build
-    end
-
-  end
-
-  class BuildTests < BaseTests
-    desc "given a build"
-    setup do
-      @colors = Logsly::Colors.new 'test' do |fatal_color|
-        fatal [fatal_color, :on_red]
-        date  :blue
-      end
-    end
-
-    should "build a unique Logging color scheme based on called args" do
-      arg = 'white'
-      scheme_name = subject.to_scheme(arg)
-
-      assert_equal   "test-#{arg.object_id}", scheme_name
-      assert_kind_of Logging::ColorScheme, Logging.color_scheme(scheme_name)
-    end
-
-  end
-
 end
 

data/test/unit/file_output_tests.rb

@@ -1,24 +1,14 @@
 require 'assert'
-require 'ostruct'
-require 'logging'
-require 'logsly/settings'
 require 'logsly/file_output'
 
-class Logsly::FileOutput
-
-  class DataTests < Assert::Context
-    desc "the FileOutputData handler"
-    setup do
-      @data = Logsly::FileOutputData.new {}
-    end
-    subject { @data }
-
-    should have_imeth :path
+require 'logging'
+require 'ostruct'
+require 'logsly'
 
-  end
+class Logsly::FileOutput
 
-  class BaseTests < Assert::Context
-    desc "the StdoutOutput handler"
+  class UnitTests < Assert::Context
+    desc "Logsly::FileOutput"
     setup do
       @logger = OpenStruct.new
       @logger.debug_level = :white
@@ -36,7 +26,7 @@ class Logsly::FileOutput
         colors  'a_color_scheme'
       end
     end
-    subject { @out }
+    subject{ @out }
 
     should "be an output handler" do
       assert_kind_of Logsly::BaseOutput, subject
@@ -51,6 +41,18 @@ class Logsly::FileOutput
       assert_equal   '%d : %m\n',               appender.layout.pattern
       assert_kind_of Logging::ColorScheme,      appender.layout.color_scheme
     end
+
+  end
+
+  class FileOutputDataTests < Assert::Context
+    desc "FileOutputData"
+    setup do
+      @data = Logsly::FileOutputData.new {}
+    end
+    subject{ @data }
+
+    should have_imeth :path
+
   end
 
 end

data/test/unit/logsly_tests.rb

@@ -0,0 +1,228 @@
+require 'assert'
+require 'logsly'
+
+require 'logging'
+require 'test/support/logger'
+
+module Logsly
+
+  class UnitTests < Assert::Context
+    desc "Logsly"
+    setup do
+      Logsly.reset
+    end
+    subject{ Logsly }
+
+    should have_imeths :reset, :colors, :stdout, :file, :syslog, :outputs
+
+    should "return a NullColors obj when requesting a color scheme that isn't defined" do
+      assert_kind_of NullColors, Logsly.colors('not_defined_yet')
+    end
+
+    should "return a NullOutput obj when requesting an output that isn't defined" do
+      assert_kind_of NullOutput, Logsly.outputs('not_defined_yet')
+    end
+
+    should "add a named color scheme using the `colors` method" do
+      assert_kind_of NullColors, Logsly.colors('test_colors')
+      Logsly.colors('test_colors') {}
+
+      assert_kind_of Colors, Logsly.colors('test_colors')
+    end
+
+    should "add a named stdout output using the `stdout` method" do
+      assert_kind_of NullOutput, Logsly.outputs('test_stdout')
+      Logsly.stdout('test_stdout') {}
+
+      assert_not_nil Logsly.outputs('test_stdout')
+      assert_kind_of StdoutOutput, Logsly.outputs('test_stdout')
+    end
+
+    should "add a named file output using the `file` method" do
+      assert_kind_of NullOutput, Logsly.outputs('test_file')
+      Logsly.file('test_file') {}
+
+      assert_not_nil Logsly.outputs('test_file')
+      assert_kind_of FileOutput, Logsly.outputs('test_file')
+    end
+
+    should "add a named syslog output using the `syslog` method" do
+      assert_kind_of NullOutput, Logsly.outputs('test_syslog')
+      Logsly.syslog('test_syslog') {}
+
+      assert_not_nil Logsly.outputs('test_syslog')
+      assert_kind_of SyslogOutput, Logsly.outputs('test_syslog')
+    end
+
+    should "convert non-string setting names to string" do
+      Logsly.colors(:test_colors) {}
+
+      assert_not_nil Logsly.colors(:test_colors)
+      assert_kind_of Colors, Logsly.colors(:test_colors)
+    end
+
+    should "overwrite same-named colors settings" do
+      Logsly.colors('something') {}
+      orig = Logsly.colors('something')
+      Logsly.colors('something') {}
+
+      assert_not_same orig, Logsly.colors('something')
+    end
+
+    should "overwrite same-named outputs settings" do
+      Logsly.stdout('something') {}
+      assert_kind_of StdoutOutput, Logsly.outputs('something')
+
+      Logsly.file('something') {}
+      assert_kind_of FileOutput, Logsly.outputs('something')
+    end
+
+  end
+
+  class ResetTests < UnitTests
+    desc "`reset` method"
+    setup do
+      Logsly.colors('test_colors') {}
+      Logsly.stdout('test_stdout') {}
+    end
+
+    should "reset the Settings" do
+      assert_kind_of Colors,       Logsly.colors('test_colors')
+      assert_kind_of StdoutOutput, Logsly.outputs('test_stdout')
+
+      Logsly.reset
+
+      assert_kind_of NullColors, Logsly.colors('test_colors')
+      assert_kind_of NullOutput, Logsly.outputs('test_stdout')
+    end
+
+  end
+
+  class LoggerTests < UnitTests
+    desc "logger"
+    setup do
+      @logger = TestLogger.new(:testy_log_logger)
+    end
+    subject{ @logger }
+
+    should have_readers :log_type, :level, :outputs, :logger
+    should have_imeths :mdc, :file_path
+
+    should "know its log_type" do
+      assert_equal 'testy_log_logger', subject.log_type
+    end
+
+    should "know its default opt values" do
+      assert_equal 'info', subject.level
+      assert_equal [],     subject.outputs
+    end
+
+    should "allow overridding the default opt values" do
+      log = TestLogger.new(:testy_debug_logger, :level => :debug, :outputs => [:stdout])
+      assert_equal 'debug',   log.level
+      assert_equal [:stdout], log.outputs
+    end
+
+    should "create a Logging::Logger" do
+      assert_not_nil subject.logger
+      assert_kind_of Logging::Logger, subject.logger
+    end
+
+    should "create the Logging::Logger with a unique name" do
+      expected = "#{subject.class.name}-testy_log_logger-#{subject.object_id}"
+      assert_equal expected, subject.logger.name
+    end
+
+    should "set the logger's level" do
+      assert_equal Logging::LEVELS['info'], subject.logger.level
+
+      log = TestLogger.new('test', :level => :debug)
+      assert_equal Logging::LEVELS['debug'], log.logger.level
+    end
+
+    should "set mdc key/value pairs" do
+      key = Factory.string
+      assert_nil Logging.mdc[key]
+
+      value = Factory.string
+      subject.mdc(key, value)
+      assert_equal value, Logging.mdc[key]
+    end
+
+    should "not have a file path if no file appender is specified" do
+      assert_nil subject.file_path
+    end
+
+  end
+
+  class AppenderTests < UnitTests
+    setup do
+      Logsly.stdout 'my_stdout'
+      Logsly.file('my_file') do |logger|
+        path "log/development-#{logger.log_type}.log"
+      end
+      Logsly.file('my_other_file') do |logger|
+        path "log/other-#{logger.log_type}.log"
+      end
+      Logsly.syslog('my_syslog') do |logger|
+        identity "my_syslog_logger-#{logger.log_type}"
+      end
+    end
+
+    should "add a named stdout appender" do
+      log = TestLogger.new(:test, :outputs => 'my_stdout')
+      assert_includes_appender Logging::Appenders::Stdout, log
+      assert_nil log.file_path
+    end
+
+    should "add a named file appender" do
+      log     = TestLogger.new(:test, :outputs => 'my_file')
+      filelog = extract_appender_from_logger(log, :file)
+
+      assert_includes_appender Logging::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_nil log.file_path
+    end
+
+    should "not add duplicate appenders" do
+      outputs = ['my_stdout', 'my_stdout', 'my_file', 'my_other_file']
+      log = TestLogger.new(:test, :outputs => outputs)
+
+      assert_equal 3, log.appenders.size
+    end
+
+    should "not add undefined appenders" do
+      outputs = ['my_stdout', 'undefined']
+      log = TestLogger.new(:test, :outputs => outputs)
+
+      assert_equal 1, log.appenders.size
+    end
+
+    private
+
+    def assert_includes_appender(appender_class, logger)
+      assert_includes appender_class, logger.appenders.collect(&:class)
+    end
+
+    def extract_appender_from_logger(logger, type)
+      klass = case type
+      when :syslog
+        Logging::Appenders::Syslog
+      when :file
+        Logging::Appenders::File
+      when :stdout
+        Logging::Appenders::Stdout
+      end
+
+      logger.appenders.detect{ |a| a.is_a?(klass) }
+    end
+
+  end
+
+end

data/test/unit/stdout_output_tests.rb

@@ -1,13 +1,14 @@
 require 'assert'
+require 'logsly/stdout_output'
+
 require 'ostruct'
 require 'logging'
-require 'logsly/settings'
-require 'logsly/stdout_output'
+require 'logsly'
 
 class Logsly::StdoutOutput
 
-  class BaseTests < Assert::Context
-    desc "the StdoutOutput handler"
+  class UnitTests < Assert::Context
+    desc "Logsly::StdoutOutput"
     setup do
       @logger = OpenStruct.new
       @logger.debug_level = :white
@@ -22,7 +23,7 @@ class Logsly::StdoutOutput
         colors  'a_color_scheme'
       end
     end
-    subject { @out }
+    subject{ @out }
 
     should "be an output handler" do
       assert_kind_of Logsly::BaseOutput, subject
@@ -36,6 +37,7 @@ class Logsly::StdoutOutput
       assert_equal   '%d : %m\n',                appender.layout.pattern
       assert_kind_of Logging::ColorScheme,       appender.layout.color_scheme
     end
+
   end
 
 end

data/test/unit/syslog_output_tests.rb

@@ -1,33 +1,15 @@
 require 'assert'
+require 'logsly/syslog_output'
+
 require 'ostruct'
 require 'syslog'
 require 'logging'
-require 'logsly/settings'
-require 'logsly/syslog_output'
+require 'logsly'
 
 class Logsly::SyslogOutput
 
-  class DataTests < Assert::Context
-    desc "the FileOutputData handler"
-    setup do
-      @data = Logsly::SyslogOutputData.new {}
-    end
-    subject { @data }
-
-    should have_imeth :identity, :log_opts, :facility
-
-    should "default :log_opts" do
-      assert_equal (Syslog::LOG_PID | Syslog::LOG_CONS), subject.log_opts
-    end
-
-    should "default :facility" do
-      assert_equal Syslog::LOG_LOCAL0, subject.facility
-    end
-
-  end
-
-  class BaseTests < Assert::Context
-    desc "the SyslogOutput handler"
+  class UnitTests < Assert::Context
+    desc "Logsly::SyslogOutput"
     setup do
       @logger = OpenStruct.new
       @logger.debug_level = :white
@@ -47,7 +29,7 @@ class Logsly::SyslogOutput
         colors  'a_color_scheme'
       end
     end
-    subject { @out }
+    subject{ @out }
 
     should "be an output handler" do
       assert_kind_of Logsly::BaseOutput, subject
@@ -61,6 +43,26 @@ class Logsly::SyslogOutput
       assert_equal   '%d : %m\n',                appender.layout.pattern
       assert_kind_of Logging::ColorScheme,       appender.layout.color_scheme
     end
+
+  end
+
+  class SyslogOutputDataTests < Assert::Context
+    desc "SyslogOutputData"
+    setup do
+      @data = Logsly::SyslogOutputData.new {}
+    end
+    subject{ @data }
+
+    should have_imeth :identity, :log_opts, :facility
+
+    should "default :log_opts" do
+      assert_equal (Syslog::LOG_PID | Syslog::LOG_CONS), subject.log_opts
+    end
+
+    should "default :facility" do
+      assert_equal Syslog::LOG_LOCAL0, subject.facility
+    end
+
   end
 
 end

metadata

@@ -1,80 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: logsly
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-09-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: assert
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ns-options
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: ns-options
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: logging
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 7
-        version: "1.7"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Create custom loggers.
-email: 
+email:
 - kelly@kellyredding.com
 - collin.redding@me.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,62 +70,52 @@ files:
 - lib/logsly/base_output.rb
 - lib/logsly/colors.rb
 - lib/logsly/file_output.rb
-- lib/logsly/settings.rb
 - lib/logsly/stdout_output.rb
 - lib/logsly/syslog_output.rb
 - lib/logsly/version.rb
 - log/.gitkeep
 - logsly.gemspec
 - test/helper.rb
+- test/support/factory.rb
 - test/support/logger.rb
 - test/unit/base_output_tests.rb
 - test/unit/colors_tests.rb
 - test/unit/file_output_tests.rb
-- test/unit/logger_tests.rb
-- test/unit/settings_tests.rb
+- test/unit/logsly_tests.rb
 - test/unit/stdout_output_tests.rb
 - test/unit/syslog_output_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/logsly
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Create custom loggers.
-test_files: 
+test_files:
 - test/helper.rb
+- test/support/factory.rb
 - test/support/logger.rb
 - test/unit/base_output_tests.rb
 - test/unit/colors_tests.rb
 - test/unit/file_output_tests.rb
-- test/unit/logger_tests.rb
-- test/unit/settings_tests.rb
+- test/unit/logsly_tests.rb
 - test/unit/stdout_output_tests.rb
 - test/unit/syslog_output_tests.rb

data/lib/logsly/settings.rb

@@ -1,45 +0,0 @@
-require 'ns-options'
-require 'logging'
-require 'logsly/colors'
-require 'logsly/base_output'
-
-module Logsly
-
-  module Settings
-    include NsOptions::Proxy
-
-    option :colors,  ::Hash, :default => ::Hash.new(NullColors.new)
-    option :outputs, ::Hash, :default => ::Hash.new(NullOutput.new)
-  end
-
-  def self.reset
-    Settings.reset
-    Logging.reset
-  end
-
-  def self.colors(name, &block)
-    require 'logsly/colors'
-    Settings.colors[name.to_s] = Colors.new(name, &block) if !block.nil?
-    Settings.colors[name.to_s]
-  end
-
-  def self.stdout(name, &block)
-    require 'logsly/stdout_output'
-    Settings.outputs[name.to_s] = StdoutOutput.new(&block)
-  end
-
-  def self.file(name, &block)
-    require 'logsly/file_output'
-    Settings.outputs[name.to_s] = FileOutput.new(&block)
-  end
-
-  def self.syslog(name, &block)
-    require 'logsly/syslog_output'
-    Settings.outputs[name.to_s] = SyslogOutput.new(&block)
-  end
-
-  def self.outputs(name)
-    Settings.outputs[name.to_s]
-  end
-
-end

data/test/unit/logger_tests.rb

@@ -1,123 +0,0 @@
-require 'assert'
-require 'logging'
-require 'logsly'
-require 'test/support/logger'
-
-module Logsly
-
-  class BaseTests < Assert::Context
-    desc "a logger with Logsly mixed in"
-    setup do
-      Logsly.reset
-      @logger = TestLogger.new(:testy_log_logger)
-    end
-    subject { @logger }
-
-    should have_readers :log_type, :level, :outputs, :logger
-
-    should "know its log_type" do
-      assert_equal 'testy_log_logger', subject.log_type
-    end
-
-    should "know its default opt values" do
-      assert_equal 'info', subject.level
-      assert_equal [],     subject.outputs
-    end
-
-    should "allow overridding the default opt values" do
-      log = TestLogger.new(:testy_debug_logger, :level => :debug, :outputs => [:stdout])
-      assert_equal 'debug',   log.level
-      assert_equal [:stdout], log.outputs
-    end
-
-  end
-
-  class LoggerTests < BaseTests
-
-    should "create a Logging::Logger" do
-      assert_not_nil subject.logger
-      assert_kind_of Logging::Logger, subject.logger
-    end
-
-    should "create the Logging::Logger with a unique name" do
-      expected = "#{subject.class.name}-testy_log_logger-#{subject.object_id}"
-      assert_equal expected, subject.logger.name
-    end
-
-    should "set the logger's level" do
-      assert_equal Logging::LEVELS['info'], subject.logger.level
-
-      log = TestLogger.new('test', :level => :debug)
-      assert_equal Logging::LEVELS['debug'], log.logger.level
-    end
-
-  end
-
-  class AppenderTests < LoggerTests
-    setup do
-      Logsly.stdout 'my_stdout'
-      Logsly.file('my_file') do |logger|
-        path "log/development-#{logger.log_type}.log"
-      end
-      Logsly.file('my_other_file') do |logger|
-        path "log/other-#{logger.log_type}.log"
-      end
-      Logsly.syslog('my_syslog') do |logger|
-        identity "my_syslog_logger-#{logger.log_type}"
-      end
-    end
-
-    should "add a named stdout appender" do
-      log = TestLogger.new(:test, :outputs => 'my_stdout')
-      assert_includes_appender Logging::Appenders::Stdout, log
-    end
-
-    should "add a named file appender" do
-      log     = TestLogger.new(:test, :outputs => 'my_file')
-      filelog = extract_appender_from_logger(log, :file)
-
-      assert_includes_appender Logging::Appenders::File, log
-      assert_equal 'log/development-test.log', filelog.name
-    end
-
-    should "add a named syslog appender" do
-      log = TestLogger.new(:test, :outputs => 'my_syslog')
-      assert_includes_appender Logging::Appenders::Syslog, log
-    end
-
-    should "not add duplicate appenders" do
-      outputs = ['my_stdout', 'my_stdout', 'my_file', 'my_other_file']
-      log = TestLogger.new(:test, :outputs => outputs)
-
-      assert_equal 3, log.appenders.size
-    end
-
-    should "not add undefined appenders" do
-      outputs = ['my_stdout', 'undefined']
-      log = TestLogger.new(:test, :outputs => outputs)
-
-      assert_equal 1, log.appenders.size
-    end
-
-    protected
-
-    def assert_includes_appender(appender_class, logger)
-      assert_includes appender_class, logger.appenders.collect(&:class)
-    end
-
-    def extract_appender_from_logger(logger, type)
-      klass = case type
-      when :syslog
-        Logging::Appenders::Syslog
-      when :file
-        Logging::Appenders::File
-      when :stdout
-        Logging::Appenders::Stdout
-      end
-
-      logger.appenders.select{|a| a.is_a?(klass)}.first
-    end
-
-  end
-
-end

data/test/unit/settings_tests.rb

@@ -1,98 +0,0 @@
-require 'assert'
-require 'logsly/settings'
-
-module Logsly
-
-  class SettingsTests < Assert::Context
-    desc "Logsly settings"
-    setup do
-      Logsly::Settings.reset
-    end
-    subject { Logsly }
-
-    should have_imeths :reset, :colors, :stdout, :file, :syslog, :outputs
-
-    should "return a NullColors obj when requesting a color scheme that isn't defined" do
-      assert_kind_of NullColors, Logsly.colors('not_defined_yet')
-    end
-
-    should "return a NullOutput obj when requesting an output that isn't defined" do
-      assert_kind_of NullOutput, Logsly.outputs('not_defined_yet')
-    end
-
-    should "add a named color scheme using the `colors` method" do
-      assert_kind_of NullColors, Logsly.colors('test_colors')
-      Logsly.colors('test_colors') {}
-
-      assert_kind_of Colors, Logsly.colors('test_colors')
-    end
-
-    should "add a named stdout output using the `stdout` method" do
-      assert_kind_of NullOutput, Logsly.outputs('test_stdout')
-      Logsly.stdout('test_stdout') {}
-
-      assert_not_nil Logsly.outputs('test_stdout')
-      assert_kind_of StdoutOutput, Logsly.outputs('test_stdout')
-    end
-
-    should "add a named file output using the `file` method" do
-      assert_kind_of NullOutput, Logsly.outputs('test_file')
-      Logsly.file('test_file') {}
-
-      assert_not_nil Logsly.outputs('test_file')
-      assert_kind_of FileOutput, Logsly.outputs('test_file')
-    end
-
-    should "add a named syslog output using the `syslog` method" do
-      assert_kind_of NullOutput, Logsly.outputs('test_syslog')
-      Logsly.syslog('test_syslog') {}
-
-      assert_not_nil Logsly.outputs('test_syslog')
-      assert_kind_of SyslogOutput, Logsly.outputs('test_syslog')
-    end
-
-    should "convert non-string setting names to string" do
-      Logsly.colors(:test_colors) {}
-
-      assert_not_nil Logsly.colors(:test_colors)
-      assert_kind_of Colors, Logsly.colors(:test_colors)
-    end
-
-    should "overwrite same-named colors settings" do
-      Logsly.colors('something') {}
-      orig = Logsly.colors('something')
-      Logsly.colors('something') {}
-
-      assert_not_same orig, Logsly.colors('something')
-    end
-
-    should "overwrite same-named outputs settings" do
-      Logsly.stdout('something') {}
-      assert_kind_of StdoutOutput, Logsly.outputs('something')
-
-      Logsly.file('something') {}
-      assert_kind_of FileOutput, Logsly.outputs('something')
-    end
-
-  end
-
-  class ResetTests < SettingsTests
-    desc "`reset` method"
-    setup do
-      Logsly.colors('test_colors') {}
-      Logsly.stdout('test_stdout') {}
-    end
-
-    should "reset the Settings" do
-      assert_kind_of Colors,       Logsly.colors('test_colors')
-      assert_kind_of StdoutOutput, Logsly.outputs('test_stdout')
-
-      Logsly.reset
-
-      assert_kind_of NullColors, Logsly.colors('test_colors')
-      assert_kind_of NullOutput, Logsly.outputs('test_stdout')
-    end
-
-  end
-
-end