yell 2.0.0.pre → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGIxMzYwMGJmMjdmOGEzNmMwZTgwZmM3MmE2YzM0YmVlZTg2MTE0NA==
-  data.tar.gz: !binary |-
-    OTExOWM2MmU1NTk3OTU0YzgzODIwYzQ0Njg2ZTMyYTZiYTkxMDYzMQ==
+SHA1:
+  metadata.gz: 2158e0eeef9ba26f9dfeb6dca85a6f95a2d90c95
+  data.tar.gz: 9dff5c3e776e545c9704d2fcf574716b87b32c34
 SHA512:
-  metadata.gz: !binary |-
-    YTEyNDk1NTI4NWZhZjZhNjRlYzdiNjkyOWI0MDY4YzlhZWY0ZWQ2MTI0YTNl
-    MGY4ZmM2N2I2ZTRjODk1NGZmMWY2MzdiNTVhNTI5NWNmNWYyNDJmZTJjMDJl
-    NDEzZTc4OGI5YWI2MTkwNTlmZjg3ZjIxNDE2ZTVmZWFkNjcwN2Q=
-  data.tar.gz: !binary |-
-    ODM2ZTAyZDIwYWFiZmQ3OTE4ZTZiZmNiMGY5ODdkOWMxZmU1NDkzNzY0M2Jl
-    OTNkZmYyZTM3MDdkMjlhNDQ1ZDJlNDBiNjZkMDY3MWY3Njk3MzcwNjY0M2Nm
-    Y2ZiNjAzZTc4OTQ0NGQ0MDMyNGVhZmIzMGFkYzJmZDMwYzM1NjE=
+  metadata.gz: b0f4c57e784a8b45379a2853392de8fb8699ca5155ad5d5333da37d0fdd684c149bac7a86a69dc2e877963b1d55d1119fa7d68b95a161d05c7a01fbab513e5be
+  data.tar.gz: 9885f26f334b19200cfb68288cc8720a192144b3a42cd20b33355bdb2300ec8c9debed4a37bcc0ee7f529f6082b4d3c54ac320d929cfff9577249f0aa00b41e5

data/Gemfile

@@ -10,8 +10,7 @@ group :development, :test do
   gem 'rspec-expectations'
   gem "rr"
   gem 'pry'
-
-  gem 'timecop', '0.6.1'
+  gem 'timecop'
 
   gem 'simplecov', :require => false, :platform => :ruby_20
   gem 'coveralls', :require => false, :platform => :ruby_20

data/examples/003.4-formatting-on-your-own.rb

@@ -6,7 +6,7 @@ puts <<-EOS
 
 # The extended formatting string looks like: %d [%5L] %p %h : %m.
 
-logger = Yell.new STDOUT, :format => "[%f:%n in `%M'] %m"
+logger = Yell.new STDOUT, :format => "[%f:%n in `%M'] %m", :trace => true
 logger.info "Hello World!"
 #=> [003.4-formatting-on-your-own.rb:20 in `<main>'] Hello World!
 #    ^                               ^      ^        ^
@@ -16,6 +16,6 @@ logger.info "Hello World!"
 EOS
 
 puts "=== actuale example ==="
-logger = Yell.new STDOUT, :format => "[%f:%n in `%M'] %m"
+logger = Yell.new STDOUT, :format => "[%f:%n in `%M'] %m", :trace => true
 logger.info "Hello World!"
 

data/lib/yell/adapters.rb

@@ -10,6 +10,42 @@ module Yell #:nodoc:
   # directly.
   module Adapters
 
+    class Collection
+      def initialize( options = {} )
+        @options = options
+        @collection = []
+      end
+
+      def add( type = :file, *args, &block )
+        options = [@options, *args].inject(Hash.new) do |h, c|
+          h.merge( [String, Pathname].include?(c.class) ? {:filename => c} : c  )
+        end
+
+        # remove possible :null adapters
+        @collection.shift if @collection.first.instance_of?(Yell::Adapters::Base)
+
+        new_adapter = Yell::Adapters.new(type, options, &block)
+        @collection.push(new_adapter)
+
+        new_adapter
+      end
+
+      def empty?
+        @collection.empty?
+      end
+
+      # @private
+      def write( event )
+        @collection.each { |c| c.write(event) }
+        true
+      end
+
+      # @private
+      def close
+        @collection.each { |c| c.close }
+      end
+    end
+
     # holds the list of known adapters
     @adapters = {}
 
@@ -35,25 +71,9 @@ module Yell #:nodoc:
       end
 
       raise AdapterNotFound.new(name) if adapter.nil?
-
       adapter.new(options, &block)
     end
 
-    # Thanks, railties :-)
-    def self.broadcast( adapter )
-      Module.new do
-        define_method(:write) do |event|
-          adapter.write(event)
-          super(event)
-        end
-
-        define_method(:close) do
-          adapter.close
-          super()
-        end
-      end
-    end
-
   end
 end
 

data/lib/yell/adapters/base.rb

@@ -216,7 +216,7 @@ module Yell #:nodoc:
       #
       # @return [Boolean] true or false
       def write?( event )
-        @level.nil? || @level.at?(event.level)
+        level.nil? || level.at?(event.level)
       end
 
       # Get an array of inspected attributes for the adapter.

data/lib/yell/formatter.rb

@@ -160,7 +160,12 @@ module Yell #:nodoc:
       def initialize( pattern = nil, date_pattern = nil, &block )
         @modifier = Modifier.new
 
-        @pattern = pattern || Yell::DefaultFormat
+        @pattern = case pattern
+        when false then Yell::NoFormat
+        when nil then Yell::DefaultFormat
+        else pattern
+        end
+
         @pattern << "\n" unless @pattern[-1] == ?\n # add newline if not present
         @date_pattern = date_pattern || :iso8601
 
@@ -176,11 +181,15 @@ module Yell #:nodoc:
       buf = case @date_pattern
       when String then "t.strftime(@date_pattern)"
       when Symbol then respond_to?(@date_pattern, true) ? "#{@date_pattern}(t)" : "t.#{@date_pattern}"
-      else "iso8601(t)"
+      else t.iso8601
       end
 
       # define the method
-      instance_eval "def date(t = Time.now); #{buf}; end", __FILE__, __LINE__
+      instance_eval <<-METHOD, __FILE__, __LINE__
+        def date(t = Time.now)
+          #{buf}
+        end
+       METHOD
     end
 
     # define a standard +Logger+ backwards compatible #call method for the formatter
@@ -193,7 +202,6 @@ module Yell #:nodoc:
     end
 
     def to_sprintf( table )
-      # new and improved Yell version of a formatter call method
       buff, args, _pattern = "", [], @pattern.dup
 
       while true
@@ -208,22 +216,7 @@ module Yell #:nodoc:
         _pattern = match[4]
       end
 
-      "sprintf('#{buff}', #{args.join(', ')})"
-    end
-
-    # The iso8601 implementation of the standard Time library is more than
-    # twice as slow compared to using strftime. So, we just implement
-    # it ourselves --R
-    def iso8601( t )
-      zone = if t.utc?
-        "-00:00"
-      else
-        offset = t.utc_offset
-        sign = offset < 0 ? '-' : '+'
-        sprintf('%s%02d:%02d', sign, *(offset.abs/60).divmod(60))
-      end
-
-      t.strftime("%Y-%m-%dT%H:%M:%S#{zone}")
+      %Q{sprintf("#{buff.gsub(/"/, '\"')}", #{args.join(', ')})}
     end
 
     def level( sev, length = nil )

data/lib/yell/helpers/adapter.rb

@@ -24,32 +24,18 @@ module Yell #:nodoc:
       # @return [Yell::Adapter] The instance
       # @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( [String, Pathname].include?(c.class) ? {:filename => c} : c  )
-        end
-
-        new_adapter = Yell::Adapters.new(type, options, &block)
-
-        # Also replaces the :null logger of type Yell::Adapters::Base
-        if @_adapter.nil? || @_adapter.instance_of?(Yell::Adapters::Base)
-          @_adapter = new_adapter
-        else
-          @_adapter.extend(Yell::Adapters.broadcast(new_adapter))
-        end
-
-        _adapter
+        adapters.add(type, *args, &block)
       end
 
-      # @private
-      def _adapter
-        @_adapter
+      def adapters
+        @__adapters__
       end
 
 
       private
 
       def reset!
-        @_adapter = nil
+        @__adapters__ = Yell::Adapters::Collection.new(@options)
 
         super
       end

data/lib/yell/helpers/formatter.rb

@@ -5,17 +5,15 @@ module Yell #:nodoc:
 
       # Set the format for your message.
       def formatter=( pattern )
-        @formatter = case pattern
+        @__formatter__ = case pattern
         when Yell::Formatter then pattern
-        when false then Yell::Formatter.new(Yell::NoFormat)
         else Yell::Formatter.new(*pattern)
         end
       end
       alias :format= :formatter=
 
-      # @private
       def formatter
-        @formatter
+        @__formatter__
       end
       alias :format :formatter
 
@@ -23,7 +21,7 @@ module Yell #:nodoc:
       private
 
       def reset!
-        @formatter = Yell::Formatter.new
+        @__formatter__ = Yell::Formatter.new
 
         super
       end

data/lib/yell/helpers/level.rb

@@ -10,18 +10,22 @@ module Yell #:nodoc:
       #
       # @param [String, Symbol, Integer] severity The minimum log level
       def level=( severity )
-        @level.set(severity)
+        @__level__ = case severity
+        when Yell::Level then severity
+        else Yell::Level.new(severity)
+        end
       end
 
       # @private
       def level
-        @level
+        @__level__
       end
 
+
       private
 
       def reset!
-        @level = Yell::Level.new
+        @__level__ = Yell::Level.new
 
         super
       end

data/lib/yell/helpers/silencer.rb

@@ -8,22 +8,21 @@ module Yell #:nodoc:
         silencer.add(*patterns)
       end
 
-      # @private
       def silencer
-        @silencer
+        @__silencer__
       end
 
 
       private
 
       def reset!
-        @silencer = Yell::Silencer.new
+        @__silencer__ = Yell::Silencer.new
 
         super
       end
 
       def silence!( *messages )
-        silencer.silence!(*messages) if silencer.silence?
+        @__silencer__.silence!(*messages) if silencer.silence?
       end
 
     end

data/lib/yell/helpers/tracer.rb

@@ -18,22 +18,22 @@ module Yell #:nodoc:
       #
       # @return [Yell::Level] a level representation of the tracer
       def trace=( severity )
-        case severity
-        when false then @tracer.set("gt.#{Yell::Severities.last}")
-        else @tracer.set(severity)
+        @__trace__ = case severity
+        when Yell::Level then severity
+        when false then Yell::Level.new("gt.#{Yell::Severities.last}")
+        else Yell::Level.new(severity)
         end
       end
 
-      # @private
       def trace
-        @tracer
+        @__trace__
       end
 
 
       private
 
       def reset!
-        @tracer = Yell::Level.new
+        @__trace__ = Yell::Level.new('gte.error')
 
         super
       end

data/lib/yell/level.rb

@@ -55,8 +55,8 @@ module Yell #:nodoc:
       when Array then at(*severity)
       when Range then gte(severity.first).lte(severity.last)
       when String then interpret(severity)
-      when Yell::Level then @severities = severity.severities
       when Integer, Symbol then gte(severity)
+      when Yell::Level then @severities = severity.severities
       end
     end
 

data/lib/yell/logger.rb

@@ -42,8 +42,6 @@ module Yell #:nodoc:
     #     l.level = :info
     #   end
     def initialize( *args, &block )
-      reset!
-
       # extract options
       @options = args.last.is_a?(Hash) ? args.pop : {}
 
@@ -52,6 +50,8 @@ module Yell #:nodoc:
         @options[:filename] = args.pop unless @options[:filename]
       end
 
+      reset!
+
       # FIXME: :format is deprecated in future versions --R
       self.formatter = @options.fetch(:format, @options[:formatter])
       self.level = @options.fetch(:level, 0)
@@ -71,7 +71,7 @@ module Yell #:nodoc:
       block.arity > 0 ? block.call(self) : instance_eval(&block) if block_given?
 
       # default adapter when none defined
-      self.adapter(:file) if _adapter.nil?
+      self.adapter(:file) if adapters.empty?
     end
 
 
@@ -124,17 +124,16 @@ module Yell #:nodoc:
 
     # @private
     def close
-      _adapter.close
+      adapters.close
     end
 
-
-    private
-
+    # @private
     def write( event )
-      _adapter.write(event)
-      true
+      adapters.write(event)
     end
 
+    private
+
     # The :adapters key may be passed to the options hash. It may appear in
     # multiple variations:
     #

data/lib/yell/version.rb

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

data/spec/yell/logger_spec.rb

@@ -48,7 +48,10 @@ describe Yell::Logger do
     end
 
     context "default #adapter" do
-      its(:_adapter) { should be_kind_of(Yell::Adapters::File) }
+      subject { logger.adapters.instance_variable_get(:@collection) }
+
+      its(:size) { should == 1 }
+      its(:first) { should be_kind_of(Yell::Adapters::File) }
     end
 
     context "default #level" do
@@ -150,25 +153,34 @@ describe Yell::Logger do
 
   context "initialize with a block" do
     let(:level) { Yell::Level.new :error }
-    let(:stdout) { Yell::Adapters::Stdout.new }
-    let(:adapters) { loggr.instance_variable_get(:@adapters) }
+    let(:adapters) { logger.adapters.instance_variable_get(:@collection) }
 
     context "with arity" do
-      subject do
+      let(:logger) do
         Yell::Logger.new(:level => level) { |l| l.adapter(:stdout) }
       end
 
-      its(:level) { should eq(level) }
-      its(:_adapter) { should be_instance_of(Yell::Adapters::Stdout) }
+      it "should pass the level correctly" do
+        expect(logger.level).to eq(level)
+      end
+
+      it "should pass the adapter correctly" do
+        expect(adapters.first).to be_instance_of(Yell::Adapters::Stdout)
+      end
     end
 
     context "without arity" do
-      subject do
+      let(:logger) do
         Yell::Logger.new(:level => level) { adapter(:stdout) }
       end
 
-      its(:level) { should eq(level) }
-      its(:_adapter) { should be_instance_of(Yell::Adapters::Stdout) }
+      it "should pass the level correctly" do
+        expect(logger.level).to eq(level)
+      end
+
+      it "should pass the adapter correctly" do
+        expect(adapters.first).to be_instance_of(Yell::Adapters::Stdout)
+      end
     end
   end
 

data/yell.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "yell"
   s.version     = Yell::VERSION
   s.authors     = ["Rudolf Schmidt"]
+  s.license     = 'MIT'
 
   s.homepage    = "http://rudionrails.github.com/yell"
   s.summary     = %q{Yell - Your Extensible Logging Library}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yell
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0
 platform: ruby
 authors:
 - Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-11-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
@@ -81,7 +81,8 @@ files:
 - spec/yell_spec.rb
 - yell.gemspec
 homepage: http://rudionrails.github.com/yell
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -89,17 +90,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: yell
-rubygems_version: 2.1.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Yell - Your Extensible Logging Library