yell 0.13.2 → 0.13.3

data/lib/yell.rb

@@ -93,7 +93,9 @@ module Yell #:nodoc:
     end
 
     def _warn( *messages )
-      $stderr.puts messages.join( "\n" )
+      $stderr.puts "[Yell] " + messages.join( "\n" )
+    rescue
+      # do nothing
     end
   end
 

data/lib/yell/adapters/base.rb

@@ -105,14 +105,16 @@ module Yell #:nodoc:
 
         # Define instance method by given name and call the unbound
         # methods in order with provided block.
-        def define!( name, *methods, &block )
+        def define!( name, _m, m, &block )
           if block.arity == 0
             define_method( name ) do
-              methods.each { |m| m.bind(self).call }
+              _m.bind(self).call
+              m.bind(self).call
             end
           else
-            define_method( name ) do |*args| 
-              methods.each { |m| m.bind(self).call(*args) }
+            define_method( name ) do |*args|
+              _m.bind(self).call(*args)
+              m.bind(self).call(*args)
             end
           end
         end

data/lib/yell/adapters/datefile.rb

@@ -19,9 +19,18 @@ module Yell #:nodoc:
         @date = nil # default; do not override --R
 
         self.date_pattern = options.fetch(:date_pattern, DefaultDatePattern)
-        self.symlink_original_filename = options.fetch(:symlink_original_filename, false)
         self.keep = options.fetch(:keep, 0)
 
+        self.symlink = if options.key?(:symlink_original_filename)
+          Yell._deprecate( "0.13.3", "Use :symlink for symlinking to oriinal filename",
+            :before => "Yell.new { |l| l.adapter :datefile, :symlink_original_filename => true }",
+            :after => "Yell.new { |l| l.adapter :datefile, :symlink => true }"
+          )
+          options.fetch(:symlink_original_filename, false)
+        else
+          options.fetch(:symlink, false)
+        end
+
         @original_filename  = ::File.expand_path options.fetch(:filename, default_filename)
         options[:filename]  = @original_filename
       end
@@ -33,7 +42,7 @@ module Yell #:nodoc:
         return if ::File.exist?( @filename ) # do nothing when file ready present
 
         cleanup! if cleanup?
-        symlink_original_filename! if symlink_original_filename
+        symlink! if symlink?
 
         stream.puts( Metadata.call(@date, date_pattern) )
       end
@@ -55,8 +64,8 @@ module Yell #:nodoc:
       # set to the newly created file, and so on.
       #
       # @example
-      #   symlink_original_filename = true
-      attr_accessor :symlink_original_filename
+      #   symlink = true
+      attr_accessor :symlink
 
       # Set the amount of logfiles to keep when rolling over.
       # By default, no files will be cleaned up.
@@ -104,11 +113,16 @@ module Yell #:nodoc:
         keep.to_i > 0
       end
 
-      def symlink_original_filename!
+      def symlink!
         ::File.unlink( @original_filename ) if ::File.symlink?( @original_filename )
+
         ::File.symlink( @filename, @original_filename )
       end
 
+      def symlink?
+        !!symlink
+      end
+
       # Sets the filename with the `:date_pattern` appended to it.
       def filename_from( date )
         @original_filename.sub( /(\.\w+)?$/, ".#{date.strftime(date_pattern)}\\1" )

data/lib/yell/event.rb

@@ -12,12 +12,8 @@ module Yell #:nodoc:
     # regex to fetch caller attributes
     CallerRegexp = /^(.+?):(\d+)(?::in `(.+)')?/
 
-    # jruby and rubinius seemsto have a different caller
-    if defined?(RUBY_ENGINE) and ["rbx", "jruby"].include?(RUBY_ENGINE)
-      CallerIndex =1
-    else
-      CallerIndex = 2
-    end
+    # jruby and rubinius seem to have a different caller
+    CallerIndex = defined?(RUBY_ENGINE) && ["rbx", "jruby"].include?(RUBY_ENGINE) ? 1 : 2
 
     # Prefetch those values (no need to do that on every new instance)
     @@hostname  = Socket.gethostname rescue nil

data/lib/yell/version.rb

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

data/spec/yell/adapters/datefile_spec.rb

@@ -59,8 +59,8 @@ describe Yell::Adapters::Datefile do
     end
   end
 
-  describe :symlink_original_filename do
-    let( :adapter ) { Yell::Adapters::Datefile.new(:symlink_original_filename => true, :filename => filename, :date_pattern => "%M") }
+  describe :symlink do
+    let( :adapter ) { Yell::Adapters::Datefile.new(:symlink => true, :filename => filename, :date_pattern => "%M") }
     let( :time ) { Time.now }
 
     it "should symlink to the orignal given :filename" do

data/yell.gemspec

@@ -1,22 +1,21 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "yell/version"
+require File.expand_path( '../lib/yell/version', __FILE__ )
 
 Gem::Specification.new do |s|
   s.name        = "yell"
   s.version     = Yell::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ["Rudolf Schmidt"]
 
   s.homepage    = "http://rudionrails.github.com/yell"
-  s.summary     = %q{Yell - Your Extensible Logging Library }
+  s.summary     = %q{Yell - Your Extensible Logging Library}
   s.description = %q{Yell - Your Extensible Logging Library. Define multiple adapters, various log level combinations or message formatting options like you've never done before}
 
   s.rubyforge_project = "yell"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+
   s.require_paths = ["lib"]
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yell
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-13 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