yell 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2158e0eeef9ba26f9dfeb6dca85a6f95a2d90c95
-  data.tar.gz: 9dff5c3e776e545c9704d2fcf574716b87b32c34
+  metadata.gz: aa1069934b048c65d5dbabcf49945cd08defdf1c
+  data.tar.gz: ed6c2a345a27ebc070468601ba71542ed90c0fa8
 SHA512:
-  metadata.gz: b0f4c57e784a8b45379a2853392de8fb8699ca5155ad5d5333da37d0fdd684c149bac7a86a69dc2e877963b1d55d1119fa7d68b95a161d05c7a01fbab513e5be
-  data.tar.gz: 9885f26f334b19200cfb68288cc8720a192144b3a42cd20b33355bdb2300ec8c9debed4a37bcc0ee7f529f6082b4d3c54ac320d929cfff9577249f0aa00b41e5
+  metadata.gz: 6622eba193295d3150f98c3dc17cc378b0ef373870cb8c01b8644baa32a4871bba79a24e058e02961dde0bca37005970da490ed2f36f43d6f56b754a49b727f7
+  data.tar.gz: 76098942230da8a9997d0010259802ca4dfaa02ea9b6a15ba642026987136a05dfc5019704ccb27263a48e4c54ff6265a14929e470ae1f7d03add1308b853ee3

data/lib/yell.rb

@@ -90,20 +90,29 @@ module Yell #:nodoc:
     end
 
     # @private
-    def _deprecate( version, message, options = {} )
+    def __deprecate__( version, message, options = {} ) #:nodoc:
       messages = ["Deprecation Warning (since v#{version}): #{message}" ]
       messages << "  before: #{options[:before]}" if options[:before]
       messages << "  after:  #{options[:after]}" if options[:after]
 
-      _warn(*messages)
+      __warn__(*messages)
     end
 
     # @private
-    def _warn( *messages )
+    def __warn__( *messages ) #:nodoc:
       $stderr.puts "[Yell] " + messages.join("\n")
     rescue Exception => e
       # do nothing
     end
+
+    # @private
+    def __fetch__( hash, *args )
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      value = args.map { |key| hash.fetch(key.to_sym, hash[key.to_s]) }.compact.first
+
+      value.nil? ? options[:default] : value
+    end
+
   end
 
 end

data/lib/yell/adapters.rb

@@ -54,7 +54,7 @@ module Yell #:nodoc:
     # @example
     #   Yell::Adapters.register( :myadapter, MyAdapter )
     def self.register( name, klass )
-      @adapters[name] = klass
+      @adapters[name.to_sym] = klass
     end
 
     # Returns an instance of the given processor type.
@@ -67,7 +67,7 @@ module Yell #:nodoc:
       adapter = case name
       when STDOUT then @adapters[:stdout]
       when STDERR then @adapters[:stderr]
-      else @adapters[name]
+      else @adapters[name.to_sym]
       end
 
       raise AdapterNotFound.new(name) if adapter.nil?

data/lib/yell/adapters/base.rb

@@ -52,7 +52,7 @@ module Yell #:nodoc:
         #     @file_handle = File.new( '/dev/null', 'w' )
         #   end
         def setup( &block )
-          compile!( :setup!, &block )
+          compile!(:setup!, &block)
         end
 
         # Define your write method with this helper.
@@ -62,7 +62,7 @@ module Yell #:nodoc:
         #     @file_handle.puts event.message
         #   end
         def write( &block )
-          compile!( :write!, &block )
+          compile!(:write!, &block)
         end
 
         # Define your open method with this helper.
@@ -72,7 +72,7 @@ module Yell #:nodoc:
         #     @stream = ::File.open( 'test.log', ::File::WRONLY|::File::APPEND|::File::CREAT )
         #   end
         def open( &block )
-          compile!( :open!, &block )
+          compile!(:open!, &block)
         end
 
         # Define your close method with this helper.
@@ -82,7 +82,7 @@ module Yell #:nodoc:
         #     @stream.close
         #   end
         def close( &block )
-          compile!( :close!, &block )
+          compile!(:close!, &block)
         end
 
 
@@ -106,24 +106,24 @@ module Yell #:nodoc:
           m = instance_method( name )
 
           # Create a new method with leading underscore
-          define_method( "_#{name}", &block )
-          _m = instance_method( "_#{name}" )
-          remove_method( "_#{name}" )
+          define_method("_#{name}", &block)
+          _m = instance_method("_#{name}")
+          remove_method("_#{name}")
 
           # Define instance method
-          define!( name, _m, m, &block )
+          define!(name, _m, m, &block)
         end
 
         # Define instance method by given name and call the unbound
         # methods in order with provided block.
         def define!( name, _m, m, &block )
           if block.arity == 0
-            define_method( name ) do
+            define_method(name) do
               _m.bind(self).call
               m.bind(self).call
             end
           else
-            define_method( name ) do |*args|
+            define_method(name) do |*args|
               _m.bind(self).call(*args)
               m.bind(self).call(*args)
             end
@@ -180,7 +180,7 @@ module Yell #:nodoc:
       # Adapter classes should provide their own implementation 
       # of this method (if applicable).
       def setup!( options )
-        self.level = options[:level]
+        self.level = Yell.__fetch__(options,:level)
       end
 
       # Perform the actual write.
@@ -221,7 +221,7 @@ module Yell #:nodoc:
 
       # Get an array of inspected attributes for the adapter.
       def inspectables
-        [ :level ]
+        [:level]
       end
 
     end

data/lib/yell/adapters/datefile.rb

@@ -54,12 +54,12 @@ module Yell #:nodoc:
 
       # @overload setup!( options )
       def setup!( options )
-        self.header = options.fetch(:header, true)
-        self.date_pattern = options.fetch(:date_pattern, DefaultDatePattern)
-        self.keep = options.fetch(:keep, false)
-        self.symlink = options.fetch(:symlink, true)
+        self.header = Yell.__fetch__(options, :header, :default => true)
+        self.date_pattern = Yell.__fetch__(options, :date_pattern, :default => DefaultDatePattern)
+        self.keep = Yell.__fetch__(options, :keep, :default => false)
+        self.symlink = Yell.__fetch__(options, :symlink, :default => true)
 
-        @original_filename  = ::File.expand_path options.fetch(:filename, default_filename)
+        @original_filename  = ::File.expand_path(Yell.__fetch__(options, :filename, :default => default_filename))
         options[:filename]  = @original_filename
 
         @date = Time.now
@@ -86,7 +86,7 @@ module Yell #:nodoc:
 
       # @overload close!
       def close!
-        @filename = filename_for( @date )
+        @filename = filename_for(@date)
 
         super
       end
@@ -117,7 +117,7 @@ module Yell #:nodoc:
       # it makes the best guess by checking the last access time (which may result 
       # in false cleanups).
       def cleanup!
-        files = Dir[ @original_filename.sub( /(\.\w+)?$/, ".*\\1" ) ].sort.select do |file|
+        files = Dir[ @original_filename.sub(/(\.\w+)?$/, ".*\\1") ].sort.select do |file|
           _, pattern = header_from(file)
 
           # Select if the date pattern is nil (no header info available within the file) or
@@ -140,14 +140,16 @@ module Yell #:nodoc:
         # do nothing, because symlink is already correct
         return if ::File.symlink?(@original_filename) && ::File.readlink(@original_filename) == @filename
 
-        ::File.unlink( @original_filename ) if ::File.exist?( @original_filename )
-        ::File.symlink( @filename, @original_filename )
+        ::File.unlink(@original_filename) if ::File.exist?(@original_filename)
+        ::File.symlink(@filename, @original_filename)
       end
 
       # Symlink the original filename?
       #
       # @return [Boolean] true or false
-      def symlink?; !!symlink; end
+      def symlink?
+        !!symlink
+      end
 
       # Write the header information into the file
       def header!
@@ -157,24 +159,26 @@ module Yell #:nodoc:
       # Write header into the file?
       #
       # @return [Boolean] true or false
-      def header?; !!header; end
+      def header?
+        !!header
+      end
 
       # Sets the filename with the `:date_pattern` appended to it.
       def filename_for( date )
-        @original_filename.sub( /(\.\w+)?$/, ".#{date.strftime(date_pattern)}\\1" )
+        @original_filename.sub(/(\.\w+)?$/, ".#{date.strftime(date_pattern)}\\1")
       end
 
       # Fetch the header form the file
       def header_from( file )
-        if m = ::File.open( file, &:readline ).match( HeaderRegexp )
+        if m = ::File.open(file, &:readline).match(HeaderRegexp)
           # in case there is a Header present, we can just read from it
-          [ Time.at( m[2].to_f ), m[3] ]
+          [ Time.at(m[2].to_f), m[3] ]
         else
           # In case there is no header: we need to take a good guess
           #
           # Since the pattern can not be determined, we will just return the Posix ctime. 
           # That is NOT the creatint time, so the value will potentially be wrong!
-          [ ::File.ctime(file), nil ]
+          [::File.ctime(file), nil]
         end
       end
 

data/lib/yell/adapters/file.rb

@@ -11,14 +11,14 @@ module Yell #:nodoc:
 
       # @overload setup!( options )
       def setup!( options )
-        @filename = ::File.expand_path options.fetch(:filename, default_filename)
+        @filename = ::File.expand_path(Yell.__fetch__(options, :filename, :default => default_filename))
 
         super
       end
 
       # @overload open!
       def open!
-        @stream = ::File.open( @filename, ::File::WRONLY|::File::APPEND|::File::CREAT )
+        @stream = ::File.open(@filename, ::File::WRONLY|::File::APPEND|::File::CREAT)
 
         super
       end
@@ -26,7 +26,7 @@ module Yell #:nodoc:
       def default_filename #:nodoc:
         logdir = ::File.expand_path("log")
 
-        ::File.expand_path ::File.directory?(logdir) ? "#{logdir}/#{Yell.env}.log" : "#{Yell.env}.log"
+        ::File.expand_path(::File.directory?(logdir) ? "#{logdir}/#{Yell.env}.log" : "#{Yell.env}.log")
       end
 
     end

data/lib/yell/adapters/io.rb

@@ -45,9 +45,9 @@ module Yell #:nodoc:
       def setup!( options )
         @stream = nil
 
-        self.colors = options.fetch(:colors, false)
-        self.formatter = options.fetch(:format, options[:formatter])
-        self.sync = options.fetch(:sync, true)
+        self.colors = Yell.__fetch__(options, :colors, :default => false)
+        self.formatter = Yell.__fetch__(options, :format, :formatter)
+        self.sync = Yell.__fetch__(options, :sync, :default => true)
 
         super
       end
@@ -68,15 +68,15 @@ module Yell #:nodoc:
 
       # @overload open!
       def open!
-        @stream.sync = self.sync if @stream.respond_to? :sync
-        @stream.flush            if @stream.respond_to? :flush
+        @stream.sync = self.sync if @stream.respond_to?(:sync)
+        @stream.flush if @stream.respond_to?(:flush)
 
         super
       end
 
       # @overload close!
       def close!
-        @stream.close if @stream.respond_to? :close
+        @stream.close if @stream.respond_to?(:close)
         @stream = nil
 
         super

data/lib/yell/logger.rb

@@ -53,16 +53,16 @@ module Yell #:nodoc:
       reset!
 
       # 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)
+      self.formatter = Yell.__fetch__(@options, :format, :formatter)
+      self.level = Yell.__fetch__(@options, :level, :default => 0)
+      self.name = Yell.__fetch__(@options, :name)
+      self.trace = Yell.__fetch__(@options, :trace, :default => :error)
 
       # silencer
-      self.silence(*@options[:silence]) if @options.key?(:silence)
+      self.silence(*Yell.__fetch__(@options, :silence))
 
       # adapters may be passed in the options
-      extract!(*@options[:adapters]) if @options.key?(:adapters)
+      extract!(*Yell.__fetch__(@options, :adapters))
 
       # extract adapter
       self.adapter(args.pop) if args.any?

data/lib/yell/repository.rb

@@ -35,7 +35,7 @@ module Yell #:nodoc:
     # @raise [Yell::LoggerNotFound] Raised when repository does not have that key
     # @return [Yell::Logger] The logger instance
     def self.[]( name )
-      synchronize { instance.fetch(name) or raise Yell::LoggerNotFound.new(name) }
+      synchronize { instance.__fetch__(name) or raise Yell::LoggerNotFound.new(name) }
     end
 
     # Get the list of all loggers in the repository
@@ -57,11 +57,11 @@ module Yell #:nodoc:
     # If the logger could not be found and has a superclass, it 
     # will attempt to look there. This is important for the 
     # Yell::Loggable module.
-    def fetch( name )
+    def __fetch__( name )
       logger = loggers[name] || loggers[name.to_s]
 
       if logger.nil? && name.respond_to?(:superclass)
-        return fetch(name.superclass)
+        return __fetch__(name.superclass)
       end
 
       logger

data/lib/yell/version.rb

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

data/spec/compatibility/activesupport_logger_spec.rb

@@ -1,12 +1,16 @@
 # encoding: utf-8
 require 'spec_helper'
-require 'active_support'
+
+begin
+  require 'active_support'
+rescue LoadError
+end
 
 # 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
+describe "Compatibility to ActiveSupport::Logger", pending: (!defined?(ActiveSupport) || ActiveSupport::VERSION::MAJOR < 4) do
 
   let!(:yell) { Yell.new($stdout, :format => "%m") }
 

data/spec/yell_spec.rb

@@ -24,7 +24,7 @@ describe Yell do
   end
 
   context ".load!" do
-    subject { Yell.load!( 'yell.yml' ) }
+    subject { Yell.load!('yell.yml') }
 
     before do
       mock(Yell::Configuration).load!('yell.yml') { {} }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yell
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies: []
 description: Yell - Your Extensible Logging Library. Define multiple adapters, various
   log level combinations or message formatting options like you've never done before