yell 0.12.1 → 0.13.0

data/lib/yell.rb

@@ -12,7 +12,7 @@
 #
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-#
+
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -22,6 +22,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Yell #:nodoc:
+
+  # Holds all Yell severities
   Severities = [ 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'UNKNOWN' ]
 
   class << self
@@ -36,11 +38,25 @@ module Yell #:nodoc:
 
     # Shortcut to Yell::Level.new
     #
-    # @return [Yell::Level] A Yell::Level instance
+    # @return [Yell::Level] The level instance
     def level( val = nil )
       Yell::Level.new( val )
     end
 
+    # Shortcut to Yell::Repository[]
+    #
+    # @return [Yell::Logger] The logger instance
+    def []( name )
+      Yell::Repository[ name ]
+    end
+
+    # Shortcut to Yell::Repository[]=
+    #
+    # @return [Yell::Logger] The logger instance
+    def []=( name, logger )
+      Yell::Repository[ name ] = logger
+    end
+
     # Shortcut to Yell::Fomatter.new
     #
     # @return [Yell::Formatter] A Yell::Formatter instance
@@ -48,28 +64,32 @@ module Yell #:nodoc:
       Yell::Formatter.new( pattern, date_pattern )
     end
 
-    def env #:nodoc:
-      ENV['YELL_ENV'] || ENV['RACK_ENV'] ||ENV['RAILS_ENV'] || 'development'
-    end
-
+    # Loads a config from a YAML file
     def load!( file )
       Yell.new Yell::Configuration.load!( file )
     end
 
-    def _deprecate( version, message, options = {} )
-      warning = ["Deprecation Warning (since v#{version}): #{message}" ]
-      warning << "  before: #{options[:before]}" if options[:before]
-      warning << "  after:  #{options[:after]}" if options[:after]
+    def env #:nodoc:
+      ENV['YELL_ENV'] || ENV['RACK_ENV'] ||ENV['RAILS_ENV'] || 'development'
+    end
+
+    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]
 
-      $stderr.puts warning.join( "\n" )
+      _warn( *messages )
     end
 
+    def _warn( *messages )
+      $stderr.puts messages.join( "\n" )
+    end
   end
 
 end
 
 require File.dirname(__FILE__) + '/yell/configuration'
-
+require File.dirname(__FILE__) + '/yell/repository'
 require File.dirname(__FILE__) + '/yell/event'
 require File.dirname(__FILE__) + '/yell/level'
 require File.dirname(__FILE__) + '/yell/formatter'

data/lib/yell/logger.rb

@@ -77,7 +77,7 @@ module Yell #:nodoc:
     #
     # @param [Symbol] type The type of the adapter, may be `:file` or `:datefile` (default `:file`)
     #
-    # @return A new +Yell::Adapter+ instance
+    # @return [Yell::Adapter] The instance
     #
     # @raise [Yell::NoSuchAdapter] Will be thrown when the adapter is not defined
     def adapter( type = :file, *args, &block )

data/lib/yell/repository.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+require 'monitor'
+require "singleton"
+
+module Yell #:nodoc:
+  class Repository
+    extend MonitorMixin
+    include Singleton
+
+    attr_accessor :loggers
+
+    def initialize
+      @loggers = {}
+    end
+
+    # Set loggers in the repository
+    #
+    # @example Set a logger
+    #   Yell::Repository[ 'development' ] = Yell::Logger.new :stdout
+    #
+    # @return [Yell::Logger] The logger instance
+    def self.[]=( name, logger )
+      synchronize { instance.loggers[name] = logger }
+    end
+
+    # Get loggers from the repository
+    #
+    # @example Get the logger
+    #   Yell::Repository[ 'development' ]
+    #
+    # @return [Yell::Logger] The logger instance
+    def self.[]( name )
+      synchronize { instance.loggers[name] }
+    end
+
+    # Clears all logger instances (handy for testing)
+    def self.clear
+      synchronize { instance.loggers.clear }
+    end
+
+  end
+end
+

data/lib/yell/version.rb

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

data/spec/spec_helper.rb

@@ -12,6 +12,10 @@ require 'timecop'
 RSpec.configure do |config|
   config.mock_framework = :rr
 
+  config.before do
+    Yell::Repository.clear
+  end
+
   config.after do
     Dir[ fixture_path + "/*.log" ].each { |f| File.delete f }
   end

data/spec/threaded/yell_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "running Yell multi-threaded" do
+  let( :threads ) { 100 }
+
+  let( :filename ) { fixture_path + '/threaded.log' }
+  let( :lines ) { `wc -l #{filename}`.to_i }
+
+  it "should write all messages from one instance" do
+    logger = Yell.new( filename )
+
+    (1..threads).map do |count|
+      Thread.new { 10.times { logger.info count } }
+    end.each(&:join)
+
+    lines.should == 10*threads
+  end
+
+  # it "should write all messages from multiple instances" do
+  #   (1..threads).map do |count|
+  #     logger = Yell.new( filename )
+
+  #     Thread.new do
+  #       10.times { logger.info count }
+  #     end
+  #   end.each(&:join)
+
+  #   lines.should == 10*threads
+  # end
+
+  it "should write all messages from one repository" do
+    Yell[ 'threaded' ] = Yell.new( filename )
+
+    (1..threads).map do |count|
+      Thread.new { 10.times { Yell['threaded'].info count } }
+    end.each(&:join)
+
+    lines.should == 10*threads
+  end
+
+end

data/spec/yell/event_spec.rb

@@ -54,7 +54,7 @@ describe Yell::Event do
   end
 
   context :time do
-    subject { event.time }
+    subject { event.time.to_s }
 
     let(:time) { Time.now }
 
@@ -62,7 +62,7 @@ describe Yell::Event do
       Timecop.freeze( time )
     end
 
-    it { should == time }
+    it { should == time.to_s }
   end
 
   context :hostname do

data/spec/yell/repository_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Yell::Repository do
+  let( :name ) { 'test' }
+  let( :logger ) { Yell.new :stdout }
+
+  subject { Yell[name] }
+
+
+  context ".[]" do
+    context "when not set" do
+      it { should be_nil }
+    end
+
+    context "when assigned" do
+      before do
+        Yell[ name ] = logger
+      end
+
+      it { should == logger }
+    end
+  end
+
+  context ".[]=" do
+    before do
+      Yell[ name ] = logger
+    end
+
+    it { should == logger }
+  end
+
+end
+

metadata

@@ -1,97 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yell
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.13.0
   prerelease: 
-  version: 0.12.1
 platform: ruby
-authors: 
-  - Rudolf Schmidt
+authors:
+- Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-29 00:00:00 Z
+date: 2012-09-04 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
+description: Yell - Your Extensible Logging Library. Define multiple adapters, various
+  log level combinations or message formatting options like you've never done before
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - .travis.yml
-  - Gemfile
-  - LICENSE.txt
-  - README.md
-  - Rakefile
-  - examples/001-basic-usage.rb
-  - examples/002.1-log-level-basics.rb
-  - examples/002.2-log-level-on-certain-severities-only.rb
-  - examples/002.3-log-level-within-range.rb
-  - examples/003.1-formatting-DefaultFormat.rb
-  - examples/003.2-formatting-BasicFormat.rb
-  - examples/003.3-formatting-ExtendedFormat.rb
-  - examples/003.4-formatting-on-your-own.rb
-  - examples/004.1-colorizing-the-log-output.rb
-  - lib/yell.rb
-  - lib/yell/adapters.rb
-  - lib/yell/adapters/base.rb
-  - lib/yell/adapters/datefile.rb
-  - lib/yell/adapters/file.rb
-  - lib/yell/adapters/io.rb
-  - lib/yell/adapters/streams.rb
-  - lib/yell/configuration.rb
-  - lib/yell/event.rb
-  - lib/yell/formatter.rb
-  - lib/yell/level.rb
-  - lib/yell/logger.rb
-  - lib/yell/version.rb
-  - spec/fixtures/yell.yml
-  - spec/spec_helper.rb
-  - spec/yell/adapters/base_spec.rb
-  - spec/yell/adapters/datefile_spec.rb
-  - spec/yell/adapters/file_spec.rb
-  - spec/yell/adapters/io_spec.rb
-  - spec/yell/adapters/streams_spec.rb
-  - spec/yell/adapters_spec.rb
-  - spec/yell/configuration_spec.rb
-  - spec/yell/event_spec.rb
-  - spec/yell/formatter_spec.rb
-  - spec/yell/level_spec.rb
-  - spec/yell/logger_spec.rb
-  - spec/yell_spec.rb
-  - yell.gemspec
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- examples/001-basic-usage.rb
+- examples/002.1-log-level-basics.rb
+- examples/002.2-log-level-on-certain-severities-only.rb
+- examples/002.3-log-level-within-range.rb
+- examples/003.1-formatting-DefaultFormat.rb
+- examples/003.2-formatting-BasicFormat.rb
+- examples/003.3-formatting-ExtendedFormat.rb
+- examples/003.4-formatting-on-your-own.rb
+- examples/004.1-colorizing-the-log-output.rb
+- lib/yell.rb
+- lib/yell/adapters.rb
+- lib/yell/adapters/base.rb
+- lib/yell/adapters/datefile.rb
+- lib/yell/adapters/file.rb
+- lib/yell/adapters/io.rb
+- lib/yell/adapters/streams.rb
+- lib/yell/configuration.rb
+- lib/yell/event.rb
+- lib/yell/formatter.rb
+- lib/yell/level.rb
+- lib/yell/logger.rb
+- lib/yell/repository.rb
+- lib/yell/version.rb
+- spec/fixtures/yell.yml
+- spec/spec_helper.rb
+- spec/threaded/yell_spec.rb
+- spec/yell/adapters/base_spec.rb
+- spec/yell/adapters/datefile_spec.rb
+- spec/yell/adapters/file_spec.rb
+- spec/yell/adapters/io_spec.rb
+- spec/yell/adapters/streams_spec.rb
+- spec/yell/adapters_spec.rb
+- spec/yell/configuration_spec.rb
+- spec/yell/event_spec.rb
+- spec/yell/formatter_spec.rb
+- spec/yell/level_spec.rb
+- spec/yell/logger_spec.rb
+- spec/yell/repository_spec.rb
+- spec/yell_spec.rb
+- yell.gemspec
 homepage: http://rudionrails.github.com/yell
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: yell
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Yell - Your Extensible Logging Library
-test_files: []
-
+test_files:
+- spec/fixtures/yell.yml
+- spec/spec_helper.rb
+- spec/threaded/yell_spec.rb
+- spec/yell/adapters/base_spec.rb
+- spec/yell/adapters/datefile_spec.rb
+- spec/yell/adapters/file_spec.rb
+- spec/yell/adapters/io_spec.rb
+- spec/yell/adapters/streams_spec.rb
+- spec/yell/adapters_spec.rb
+- spec/yell/configuration_spec.rb
+- spec/yell/event_spec.rb
+- spec/yell/formatter_spec.rb
+- spec/yell/level_spec.rb
+- spec/yell/logger_spec.rb
+- spec/yell/repository_spec.rb
+- spec/yell_spec.rb
 has_rdoc: