yell 1.5.1 → 2.0.0.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmUxZmVhNGNiZjdmNGJmZDk4MTU0MzQ0MDFiZGJmZmViNmYwNGI2YQ==
+    NGIxMzYwMGJmMjdmOGEzNmMwZTgwZmM3MmE2YzM0YmVlZTg2MTE0NA==
   data.tar.gz: !binary |-
-    NjRlM2U0MjliZjAwOTU2ZDk2MmNmNGJkYWNkZWZjN2VmMjZlNTJkOA==
+    OTExOWM2MmU1NTk3OTU0YzgzODIwYzQ0Njg2ZTMyYTZiYTkxMDYzMQ==
 SHA512:
   metadata.gz: !binary |-
-    NTc1ZTVjYWQ5NjMzYzdhOGUwMWEwMjgzM2M5YWIxMzk3NDhiYjVhZDYyZjlj
-    N2ZiZjY0NzczNjgwMzA5NjI3MzJkNjg2ODAzMjRiNmM2Yzg1ODQyOWJhNWFh
-    ZTkxYmVlOWNlOWU4M2Q0Yzc4ZTI0MWJmYjM1YjU4Y2VmZTE5N2Y=
+    YTEyNDk1NTI4NWZhZjZhNjRlYzdiNjkyOWI0MDY4YzlhZWY0ZWQ2MTI0YTNl
+    MGY4ZmM2N2I2ZTRjODk1NGZmMWY2MzdiNTVhNTI5NWNmNWYyNDJmZTJjMDJl
+    NDEzZTc4OGI5YWI2MTkwNTlmZjg3ZjIxNDE2ZTVmZWFkNjcwN2Q=
   data.tar.gz: !binary |-
-    ZTYwZmI2MTFkNWQ5ZjAxM2YxYTE0ODNkNGI3NGNiY2FhYmZlMjYzZDJkNTY4
-    YTRmYTk0ZWEzMTA2NjA3NzUxMTRjNzg1NzMyZmNlZGE1MzcxOTYxZWFkYzI1
-    ZjllZDk1MTQ0NWVhMzEyMDcxNWM1Zjk4M2VhYzJlOTlkNzc5M2M=
+    ODM2ZTAyZDIwYWFiZmQ3OTE4ZTZiZmNiMGY5ODdkOWMxZmU1NDkzNzY0M2Jl
+    OTNkZmYyZTM3MDdkMjlhNDQ1ZDJlNDBiNjZkMDY3MWY3Njk3MzcwNjY0M2Nm
+    Y2ZiNjAzZTc4OTQ0NGQ0MDMyNGVhZmIzMGFkYzJmZDMwYzM1NjE=

data/Gemfile

@@ -9,10 +9,13 @@ group :development, :test do
   gem 'rspec-core'
   gem 'rspec-expectations'
   gem "rr"
+  gem 'pry'
 
   gem 'timecop', '0.6.1'
 
   gem 'simplecov', :require => false, :platform => :ruby_20
   gem 'coveralls', :require => false, :platform => :ruby_20
+
+  gem 'activesupport', '~> 4'
 end
 

data/lib/core_ext/logger.rb

@@ -0,0 +1,18 @@
+require 'logger'
+
+class Logger
+
+  def level_with_yell=( level )
+    self.level_without_yell= Integer(level)
+  end
+  alias_method :level_without_yell=, :level=
+  alias_method :level=, :level_with_yell=
+
+  def add_with_yell( severity, message = nil, progname = nil, &block )
+    add_without_yell(Integer(severity), message, progname, &block)
+  end
+  alias_method :add_without_yell, :add
+  alias_method :add, :add_with_yell
+
+end
+

data/lib/yell.rb

@@ -129,6 +129,9 @@ require File.dirname(__FILE__) + '/yell/logger'
 # modules
 require File.dirname(__FILE__) + '/yell/loggable'
 
+# core extensions
+require File.dirname(__FILE__) + '/core_ext/logger'
+
 # register known adapters
 Yell.register :null, Yell::Adapters::Base # adapter that does nothing (for convenience only)
 Yell.register :file, Yell::Adapters::File
@@ -137,4 +140,3 @@ Yell.register :stdout, Yell::Adapters::Stdout
 Yell.register :stderr, Yell::Adapters::Stderr
 
 
-

data/lib/yell/adapters/base.rb

@@ -25,7 +25,7 @@ module Yell #:nodoc:
     #     end
     #
     #     write do |event|
-    #       message = format.format(event)
+    #       message = format.call(event)
     #
     #       STDOUT.puts message
     #     end

data/lib/yell/adapters/io.rb

@@ -46,7 +46,7 @@ module Yell #:nodoc:
         @stream = nil
 
         self.colors = options.fetch(:colors, false)
-        self.format = options.fetch(:format, nil)
+        self.formatter = options.fetch(:format, options[:formatter])
         self.sync = options.fetch(:sync, true)
 
         super
@@ -54,15 +54,14 @@ module Yell #:nodoc:
 
       # @overload write!( event )
       def write!( event )
-        message = format.format(event)
+        message = formatter.call(event)
 
         # colorize if applicable
         if colors and color = TTYColors[event.level]
           message = color + message + TTYColors[-1]
         end
 
-        message << "\n" unless message[-1] == ?\n
-        stream.syswrite( message )
+        stream.syswrite(message)
 
         super
       end
@@ -93,7 +92,7 @@ module Yell #:nodoc:
 
       # @overload inspectables
       def inspectables
-        super.concat [:format, :colors, :sync]
+        super.concat [:formatter, :colors, :sync]
       end
 
     end

data/lib/yell/configuration.rb

@@ -13,8 +13,8 @@ module Yell #:nodoc:
       yaml = YAML.load( ERB.new(File.read(file)).result )
 
       # in case we have ActiveSupport
-      if yaml.respond_to?(:with_indifference_access)
-        yaml = yaml.with_indifferent_access
+      if defined?(ActiveSupport::HashWithIndifferentAccess)
+        yaml = ActiveSupport::HashWithIndifferentAccess.new(yaml)
       end
 
       yaml[Yell.env] || {}

data/lib/yell/event.rb

@@ -14,6 +14,24 @@ module Yell #:nodoc:
     # jruby and rubinius seem to have a different caller
     CallerIndex = defined?(RUBY_ENGINE) && ["rbx", "jruby"].include?(RUBY_ENGINE) ? 1 : 2
 
+
+    class Options
+      attr_reader :severity
+      attr_reader :caller_offset
+
+      def initialize( severity, caller_offset )
+        @severity = severity
+        @caller_offset = caller_offset
+      end
+
+      def <=>( other )
+        @severity <=> other
+      end
+
+      alias :to_i :severity
+      alias :to_int :severity
+    end
+
     # Prefetch those values (no need to do that on every new instance)
     @@hostname  = Socket.gethostname rescue nil
     @@progname  = $0
@@ -21,7 +39,7 @@ module Yell #:nodoc:
     # Accessor to the log level
     attr_reader :level
 
-    # Accessor to the log messages
+    # Accessor to the log message
     attr_reader :messages
 
     # Accessor to the time the log event occured
@@ -31,17 +49,18 @@ module Yell #:nodoc:
     attr_reader :name
 
 
-    def initialize(logger, level, *messages, &block)
-      @time   = Time.now
-      @level  = level
-      @name   = logger.name
+    def initialize( logger, options, *messages, &block )
+      @time = Time.now
+      @name = logger.name
+
+      extract!(options)
 
       @messages = messages
-      @messages << block.call if block
+      @messages << block.call unless block.nil?
 
-      @caller = logger.trace.at?(level) ? caller[CallerIndex].to_s : ''
-      @file   = nil
-      @line   = nil
+      @caller = logger.trace.at?(level) ? caller[caller_index].to_s : ''
+      @file = nil
+      @line = nil
       @method = nil
 
       @pid = nil
@@ -85,6 +104,20 @@ module Yell #:nodoc:
 
     private
 
+    def extract!( options )
+      if options.is_a?(Yell::Event::Options)
+        @level = options.severity
+        @caller_offset = options.caller_offset
+      else
+        @level = options
+        @caller_offset = 0
+      end
+    end
+
+    def caller_index
+      CallerIndex + @caller_offset
+    end
+
     def backtrace!
       if m = CallerRegexp.match(@caller)
         @file, @line, @method = m[1..-1]

data/lib/yell/formatter.rb

@@ -1,6 +1,14 @@
 # encoding: utf-8
 require 'time'
 
+# TODO: Register custom formats
+#
+# @example The Yell default fomat
+#   Yell::Formatter.register(:default)
+#
+# @example The Ruby standard logger format
+#   Yell::Formatter.register(:stdlogger, "%l, [%d #%p] %5L -- : %m", "%Y-%m-%dT%H:%M:%S.%6N")
+#
 module Yell #:nodoc:
 
   # No format on the log message
@@ -47,8 +55,8 @@ module Yell #:nodoc:
   class Formatter
 
     Table = {
-      "m" => "message(*event.messages)",   # Message
-      "l" => "level(event.level)[0,1]",    # Level (short), e.g.'I', 'W'
+      "m" => "message(event.messages)",    # Message
+      "l" => "level(event.level, 1)",      # Level (short), e.g.'I', 'W'
       "L" => "level(event.level)",         # Level, e.g. 'INFO', 'WARN'
       "d" => "date(event.time)",           # ISO8601 Timestamp
       "h" => "event.hostname",             # Hostname
@@ -62,7 +70,20 @@ module Yell #:nodoc:
       "N" => "event.name"                  # Name of the logger
     }
 
-    Matcher = /([^%]*)(%\d*)?(#{Table.keys.join('|')})?(.*)/
+    # For standard formatted backwards compatibility
+    LegacyTable = Hash[ Table.keys.map { |k| [k, 'noop'] } ].merge(
+      'm' => 'message(msg)',
+      'l' => 'level(event, 1)',
+      'L' => 'level(event)',
+      'd' => 'date(time)',
+      "p" => "$$",
+      'P' => 'progname'
+    )
+
+    PatternMatcher = /([^%]*)(%\d*)?(#{Table.keys.join('|')})?(.*)/m
+
+
+    attr_reader :pattern, :date_pattern
 
 
     # Initializes a new +Yell::Formatter+.
@@ -92,7 +113,7 @@ module Yell #:nodoc:
       @modifier = builder.modifier
 
       define_date_method!
-      define_format_method!
+      define_call_method!
     end
 
     # Get a pretty string
@@ -117,8 +138,10 @@ module Yell #:nodoc:
         case
         when mod = @repository[message.class] || @repository[message.class.to_s]
           mod.call(message)
+        when message.is_a?(Array)
+          message.map { |m| call(m) }.join(" ")
         when message.is_a?(Hash)
-          message.map { |k,v| "#{k}: #{v}" }.join(", ")
+          message.map { |k, v| "#{k}: #{v}" }.join(", ")
         when message.is_a?(Exception)
           backtrace = message.backtrace ? "\n\t#{message.backtrace.join("\n\t")}" : ""
           sprintf("%s: %s%s", message.class, message.message, backtrace)
@@ -138,6 +161,7 @@ module Yell #:nodoc:
         @modifier = Modifier.new
 
         @pattern = pattern || Yell::DefaultFormat
+        @pattern << "\n" unless @pattern[-1] == ?\n # add newline if not present
         @date_pattern = date_pattern || :iso8601
 
         block.call(self) if block
@@ -155,33 +179,36 @@ module Yell #:nodoc:
       else "iso8601(t)"
       end
 
-      instance_eval %-
-        def date( t )
-          #{buf}
+      # define the method
+      instance_eval "def date(t = Time.now); #{buf}; end", __FILE__, __LINE__
+    end
+
+    # define a standard +Logger+ backwards compatible #call method for the formatter
+    def define_call_method!
+      instance_eval <<-METHOD, __FILE__, __LINE__
+        def call(event, time = nil, progname = nil, msg = nil)
+          event.is_a?(Yell::Event) ? #{to_sprintf(Table)} : #{to_sprintf(LegacyTable)}
         end
-      -
+      METHOD
     end
 
-    def define_format_method!
+    def to_sprintf( table )
+      # new and improved Yell version of a formatter call method
       buff, args, _pattern = "", [], @pattern.dup
 
       while true
-        match = Matcher.match(_pattern)
+        match = PatternMatcher.match(_pattern)
 
         buff << match[1] unless match[1].empty?
         break if match[2].nil?
 
         buff << match[2] + 's'
-        args << Table[ match[3] ]
+        args << table[ match[3] ]
 
         _pattern = match[4]
       end
 
-      instance_eval <<-EOS, __FILE__, __LINE__
-        def format( event )
-          sprintf("#{buff}", #{args.join(',')})
-        end
-      EOS
+      "sprintf('#{buff}', #{args.join(', ')})"
     end
 
     # The iso8601 implementation of the standard Time library is more than
@@ -199,12 +226,22 @@ module Yell #:nodoc:
       t.strftime("%Y-%m-%dT%H:%M:%S#{zone}")
     end
 
-    def level( l )
-      Yell::Severities[ l ]
+    def level( sev, length = nil )
+      severity = case sev
+      when Integer then Yell::Severities[sev] || 'ANY'
+      else sev
+      end
+
+      length.nil? ? severity : severity[0, length]
+    end
+
+    def message( messages )
+      @modifier.call(messages.is_a?(Array) && messages.size == 1 ? messages.first : messages)
     end
 
-    def message( *messages )
-      messages.map { |m| @modifier.call(m) }.join(" ")
+    # do nothing
+    def noop
+      ''
     end
 
   end

data/lib/yell/helpers/formatter.rb

@@ -4,18 +4,21 @@ module Yell #:nodoc:
     module Formatter #:nodoc:
 
       # Set the format for your message.
-      def format=( pattern )
+      def formatter=( pattern )
         @formatter = case pattern
         when Yell::Formatter then pattern
         when false then Yell::Formatter.new(Yell::NoFormat)
         else Yell::Formatter.new(*pattern)
         end
       end
+      alias :format= :formatter=
 
       # @private
-      def format
+      def formatter
         @formatter
       end
+      alias :format :formatter
+
 
       private
 

data/lib/yell/level.rb

@@ -23,6 +23,7 @@ module Yell #:nodoc:
   # @example Set at :info only
   #   Yell::Level.new.at(:info)
   class Level
+    include Comparable
 
     InterpretRegexp = /(at|gt|gte|lt|lte)?\.?(#{Yell::Severities.join('|')})/i
 
@@ -42,7 +43,7 @@ module Yell #:nodoc:
     #
     # @param [Integer,String,Symbol,Array,Range,nil] severity The severity for the level.
     def initialize( *severities )
-      set( *severities )
+      set(*severities)
     end
 
     # Set the severity to the given format
@@ -51,11 +52,11 @@ module Yell #:nodoc:
       severity = severities.length > 1 ? severities : severities.first
 
       case severity
-      when Array then at( *severity )
-      when Range then gte( severity.first ).lte( severity.last )
-      when Integer, Symbol then gte( severity )
-      when String then interpret( severity )
+      when Array then at(*severity)
+      when Range then gte(severity.first).lte(severity.last)
+      when String then interpret(severity)
       when Yell::Level then @severities = severity.severities
+      when Integer, Symbol then gte(severity)
       end
     end
 
@@ -67,7 +68,7 @@ module Yell #:nodoc:
     #
     # @return [Boolean] tru or false
     def at?( severity )
-      index = index_from( severity )
+      index = index_from(severity)
 
       index.nil? ? false : @severities[index]
     end
@@ -146,8 +147,12 @@ module Yell #:nodoc:
 
     # @private
     def ==(other)
-      return super unless other.respond_to?(:severities)
-      severities == other.severities
+      other.respond_to?(:severities) ? severities == other.severities : super
+    end
+
+    # @private
+    def <=>( other )
+      other.is_a?(Numeric) ? to_i <=> other : super
     end
 
 
@@ -162,7 +167,7 @@ module Yell #:nodoc:
     end
 
     def calculate!( modifier, severity )
-      index = index_from( severity )
+      index = index_from(severity)
       return if index.nil?
 
       case modifier
@@ -178,9 +183,8 @@ module Yell #:nodoc:
 
     def index_from( severity )
       case severity
-      when Integer        then severity
-      when String, Symbol then Yell::Severities.index( severity.to_s.upcase )
-      else nil
+      when String, Symbol then Yell::Severities.index(severity.to_s.upcase)
+      else Integer(severity)
       end
     end
 

data/lib/yell/logger.rb

@@ -2,32 +2,6 @@
 
 require 'pathname'
 
-# TODO: DSL improvements
-#
-# Initlalize an empty logger
-#   logger = Yell.new(adapters: false)
-#   logger.adapters.add :stdout
-#
-# Or shorthand for adapters.add
-#   logger.add :stdout
-#
-# Or with a block
-#   logger = Yell.new do |l|
-#     l.add :stdout
-#     l.add :stderr
-#   end
-#
-#  logger = Yell.new do |l|
-#    l.adapters.add :stdout
-#    l.adapters.add :stderr
-#  end
-#
-#
-# Define Silencers
-#   logger = Yell.new do |l|
-#     l.silence /password/
-#   end
-#
 module Yell #:nodoc:
 
   # The +Yell::Logger+ is your entrypoint. Anything onwards is derived from here.
@@ -73,20 +47,22 @@ module Yell #:nodoc:
       # extract options
       @options = args.last.is_a?(Hash) ? args.pop : {}
 
-      # adapters may be passed in the options
-      extract!(*@options[:adapters]) if @options.key?(:adapters)
-
       # check if filename was given as argument and put it into the @options
       if [String, Pathname].include?(args.last.class)
         @options[:filename] = args.pop unless @options[:filename]
       end
 
-      self.level = @options.fetch(:level, 0) # debug by default
-      self.name = @options.fetch(:name, nil) # no name by default
-      self.trace = @options.fetch(:trace, :error) # trace from :error level onwards
+      # FIXME: :format is deprecated in future versions --R
+      self.formatter = @options.fetch(:format, @options[:formatter])
+      self.level = @options.fetch(:level, 0)
+      self.name = @options.fetch(:name, nil)
+      self.trace = @options.fetch(:trace, :error)
 
       # silencer
-      self.silence(*@options[:silence])
+      self.silence(*@options[:silence]) if @options.key?(:silence)
+
+      # adapters may be passed in the options
+      extract!(*@options[:adapters]) if @options.key?(:adapters)
 
       # extract adapter
       self.adapter(args.pop) if args.any?
@@ -104,12 +80,23 @@ module Yell #:nodoc:
     #
     # @return [String] The logger's name
     def name=( val )
-      @name = val
-      Yell::Repository[@name] = self if @name
+      Yell::Repository[val] = self if val
+      @name = val.nil? ? "<#{self.class.name}##{object_id}>": val
 
       @name
     end
 
+    # Somewhat backwards compatible method (not fully though)
+    def add( options, *messages, &block )
+      return false unless level.at?(options)
+
+      messages = silencer.call(*messages)
+      return false if messages.empty?
+
+      event = Yell::Event.new(self, options, *messages, &block)
+      write(event)
+    end
+
     # Creates instance methods for every log level:
     #   `debug` and `debug?`
     #   `info` and `info?`
@@ -119,18 +106,12 @@ module Yell #:nodoc:
     Yell::Severities.each_with_index do |s, index|
       name = s.downcase
 
-      class_eval <<-EOS, __FILE__, __LINE__
+      class_eval <<-EOS, __FILE__, __LINE__ + index
         def #{name}?; level.at?(#{index}); end            # def info?; level.at?(1); end
                                                           #
         def #{name}( *m, &b )                             # def info( *m, &b )
-          return false unless #{name}?                    #   return false unless info?
-                                                          #
-          m = silencer.silence(*m) if silencer.silence?   #   m = silencer.silence(*m) if silencer.silence?
-          return false if m.empty?                        #   return false if m.empty?
-                                                          #
-          event = Yell::Event.new(self, #{index}, *m, &b) #   event = Yell::Event.new(self, 1, *m, &b)
-          write(event)                                    #   write(event)
-          true                                            #   true
+          options = Yell::Event::Options.new(#{index}, 1)
+          add(options, *m, &b)                            #   add(Yell::Event::Options.new(1, 1), *m, &b)
         end                                               # end
       EOS
     end
@@ -149,6 +130,11 @@ module Yell #:nodoc:
 
     private
 
+    def write( event )
+      _adapter.write(event)
+      true
+    end
+
     # The :adapters key may be passed to the options hash. It may appear in
     # multiple variations:
     #
@@ -166,11 +152,6 @@ module Yell #:nodoc:
       end
     end
 
-    # Cycles all the adapters and writes the message
-    def write( event )
-      _adapter.write(event)
-    end
-
     # Get an array of inspected attributes for the adapter.
     def inspectables
       [:name] | super

data/lib/yell/silencer.rb

@@ -4,6 +4,15 @@ module Yell #:nodoc:
   # The +Yell::Silencer+ is your handly helper for stiping out unwanted log messages.
   class Silencer
 
+    class PresetNotFound < StandardError
+      def message; "Could not find a preset for #{super.inspect}"; end
+    end
+
+    Presets = {
+      :assets => [/^Started GET "\/assets/, /^Served asset/, /^$/] # for Rails
+    }
+
+
     def initialize( *patterns )
       @patterns = patterns.dup
     end
@@ -17,27 +26,24 @@ module Yell #:nodoc:
     # @example Add regular expressions
     #   add( /password/ )
     #
-    # @return [Array] All set patterns
+    # @return [self] The silencer instance
     def add( *patterns )
-      @patterns = @patterns | patterns.compact
+      patterns.each { |pattern| add!(pattern) }
+
+      self
     end
 
     # Clears out all the messages that would match any defined pattern
     #
     # @example
-    #   silence('username', 'password')
+    #   call(['username', 'password'])
     #   #=> ['username]
     #
-    # @return [Array<String>] The remaining messages
-    def silence( *messages )
-      messages.reject { |m| matches?(m) }
-    end
+    # @return [Array] The remaining messages
+    def call( *messages )
+      return messages if @patterns.empty?
 
-    # Anything to silence at all?
-    #
-    # @return [Boolean] true or false
-    def silence?
-      @patterns.any?
+      messages.reject { |m| matches?(m) }
     end
 
     # Get a pretty string
@@ -53,6 +59,17 @@ module Yell #:nodoc:
 
     private
 
+    def add!( pattern )
+      @patterns = @patterns | fetch(pattern)
+    end
+
+    def fetch( pattern )
+      case pattern
+      when Symbol then Presets[pattern] or raise PresetNotFound.new(pattern)
+      else [pattern]
+      end
+    end
+
     # Check if the provided message matches any of the defined patterns.
     #
     # @example
@@ -61,7 +78,7 @@ module Yell #:nodoc:
     #
     # @return [Boolean] true or false
     def matches?( message )
-      @patterns.any? { |pattern| message.match(pattern) }
+      @patterns.any? { |pattern| message.respond_to?(:match) && message.match(pattern) }
     end
 
   end

data/lib/yell/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Yell #:nodoc:
-  VERSION = "1.5.1"
+  VERSION = "2.0.0.pre"
 
 end
 

data/spec/compatibility/activesupport_logger_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'active_support'
+
+# make a setup just like in railties ~> 4.0.0
+#
+# We simulate the case when Rails 4 starts up its server
+# and wants to append the log output.
+describe "Compatibility to ActiveSupport::Logger" do
+
+  let!(:yell) { Yell.new($stdout, :format => "%m") }
+
+  let!(:logger) do
+    console = ActiveSupport::Logger.new($stdout)
+    console.formatter = yell.formatter
+    console.level = yell.level
+
+    yell.extend(ActiveSupport::Logger.broadcast(console))
+
+    console
+  end
+
+  it "should behave correctly" do
+    mock($stdout).syswrite("Hello World\n") # yell
+    mock($stdout).write("Hello World\n") # logger
+
+    yell.info "Hello World"
+  end
+
+end
+

data/spec/compatibility/formatter_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'logger'
+
+describe "backwards compatible formatter" do
+
+  let(:time) { Time.now }
+  let(:formatter) { Yell::Formatter.new(Yell::DefaultFormat) }
+  let(:logger) { Logger.new($stdout) }
+
+  before do
+    Timecop.freeze(time)
+
+    logger.formatter = formatter
+  end
+
+  it "should format out the message correctly" do
+    mock($stdout).write("#{time.iso8601} [ INFO] #{$$} : Hello World!\n")
+
+    logger.info "Hello World!"
+  end
+
+end
+

data/spec/compatibility/level_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'logger'
+
+describe "backwards compatible level" do
+
+  let(:level) { Yell::Level.new(:error) }
+  let(:logger) { Logger.new($stdout) }
+
+  before do
+    logger.level = level
+  end
+
+  it "should format out the level correctly" do
+    expect(logger.level).to eq(level.to_i)
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -7,11 +7,13 @@ require 'rspec/core'
 require 'rspec/expectations'
 require 'rr'
 require 'timecop'
+require 'pry'
 
 begin
   require 'coveralls'
-
   require 'simplecov'
+
+  STDERR.puts "Running coverage..."
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
@@ -21,7 +23,7 @@ begin
     add_filter 'spec'
   end
 rescue LoadError
-  STDERR.puts "Not running coverage..."
+  # do nothing
 end
 
 require 'yell'
@@ -29,13 +31,13 @@ require 'yell'
 RSpec.configure do |config|
   config.mock_framework = :rr
 
-  config.before do
+  config.before :each do
     Yell::Repository.loggers.clear
 
     Dir[ fixture_path + "/*.log" ].each { |f| File.delete f }
   end
 
-  config.after do
+  config.after :each do
     Timecop.return # release time after each test
   end
 

data/spec/yell/adapters/io_spec.rb

@@ -55,14 +55,14 @@ describe Yell::Adapters::Io do
     end
 
     it "should format the message" do
-      mock.proxy(adapter.format).format( event )
+      mock.proxy(adapter.format).call( event )
 
       adapter.write(event)
     end
 
     it "should print formatted message to stream" do
-      formatted = Yell::Formatter.new.format( event )
-      mock(stream).syswrite( formatted << "\n" )
+      formatted = Yell::Formatter.new.call(event)
+      mock(stream).syswrite(formatted)
 
       adapter.write(event)
     end

data/spec/yell/formatter_spec.rb

@@ -11,7 +11,7 @@ describe Yell::Formatter do
 
   let(:time) { Time.now }
 
-  subject { formatter.format(event) }
+  subject { formatter.call(event) }
 
   before do
     Timecop.freeze(time)
@@ -20,42 +20,42 @@ describe Yell::Formatter do
   describe "patterns" do
     context "%m" do
       let(:pattern) { "%m" }
-      it { should eq(event.messages.join(' ')) }
+      it { should eq("#{event.messages.join(' ')}\n") }
     end
 
     context "%l" do
       let(:pattern) { "%l" }
-      it { should eq(Yell::Severities[event.level][0,1]) }
+      it { should eq("#{Yell::Severities[event.level][0,1]}\n") }
     end
 
     context "%L" do
       let(:pattern) { "%L" }
-      it { should eq(Yell::Severities[event.level]) }
+      it { should eq("#{Yell::Severities[event.level]}\n") }
     end
 
     context "%d" do
       let(:pattern) { "%d" }
-      it { should eq(event.time.iso8601) }
+      it { should eq("#{event.time.iso8601}\n") }
     end
 
     context "%p" do
       let(:pattern) { "%p" }
-      it { should eq(event.pid.to_s) }
+      it { should eq("#{event.pid}\n") }
     end
 
     context "%P" do
       let(:pattern) { "%P" }
-      it { should eq(event.progname) }
+      it { should eq("#{event.progname}\n") }
     end
 
     context "%t" do
       let(:pattern) { "%t" }
-      it { should eq(event.thread_id.to_s) }
+      it { should eq("#{event.thread_id}\n") }
     end
 
     context "%h" do
       let(:pattern) { "%h" }
-      it { should eq(event.hostname) }
+      it { should eq("#{event.hostname}\n") }
     end
 
     context ":caller" do
@@ -71,50 +71,50 @@ describe Yell::Formatter do
 
       context "%F" do
         let(:pattern) { "%F" }
-        it { should eq("/path/to/file.rb") }
+        it { should eq("/path/to/file.rb\n") }
       end
 
       context "%f" do
         let(:pattern) { "%f" }
-        it { should eq("file.rb") }
+        it { should eq("file.rb\n") }
       end
 
       context "%M" do
         let(:pattern) { "%M" }
-        it { should eq("test_method") }
+        it { should eq("test_method\n") }
       end
 
       context "%n" do
         let(:pattern) { "%n" }
-        it { should eq("123") }
+        it { should eq("123\n") }
       end
     end
 
     context "%N" do
       let(:pattern) { "%N" }
-      it { should eq("Yell") }
+      it { should eq("Yell\n") }
     end
   end
 
   describe "presets" do
     context "NoFormat" do
       let(:pattern) { Yell::NoFormat }
-      it { should eq("Hello World!") }
+      it { should eq("Hello World!\n") }
     end
 
     context "DefaultFormat" do
       let(:pattern) { Yell::DefaultFormat }
-      it { should eq("#{time.iso8601} [ INFO] #{$$} : Hello World!")  }
+      it { should eq("#{time.iso8601} [ INFO] #{$$} : Hello World!\n")  }
     end
 
     context "BasicFormat" do
       let(:pattern) { Yell::BasicFormat }
-      it { should eq("I, #{time.iso8601} : Hello World!") }
+      it { should eq("I, #{time.iso8601} : Hello World!\n") }
     end
 
     context "ExtendedFormat" do
       let(:pattern) { Yell::ExtendedFormat }
-      it { should eq("#{time.iso8601} [ INFO] #{$$} #{Socket.gethostname} : Hello World!") }
+      it { should eq("#{time.iso8601} [ INFO] #{$$} #{Socket.gethostname} : Hello World!\n") }
     end
   end
 
@@ -125,13 +125,13 @@ describe Yell::Formatter do
       stub(message).backtrace { ["backtrace"] }
     end
 
-    it { should eq("StandardError: This is an Exception\n\tbacktrace") }
+    it { should eq("StandardError: This is an Exception\n\tbacktrace\n") }
   end
 
   describe "Hash" do
     let(:message) { {:test => 'message'} }
 
-    it { should eq("test: message") }
+    it { should eq("test: message\n") }
   end
 
   describe "custom message modifiers" do
@@ -139,7 +139,7 @@ describe Yell::Formatter do
       Yell::Formatter.new(pattern) { |f| f.modify(String) { |m| "Modified! #{m}" } }
     end
 
-    it { should eq("Modified! #{message}") }
+    it { should eq("Modified! #{message}\n") }
   end
 
 end

data/spec/yell/logger_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 class LoggerFactory
   attr_accessor :logger
 
-  def foo
+  def info
     logger.info :foo
   end
 
-  def bar
-    logger.info :bar
+  def add
+    logger.add 1, :bar
   end
 end
 
@@ -19,8 +19,6 @@ describe Yell::Logger do
     let(:logger) { Yell::Logger.new }
     subject { logger }
 
-    its(:name) { should be_nil }
-
     context "log methods" do
       it { should respond_to(:debug) }
       it { should respond_to(:debug?) }
@@ -41,10 +39,16 @@ describe Yell::Logger do
       it { should respond_to(:unknown?) }
     end
 
-    context "default #adapter" do
-      subject { logger._adapter }
+    context "default #name" do
+      its(:name) { should eq("<Yell::Logger##{logger.object_id}>") }
+
+      it "should not be added to the repository" do
+        expect { Yell::Repository[logger.name] }.to raise_error(Yell::LoggerNotFound)
+      end
+    end
 
-      it { should be_kind_of(Yell::Adapters::File) }
+    context "default #adapter" do
+      its(:_adapter) { should be_kind_of(Yell::Adapters::File) }
     end
 
     context "default #level" do
@@ -187,11 +191,11 @@ describe Yell::Logger do
       factory = LoggerFactory.new
       factory.logger = logger
 
-      mock(stdout.send(:stream)).syswrite("#{__FILE__}, 7: foo\n")
-      mock(stdout.send(:stream)).syswrite("#{__FILE__}, 11: bar\n")
+      mock(stdout.send(:stream)).syswrite("#{__FILE__}, 7: info\n")
+      mock(stdout.send(:stream)).syswrite("#{__FILE__}, 11: add\n")
 
-      factory.foo
-      factory.bar
+      factory.info
+      factory.add
     end
   end
 
@@ -206,19 +210,19 @@ describe Yell::Logger do
     end
 
     it "should output multiple messages" do
-      logger.info "Hello", "W", "o", "r", "l", "d"
+      logger.info ["Hello", "W", "o", "r", "l", "d"]
 
       expect(line).to eq("Hello W o r l d\n")
     end
 
     it "should output a hash and message" do
-      logger.info "Hello World", :test => :message
+      logger.info ["Hello World", {:test => :message}]
 
       expect(line).to eq("Hello World test: message\n")
     end
 
     it "should output a hash and message" do
-      logger.info( {:test => :message}, "Hello World" )
+      logger.info [{:test => :message}, "Hello World"]
 
       expect(line).to eq("test: message Hello World\n")
     end

data/spec/yell/silencer_spec.rb

@@ -24,26 +24,15 @@ describe Yell::Silencer do
     end
   end
 
-  context "#silence?" do
-    let(:silencer) { Yell::Silencer.new }
-
-    it "should be false when no patterns present" do
-      expect(silencer.silence?).to be_false
-    end
-
-    it "should be true when patterns present" do
-      silencer.add /this/
-
-      expect(silencer.silence?).to be_true
-    end
-  end
-
-  context "#silence" do
+  context "#call" do
     let(:silencer) { Yell::Silencer.new(/this/) }
 
     it "should reject messages that match any pattern" do
-      expect(silencer.silence("this", "that")).to eq(["that"])
+      expect(silencer.call("this")).to eq([])
+      expect(silencer.call("that")).to eq(["that"])
+      expect(silencer.call("this", "that")).to eq(["that"])
     end
   end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yell
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Rudolf Schmidt
@@ -35,6 +35,7 @@ files:
 - examples/005.1-repository.rb
 - examples/006.1-the-loggable-module.rb
 - examples/006.2-the-loggable-module-with-inheritance.rb
+- lib/core_ext/logger.rb
 - lib/yell.rb
 - lib/yell/adapters.rb
 - lib/yell/adapters/base.rb
@@ -57,6 +58,9 @@ files:
 - lib/yell/repository.rb
 - lib/yell/silencer.rb
 - lib/yell/version.rb
+- spec/compatibility/activesupport_logger_spec.rb
+- spec/compatibility/formatter_spec.rb
+- spec/compatibility/level_spec.rb
 - spec/fixtures/yell.yml
 - spec/spec_helper.rb
 - spec/threaded/yell_spec.rb
@@ -90,9 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: yell
 rubygems_version: 2.1.5
@@ -100,6 +104,9 @@ signing_key:
 specification_version: 4
 summary: Yell - Your Extensible Logging Library
 test_files:
+- spec/compatibility/activesupport_logger_spec.rb
+- spec/compatibility/formatter_spec.rb
+- spec/compatibility/level_spec.rb
 - spec/fixtures/yell.yml
 - spec/spec_helper.rb
 - spec/threaded/yell_spec.rb