yell 1.2.1 → 1.2.2

data/.travis.yml

@@ -3,9 +3,9 @@ language: ruby
 script: "rspec"
 
 rvm:
-  - ruby-1.8.7
-  - ruby-1.9.2
-  - ruby-1.9.3
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
   - ruby-head
   - jruby-18mode
   - jruby-19mode

data/lib/yell/adapters/datefile.rb

@@ -27,8 +27,8 @@ module Yell #:nodoc:
         # check whether to cleanup old files of the same pattern (default false)
         self.keep = options.fetch(:keep, false)
 
-        # check whether to symlink the otiginal filename (default false)
-        self.symlink = options.fetch(:symlink, false)
+        # check whether to symlink the otiginal filename (default true)
+        self.symlink = options.fetch(:symlink, true)
 
         @original_filename  = ::File.expand_path options.fetch(:filename, default_filename)
         options[:filename]  = @original_filename

data/lib/yell/logger.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'pathname'
+
 module Yell #:nodoc:
 
   # The +Yell::Logger+ is your entrypoint. Anything onwards is derived from here.
@@ -44,7 +46,7 @@ module Yell #:nodoc:
       _extract_adapters!( @options )
 
       # check if filename was given as argument and put it into the @options
-      if args.last.is_a?( String )
+      if [String, Pathname].include?(args.last.class)
         @options[:filename] = args.pop unless @options[:filename]
       end
 
@@ -88,7 +90,7 @@ module Yell #:nodoc:
     # @raise [Yell::NoSuchAdapter] Will be thrown when the adapter is not defined
     def adapter( type = :file, *args, &block )
       options = [@options, *args].inject( Hash.new ) do |h, c|
-        h.merge( c.is_a?(String) ? {:filename => c} : c  )
+        h.merge( [String, Pathname].include?(c.class) ? {:filename => c} : c  )
       end
 
       @adapters << Yell::Adapters.new( type, options, &block )

data/lib/yell/version.rb

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

data/spec/spec_helper.rb

@@ -14,17 +14,25 @@ RSpec.configure do |config|
 
   config.before do
     Yell::Repository.loggers.clear
+
     Dir[ fixture_path + "/*.log" ].each { |f| File.delete f }
   end
 
   config.after do
+    # release time after each test
+    Timecop.return
   end
 
+
   private
 
   def fixture_path
     File.expand_path( "fixtures", File.dirname(__FILE__) )
   end
 
+  def datefile_filename( pattern = Yell::Adapters::Datefile::DefaultDatePattern )
+    fixture_path + "/test.#{Time.now.strftime(pattern)}.log"
+  end
+
 end
 

data/spec/threaded/yell_spec.rb

@@ -82,7 +82,7 @@ describe "running Yell multi-threaded" do
         Timecop.freeze( date + 86400*count )
         sleep 0.3
 
-        files = Dir[ fixture_path + '/*.log' ]
+        files = Dir[ fixture_path + '/*.*.log' ]
         files.size.should == 2
 
         # files.last.should match( datefile_pattern_for(Time.now) ) # today

data/spec/yell/adapters/datefile_spec.rb

@@ -9,7 +9,7 @@ describe Yell::Adapters::Datefile do
   end
 
   describe :filename do
-    let( :adapter ) { Yell::Adapters::Datefile.new(:filename => filename) }
+    let( :adapter ) { Yell::Adapters::Datefile.new(:filename => filename, :symlink => false) }
 
     it "should be replaced with date_pattern" do
       adapter.write( event )
@@ -41,7 +41,7 @@ describe Yell::Adapters::Datefile do
   end
 
   describe :keep do
-    let( :adapter ) { Yell::Adapters::Datefile.new(:keep => 2, :filename => filename, :date_pattern => "%M") }
+    let( :adapter ) { Yell::Adapters::Datefile.new(:keep => 2, :filename => filename, :symlink => false, :date_pattern => "%M") }
 
     it "should keep the specified number or files upon rollover" do
       adapter.write( event )
@@ -60,22 +60,38 @@ describe Yell::Adapters::Datefile do
   end
 
   describe :symlink do
-    let( :adapter ) { Yell::Adapters::Datefile.new(:symlink => true, :filename => filename, :date_pattern => "%M") }
     let( :time ) { Time.now }
+    before { Timecop.freeze(time) }
+
+    context "default (true)" do
+      let( :adapter ) { Yell::Adapters::Datefile.new(:filename => filename, :date_pattern => "%M") }
 
-    it "should symlink to the orignal given :filename" do
-      Timecop.freeze( time ) do
+      it "should create the sylink the original filename" do
         adapter.write( event )
 
         File.symlink?( filename ).should be_true
         File.readlink( filename ).should == datefile_filename( adapter.date_pattern )
       end
 
-      Timecop.freeze( time + 60 ) do
+      it "should symlink upon rollover" do
         adapter.write( event )
 
-        File.symlink?( filename ).should be_true
-        File.readlink( filename ).should == datefile_filename( adapter.date_pattern )
+        Timecop.freeze( time + 120 ) do
+          adapter.write( event )
+
+          File.symlink?( filename ).should be_true
+          File.readlink( filename ).should == datefile_filename( adapter.date_pattern )
+        end
+      end
+    end
+
+    context "when set to false" do
+      let( :adapter ) { Yell::Adapters::Datefile.new(:symlink => false, :filename => filename, :date_pattern => "%M") }
+
+      it "should not create the sylink the original filename" do
+        adapter.write( event )
+
+        File.symlink?( filename ).should be_false
       end
     end
   end
@@ -102,10 +118,5 @@ describe Yell::Adapters::Datefile do
     end
   end
 
-
-  private
-
-  def datefile_filename( pattern = Yell::Adapters::Datefile::DefaultDatePattern )
-    fixture_path + "/test.#{Time.now.strftime(pattern)}.log"
-  end
 end
+

data/spec/yell/adapters/file_spec.rb

@@ -29,7 +29,7 @@ describe Yell::Adapters::File do
       end
     end
 
-    context "with given filename" do
+    context "with given :filename" do
       let( :filename ) { fixture_path + '/filename.log' }
       let( :adapter ) { Yell::Adapters::File.new( :filename => filename ) }
 
@@ -40,6 +40,17 @@ describe Yell::Adapters::File do
       end
     end
 
+    context "with given :pathname" do
+      let( :pathname ) { Pathname.new(fixture_path).join('filename.log') }
+      let( :adapter ) { Yell::Adapters::File.new( :filename => pathname ) }
+
+      it "should accept pathanme as filename" do
+        mock( File ).open( pathname.to_s, File::WRONLY|File::APPEND|File::CREAT ) { devnull }
+
+        adapter.write( event )
+      end
+    end
+
     context :sync do
       let( :adapter ) { Yell::Adapters::File.new }
 

data/spec/yell/logger_spec.rb

@@ -66,6 +66,14 @@ describe Yell::Logger do
     end
   end
 
+  context "initialize with a :filename of Pathname type" do
+    it "should call adapter with :file" do
+      mock.proxy( Yell::Adapters::File ).new( :filename => Pathname.new('test.log') )
+
+      Yell::Logger.new Pathname.new('test.log')
+    end
+  end
+
   context "initialize with a :stdout adapter" do
     before do
       mock.proxy( Yell::Adapters::Stdout ).new( anything )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yell
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-01-14 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