logsly 1.1.0 → 1.2.0

data/test/unit/outputs_tests.rb

@@ -0,0 +1,242 @@
+require 'assert'
+require 'logsly/outputs'
+
+require 'logging'
+require 'logsly'
+
+module Logsly::Outputs
+
+  class UnitTests < Assert::Context
+    desc "Logsly::Outputs"
+
+  end
+
+  class BaseTests < UnitTests
+    desc "Base"
+    setup do
+      @out = Base.new
+    end
+    subject{ @out }
+
+    should have_reader :build
+    should have_imeths :to_layout, :to_appender
+
+    should "know its build" do
+      build_proc = Proc.new{}
+      out = Base.new(&build_proc)
+
+      assert_same build_proc, out.build
+    end
+
+    should "expect `to_appender` to be defined by subclasses" do
+      assert_raises NotImplementedError do
+        subject.to_appender
+      end
+    end
+
+  end
+
+  class BaseBuildTests < BaseTests
+    desc "given a build"
+    setup do
+      Logsly.colors('a_color_scheme') do
+        debug :white
+      end
+      @out = Base.new do |*args|
+        pattern args.to_s
+        colors  'a_color_scheme'
+      end
+    end
+
+    should "build a Logging pattern layout" do
+      data = BaseData.new('%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
+    end
+
+  end
+
+  class BaseDataTests < UnitTests
+    desc "BaseData"
+    setup do
+      Logsly.colors('a_color_scheme') do
+        debug :white
+      end
+      @arg = '%d : %m\n'
+      @data = BaseData.new(@arg) do |*args|
+        pattern args.first
+        colors  'a_color_scheme'
+      end
+    end
+    subject{ @data }
+
+    should have_imeths :pattern, :colors
+
+    should "know its defaults" do
+      data = BaseData.new
+      assert_equal '%m\n', data.pattern
+      assert_nil data.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
+      exp = {
+        :pattern      => subject.pattern,
+        :color_scheme => "#{subject.colors}-#{@arg.object_id}"
+      }
+      assert_equal exp, subject.to_pattern_opts
+
+      data = BaseData.new{ pattern '%m\n'  }
+      exp = { :pattern => data.pattern }
+      assert_equal exp, data.to_pattern_opts
+    end
+
+  end
+
+  class StdoutTests < UnitTests
+    desc "Stdout"
+    setup do
+      @logger = OpenStruct.new
+      @logger.debug_level = :white
+      @logger.pattern = '%d : %m\n'
+
+      Logsly.colors('a_color_scheme') do |logger|
+        debug logger.debug_level
+      end
+
+      @out = Stdout.new do |logger|
+        pattern logger.pattern
+        colors  'a_color_scheme'
+      end
+    end
+    subject{ @out }
+
+    should "be a Base output" do
+      assert_kind_of Base, subject
+    end
+
+    should "build a Logging 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
+    end
+
+  end
+
+  class FileTests < UnitTests
+    desc "File"
+    setup do
+      @logger = OpenStruct.new
+      @logger.debug_level = :white
+      @logger.pattern = '%d : %m\n'
+      @logger.file = "log/dev.log"
+
+      Logsly.colors('a_color_scheme') do |logger|
+        debug logger.debug_level
+      end
+
+      @out = File.new do |logger|
+        path logger.file
+
+        pattern logger.pattern
+        colors  'a_color_scheme'
+      end
+    end
+    subject{ @out }
+
+    should "be a Base output" do
+      assert_kind_of Base, subject
+    end
+
+    should "build a Logging 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
+    end
+
+  end
+
+  class FileDataTests < UnitTests
+    desc "FilData"
+    setup do
+      @data = FileData.new
+    end
+    subject{ @data }
+
+    should have_imeths :path
+
+  end
+
+  class SyslogTests < UnitTests
+    desc "SyslogTests"
+    setup do
+      @logger = OpenStruct.new
+      @logger.debug_level = :white
+      @logger.pattern  = '%d : %m\n'
+      @logger.identity = "whatever"
+      @logger.facility = ::Syslog::LOG_LOCAL3
+
+      Logsly.colors('a_color_scheme') do |logger|
+        debug logger.debug_level
+      end
+
+      @out = Syslog.new do |logger|
+        identity logger.identity
+        facility logger.facility
+
+        pattern logger.pattern
+        colors  'a_color_scheme'
+      end
+    end
+    subject{ @out }
+
+    should "be a Base output" do
+      assert_kind_of Base, subject
+    end
+
+    should "build a Logging 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
+    end
+
+  end
+
+  class SyslogDataTests < UnitTests
+    desc "SyslogData"
+    setup do
+      @data = SyslogData.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,121 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: logsly
-version: !ruby/object:Gem::Version
-  version: 1.1.0
+version: !ruby/object:Gem::Version 
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2016-06-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.16.1
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: much-plugin
   prerelease: false
-  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'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.7"
+  type: :runtime
+  version_requirements: *id003
 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
+- LICENSE
 - README.md
-- Rakefile
 - lib/logsly.rb
-- lib/logsly/base_output.rb
 - lib/logsly/colors.rb
-- lib/logsly/file_output.rb
-- lib/logsly/stdout_output.rb
-- lib/logsly/syslog_output.rb
+- lib/logsly/outputs.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/logsly_tests.rb
-- test/unit/stdout_output_tests.rb
-- test/unit/syslog_output_tests.rb
+- test/unit/outputs_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
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id004 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 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/logsly_tests.rb
-- test/unit/stdout_output_tests.rb
-- test/unit/syslog_output_tests.rb
+- test/unit/outputs_tests.rb

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/lib/logsly/base_output.rb

@@ -1,64 +0,0 @@
-require 'ostruct'
-require 'ns-options'
-require 'logging'
-
-module Logsly
-
-  class NullOutput < OpenStruct
-    def to_appender(*args); nil; end
-    def to_layout(*args);   nil; end
-  end
-
-  class BaseOutput
-
-    attr_reader :build
-
-    def initialize(&build)
-      @build = build || Proc.new {}
-    end
-
-    def to_appender(*args)
-      self.instance_exec(*args, &@build)
-      self.colors_obj.run_build(*args)
-      self
-    end
-
-    def to_layout(data)
-      Logging.layouts.pattern(data.to_pattern_opts)
-    end
-
-    def to_appender(*args)
-      raise NotImplementedError
-    end
-
-  end
-
-  class BaseOutputData
-    include NsOptions::Proxy
-    option :pattern, String, :default => '%m\n'
-    option :colors,  String
-
-    def initialize(*args, &build)
-      @args = args
-      self.instance_exec(*@args, &build)
-    end
-
-    def to_pattern_opts
-      Hash.new.tap do |opts|
-        opts[:pattern] = self.pattern if self.pattern
-
-        if scheme_name = colors_obj.to_scheme(*@args)
-          opts[:color_scheme] = scheme_name
-        end
-      end
-    end
-
-    protected
-
-    def colors_obj
-      Logsly.colors(self.colors)
-    end
-
-  end
-
-end

data/lib/logsly/file_output.rb

@@ -1,17 +0,0 @@
-require 'logging'
-require 'logsly/base_output'
-
-module Logsly
-
-  class FileOutput < BaseOutput
-    def to_appender(*args)
-      data = FileOutputData.new(*args, &self.build)
-      Logging.appenders.file(data.path, :layout => self.to_layout(data))
-    end
-  end
-
-  class FileOutputData < BaseOutputData
-    option :path, String
-  end
-
-end

data/lib/logsly/stdout_output.rb

@@ -1,13 +0,0 @@
-require 'logging'
-require 'logsly/base_output'
-
-module Logsly
-
-  class StdoutOutput < BaseOutput
-    def to_appender(*args)
-      data = BaseOutputData.new(*args, &self.build)
-      Logging.appenders.stdout(:layout => self.to_layout(data))
-    end
-  end
-
-end

data/lib/logsly/syslog_output.rb

@@ -1,26 +0,0 @@
-require 'syslog'
-require 'logging'
-require 'logsly/base_output'
-
-module Logsly
-
-  class SyslogOutput < BaseOutput
-    def to_appender(*args)
-      Syslog.close if Syslog.opened?
-
-      data = SyslogOutputData.new(*args, &self.build)
-      Logging.appenders.syslog(data.identity, {
-        :logopt   => data.log_opts,
-        :facility => data.facility,
-        :layout   => self.to_layout(data)
-      })
-    end
-  end
-
-  class SyslogOutputData < BaseOutputData
-    option :identity, String
-    option :log_opts, Integer, :default => (Syslog::LOG_PID | Syslog::LOG_CONS)
-    option :facility, Integer, :default => Syslog::LOG_LOCAL0
-  end
-
-end

data/test/unit/base_output_tests.rb

@@ -1,101 +0,0 @@
-require 'assert'
-require 'logsly/base_output'
-
-require 'logging'
-require 'logsly'
-
-class Logsly::BaseOutput
-
-  class UnitTests < Assert::Context
-    desc "Logsly::BaseOutput"
-    setup do
-      @out = Logsly::BaseOutput.new {}
-    end
-    subject{ @out }
-
-    should have_reader :build
-    should have_imeths :to_layout, :to_appender
-
-    should "know its build" do
-      build_proc = Proc.new {}
-      out = Logsly::BaseOutput.new &build_proc
-
-      assert_same build_proc, out.build
-    end
-
-    should "expect `to_appender` to be defined by subclasses" do
-      assert_raises NotImplementedError do
-        subject.to_appender
-      end
-    end
-
-  end
-
-  class BuildTests < UnitTests
-    desc "given a build"
-    setup do
-      Logsly.colors('a_color_scheme') do
-        debug :white
-      end
-      @out = Logsly::BaseOutput.new do |*args|
-        pattern args.to_s
-        colors  'a_color_scheme'
-      end
-    end
-
-    should "build a Logging pattern layout" do
-      data = Logsly::BaseOutputData.new('%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
-    end
-
-  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/file_output_tests.rb

@@ -1,58 +0,0 @@
-require 'assert'
-require 'logsly/file_output'
-
-require 'logging'
-require 'ostruct'
-require 'logsly'
-
-class Logsly::FileOutput
-
-  class UnitTests < Assert::Context
-    desc "Logsly::FileOutput"
-    setup do
-      @logger = OpenStruct.new
-      @logger.debug_level = :white
-      @logger.pattern = '%d : %m\n'
-      @logger.file = "log/dev.log"
-
-      Logsly.colors('a_color_scheme') do |logger|
-        debug logger.debug_level
-      end
-
-      @out = Logsly::FileOutput.new do |logger|
-        path logger.file
-
-        pattern logger.pattern
-        colors  'a_color_scheme'
-      end
-    end
-    subject{ @out }
-
-    should "be an output handler" do
-      assert_kind_of Logsly::BaseOutput, subject
-    end
-
-    should "build a Logging 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
-    end
-
-  end
-
-  class FileOutputDataTests < Assert::Context
-    desc "FileOutputData"
-    setup do
-      @data = Logsly::FileOutputData.new {}
-    end
-    subject{ @data }
-
-    should have_imeth :path
-
-  end
-
-end