yell 0.13.3 → 0.13.4

data/lib/yell.rb

@@ -72,16 +72,22 @@ module Yell #:nodoc:
     end
 
     # Loads a config from a YAML file
+    #
+    # @return [Yell::Logger] The logger instance
     def load!( file )
-      Yell.new Yell::Configuration.load!( file )
+      Yell.new Yell::Configuration.load!(file)
     end
 
     def env #:nodoc:
+      return ENV['YELL_ENV']  if ENV.key? 'YELL_ENV'
+      return ENV['RACK_ENV']  if ENV.key? 'RACK_ENV'
+      return ENV['RAILS_ENV'] if ENV.key? 'RAILS_ENV'
+
       if defined?( Rails )
-        return Rails.env
+        Rails.env
+      else
+        'development'
       end
-
-      ENV['YELL_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
     end
 
     def _deprecate( version, message, options = {} ) #:nodoc:
@@ -92,7 +98,7 @@ module Yell #:nodoc:
       _warn( *messages )
     end
 
-    def _warn( *messages )
+    def _warn( *messages ) #:nodoc:
       $stderr.puts "[Yell] " + messages.join( "\n" )
     rescue
       # do nothing

data/lib/yell/adapters/datefile.rb

@@ -16,7 +16,7 @@ module Yell #:nodoc:
 
 
       setup do |options|
-        @date = nil # default; do not override --R
+        @date, @date_strftime = nil, nil # default; do not override --R
 
         self.date_pattern = options.fetch(:date_pattern, DefaultDatePattern)
         self.keep = options.fetch(:keep, 0)
@@ -39,11 +39,10 @@ module Yell #:nodoc:
         return unless close? # do nothing when not closing
         close
 
-        return if ::File.exist?( @filename ) # do nothing when file ready present
-
         cleanup! if cleanup?
         symlink! if symlink?
 
+        return if ::File.exist?( @filename ) # exit when file ready present
         stream.puts( Metadata.call(@date, date_pattern) )
       end
 
@@ -81,17 +80,18 @@ module Yell #:nodoc:
 
       private
 
-      # Determines whether to close the file handle or not.
+      # Determine whether to close the file handle or not.
       #
       # It is based on the `:date_pattern` (can be passed as option upon initialize). 
       # If the current time hits the pattern, it closes the file stream.
       #
       # @return [Boolean] true or false
       def close?
-        _date = Time.now
+        _date           = Time.now
+        _date_strftime  = _date.strftime(date_pattern)
 
-        if @stream.nil? or _date != @date
-          @date = _date
+        if @stream.nil? or _date_strftime != @date_strftime
+          @date, @date_strftime = _date, _date_strftime
           return true
         end
 
@@ -114,8 +114,9 @@ module Yell #:nodoc:
       end
 
       def symlink!
-        ::File.unlink( @original_filename ) if ::File.symlink?( @original_filename )
+        return if ::File.symlink?(@original_filename) && ::File.readlink(@original_filename) == @filename # do nothing, because symlink is already correct
 
+        ::File.unlink( @original_filename ) if ::File.exist?( @original_filename )
         ::File.symlink( @filename, @original_filename )
       end
 

data/lib/yell/adapters/file.rb

@@ -23,6 +23,7 @@ module Yell #:nodoc:
         @stream = ::File.open( @filename, ::File::WRONLY|::File::APPEND|::File::CREAT )
         @stream.sync = true
 
+
         @stream
       end
 

data/lib/yell/version.rb

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

data/spec/yell/adapters/datefile_spec.rb

@@ -21,7 +21,7 @@ describe Yell::Adapters::Datefile do
       mock( File ).open( datefile_filename, anything ) { File.new('/dev/null', 'w') }
 
       adapter.write( event )
-      adapter.write( event )
+      Timecop.freeze( Time.now + 10 ) { adapter.write( event ) }
     end
 
     context "rollover" do

data/spec/yell_spec.rb

@@ -61,5 +61,53 @@ describe Yell do
     end
   end
 
+  context :env do
+    subject { Yell.env }
+
+    it "should default to YELL_ENV" do
+      subject.should == 'test'
+    end
+
+    context "fallback to RACK_ENV" do
+      before do
+        stub( ENV ).key?( 'YELL_ENV' ) { false }
+        mock( ENV ).key?( 'RACK_ENV' ) { true }
+
+        ENV['RACK_ENV'] = 'rack'
+      end
+
+      after { ENV.delete 'RACK_ENV' }
+
+      it { should == 'rack' }
+    end
+
+    context "fallback to RAILS_ENV" do
+      before do
+        stub( ENV ).key?( 'YELL_ENV' ) { false }
+        stub( ENV ).key?( 'RACK_ENV' ) { false }
+        mock( ENV ).key?( 'RAILS_ENV' ) { true }
+
+        ENV['RAILS_ENV'] = 'rails'
+      end
+
+      after { ENV.delete 'RAILS_ENV' }
+
+      it { should == 'rails' }
+    end
+
+    it "should fallback to Rails.env" do
+    end
+
+    context "fallback to development" do
+      before do
+        stub( ENV ).key?( 'YELL_ENV' ) { false }
+        stub( ENV ).key?( 'RACK_ENV' ) { false }
+        stub( ENV ).key?( 'RAILS_ENV' ) { false }
+      end
+
+      it { should == 'development' }
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yell
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-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
@@ -105,3 +105,4 @@ test_files:
 - spec/yell/logger_spec.rb
 - spec/yell/repository_spec.rb
 - spec/yell_spec.rb
+has_rdoc: