yell 0.9.0 → 0.10.0

data/Gemfile

@@ -5,5 +5,9 @@ gemspec
 
 group :development, :test do
   gem "rake"
+
+  gem "rspec"
+  gem "rr"
+  gem "timecop"
 end
 

data/lib/yell/configuration.rb

@@ -9,7 +9,7 @@ module Yell #:nodoc:
   class Configuration
 
     def self.load!( file )
-      YAML.load( ::File.read(file) )
+      YAML.load_file( file )[ Yell.env ] || {}
     end
 
   end

data/lib/yell/level.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Yell #:nodoc:
-   InterpretRegexp = /(at|gt|gte|lt|lte)?\.?(#{Yell::Severities.join('|')}})/i
 
   # The +Level+ class handles the severities for you in order to determine 
   # if an adapter should log or not.
@@ -42,6 +41,8 @@ module Yell #:nodoc:
       end
     end
 
+    InterpretRegexp = /(at|gt|gte|lt|lte)?\.?(#{Yell::Severities.join('|')})/i
+
     attr_reader :severities
 
     # Create a new level instance.

data/lib/yell/version.rb

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

data/lib/yell.rb

@@ -49,7 +49,7 @@ module Yell #:nodoc:
     end
 
     def env #:nodoc:
-      ENV['YELL_ENV'] || ENV['RACK_ENV'] || 'development'
+      ENV['YELL_ENV'] || ENV['RACK_ENV'] ||ENV['RAILS_ENV'] || 'development'
     end
 
     def load!( file )
@@ -68,11 +68,11 @@ module Yell #:nodoc:
 
 end
 
+require File.dirname(__FILE__) + '/yell/configuration'
+
 require File.dirname(__FILE__) + '/yell/event'
 require File.dirname(__FILE__) + '/yell/level'
 require File.dirname(__FILE__) + '/yell/formatter'
 require File.dirname(__FILE__) + '/yell/adapters'
 require File.dirname(__FILE__) + '/yell/logger'
 
-require File.dirname(__FILE__) + '/yell/configuration'
-

data/spec/fixtures/yell.yml

@@ -1,7 +1,7 @@
-:level: info
+development:
+  :level: info
 
-:adapters:
-  - :stdout:
-      :level: "lt.error"
-  - :stderr:
-      :level: "gte.error"
+  :adapters:
+    - :stdout
+    - :stderr:
+        :level: "gte.error"

data/spec/yell/configuration_spec.rb

@@ -3,11 +3,32 @@ require 'spec_helper'
 describe Yell::Configuration do
 
   describe ":load!" do
-    let( :file ) { File.expand_path File.dirname(__FILE__) + '/../fixtures/yell.yml' }
-    let( :configuration ) { Yell::Configuration.load!( file ) }
+    let( :file ) { File.dirname(__FILE__) + '/../fixtures/yell.yml' }
+    let( :config ) { Yell::Configuration.load!( file ) }
 
-    it "should return the hash from the given file" do
-      YAML.load( File.read(file) ).should == configuration
+    subject { config }
+
+    it { should be_kind_of Hash }
+    it { should have_key :level }
+    it { should have_key :adapters }
+
+    context :level do
+      subject { config[:level] }
+
+      it { should == "info" }
+    end
+
+    context :adapters do
+      subject { config[:adapters] }
+
+      it { should be_kind_of Array }
+
+      # stdout
+      it { subject.first.should == :stdout }
+
+      # stderr
+      it { subject.last.should be_kind_of Hash }
+      it { subject.last.should == { :stderr => {:level => 'gte.error'} } }
     end
   end
 

data/spec/yell_spec.rb

@@ -22,16 +22,14 @@ describe Yell do
   end
 
   context :load! do
-    subject { Yell.load!( File.dirname(__FILE__) + '/fixtures/yell.yml' ) }
+    subject { Yell.load!( 'yell.yml' ) }
 
-    let( :adapters ) { subject.instance_variable_get :@adapters }
+    before do
+      mock( Yell::Configuration ).load!( 'yell.yml' ) { {} }
+    end
 
     it { should be_kind_of Yell::Logger }
-
-    it "should return a Yell instacne with the configuration for a file" do
-      adapters.first.should be_kind_of Yell::Adapters::Stdout
-      adapters.last.should be_kind_of Yell::Adapters::Stderr
-    end
   end
 
 end
+

data/yell.gemspec

@@ -18,8 +18,4 @@ Gem::Specification.new do |s|
   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.require_paths = ["lib"]
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rr"
-  s.add_development_dependency "timecop"
 end

metadata

@@ -1,67 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yell
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+version: !ruby/object:Gem::Version
+  version: 0.10.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-11 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rr
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: timecop
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-description: Yell - Your Extensible Logging Library. Define multiple adapters, various log level combinations or message formatting options like you've never done before
+date: 2012-05-12 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
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -105,37 +61,31 @@ files:
 - spec/yell/logger_spec.rb
 - spec/yell_spec.rb
 - yell.gemspec
-has_rdoc: true
 homepage: http://rudionrails.github.com/yell
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: yell
-rubygems_version: 1.3.6
+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/yell/adapters/base_spec.rb