log_buddy 0.5.0 → 0.6.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.9.2-p0

data/CHANGELOG

@@ -1,5 +1,8 @@
+v0.6.0 Use Rails.logger if available - avoid deprecation warnings in Rails 3+
 
-v0.x.x. Overall cleanup and making things safer:
+v0.5.1 init automatically unless SAFE_LOG_BUDDY (in ENV) is set
+
+v0.5.0 Overall cleanup and making things safer:
   - move to Rspec2
   - move Version into the code base as a constant and out of yml
   - remove GemLoger

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.email = "rsanheim@gmail.com"
     gem.homepage = "http://github.com/relevance/log_buddy"
     gem.authors = ["Rob Sanheim"]
-    gem.add_development_dependency "rspec", "~> 2.0.0.beta.8"
-    gem.add_development_dependency "mocha", "~> 0.9.0"
+    gem.add_development_dependency "rspec", "~> 2.2"
+    gem.add_development_dependency "mocha", "~> 0.9"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/log_buddy.rb

@@ -5,7 +5,10 @@ require File.join(File.dirname(__FILE__), *%w[log_buddy version])
 =begin rdoc
 LogBuddy is a developer tool for easy logging while testing, debugging, and inspecting.
   
-The log shortcut method to give you easy, concise output of variables with their names and values.
+The <tt>d</tt> log method to give you easy, concise output of variables with their names and values.
+
+Requiring 'log_buddy' will _automatically_ mixin the <tt>d</tt> method into Object.  You can avoid this
+behavior by setting SAFE_LOG_BUDDY to true in your environment before requiring LogBuddy.
 
 Examples:
     a = "foo"
@@ -55,14 +58,24 @@ module LogBuddy
     
     private
     
+    # First try Rails.logger, then RAILS_DEFAULT_LOGGER (for older
+    # versions of Rails), then just use a STDOUT Logger
     def init_default_logger
-      if Object.const_defined?("RAILS_DEFAULT_LOGGER")
-        @logger = Object.const_get("RAILS_DEFAULT_LOGGER")
+      @logger = if rails_environment && rails_environment.respond_to?(:logger)
+        rails_environment.logger
+      elsif Object.const_defined?("RAILS_DEFAULT_LOGGER")
+        Object.const_get("RAILS_DEFAULT_LOGGER")
       else
         require 'logger'
-        @logger = Logger.new(STDOUT)
+        Logger.new(STDOUT)
       end
     end
     
+    def rails_environment
+      Object.const_defined?("Rails") && Object.const_get("Rails")
+    end
+    
   end
+  
+  init unless ENV["SAFE_LOG_BUDDY"]
 end

data/lib/log_buddy/version.rb

@@ -1,7 +1,7 @@
 module LogBuddy
   module Version #:nodoc:
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/log_buddy.gemspec

@@ -1,50 +1,49 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{log_buddy}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Sanheim"]
-  s.date = %q{2010-05-28}
+  s.date = %q{2010-12-06}
   s.description = %q{Log statements along with their name easily.  Mixin a logger everywhere when you need it.}
   s.email = %q{rsanheim@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     ".treasure_map.rb",
-     "CHANGELOG",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "examples.rb",
-     "init.rb",
-     "lib/log_buddy.rb",
-     "lib/log_buddy/mixin.rb",
-     "lib/log_buddy/utils.rb",
-     "lib/log_buddy/version.rb",
-     "log_buddy.gemspec",
-     "spec/log_buddy/log_buddy_init_spec.rb",
-     "spec/log_buddy/log_buddy_spec.rb",
-     "spec/log_buddy/log_spec.rb",
-     "spec/log_buddy/spec_helper.rb"
+    ".rvmrc",
+    ".treasure_map.rb",
+    "CHANGELOG",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "examples.rb",
+    "init.rb",
+    "lib/log_buddy.rb",
+    "lib/log_buddy/mixin.rb",
+    "lib/log_buddy/utils.rb",
+    "lib/log_buddy/version.rb",
+    "log_buddy.gemspec",
+    "spec/log_buddy/log_buddy_init_spec.rb",
+    "spec/log_buddy/log_buddy_spec.rb",
+    "spec/log_buddy/log_spec.rb",
+    "spec/log_buddy/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/relevance/log_buddy}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Log Buddy is your little development buddy.}
   s.test_files = [
     "spec/log_buddy/log_buddy_init_spec.rb",
-     "spec/log_buddy/log_buddy_spec.rb",
-     "spec/log_buddy/log_spec.rb",
-     "spec/log_buddy/spec_helper.rb"
+    "spec/log_buddy/log_buddy_spec.rb",
+    "spec/log_buddy/log_spec.rb",
+    "spec/log_buddy/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -52,15 +51,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.2"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.2"])
+      s.add_dependency(%q<mocha>, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.8"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.2"])
+    s.add_dependency(%q<mocha>, ["~> 0.9"])
   end
 end
 

data/spec/log_buddy/log_buddy_init_spec.rb

@@ -17,7 +17,7 @@ describe LogBuddy do
 
     def load_init
       silence_warnings do
-        load File.join(File.dirname(__FILE__), *%w[.. .. init.rb])
+        load File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. init.rb]))
       end
     end
 

data/spec/log_buddy/log_spec.rb

@@ -15,14 +15,35 @@ module SomeModule
 end
 
 describe LogBuddy::Mixin, " behavior" do
-    
-  it "uses RAILS_DEFAULT_LOGGER if its defined" do
-    begin
-      Object.const_set "RAILS_DEFAULT_LOGGER", stub_everything
-      LogBuddy.init
-      LogBuddy.logger.should == RAILS_DEFAULT_LOGGER
-    ensure 
-      Object.send :remove_const, "RAILS_DEFAULT_LOGGER"
+  
+  describe "init" do
+    context "Rails environment" do
+      it "uses Rails.logger first" do
+        begin 
+          rails_logger = stub_everything
+          rails_const = mock("Rails const with logger", :logger => rails_logger)
+          Object.const_set "Rails", rails_const
+          LogBuddy.init
+          LogBuddy.logger.should == rails_logger
+        ensure
+          Object.send :remove_const, "Rails"
+        end
+      end
+      
+      it "falls back to RAILS_DEFAULT_LOGGER if necessary" do
+        begin 
+          rails_default_logger = stub_everything
+          rails_const = stub("Rails const without logger")
+          Object.const_set "Rails", rails_const
+          Object.const_set "RAILS_DEFAULT_LOGGER", rails_default_logger
+          
+          LogBuddy.init
+          LogBuddy.logger.should == rails_default_logger
+        ensure
+          Object.send :remove_const, "Rails"
+          Object.send :remove_const, "RAILS_DEFAULT_LOGGER"
+        end
+      end
     end
   end
     

data/spec/log_buddy/spec_helper.rb

@@ -1,6 +1,6 @@
 require "logger"
-require "mocha"
 require "rspec"
+require "mocha"
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "log_buddy"))
 
 def silence_warnings
@@ -11,10 +11,10 @@ ensure
 end
 
 Rspec.configure do |config|
-  config.mock_with :mocha
-  config.formatter = :documentation
+  config.filter_run :focused => true
+  config.run_all_when_everything_filtered = true
   config.color_enabled = true
   config.alias_example_to :fit, :focused => true
-  config.filter_run :options => { :focused => true }
-  config.run_all_when_everything_filtered = true
+  config.formatter = :documentation
+  config.mock_with :mocha
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: log_buddy
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Rob Sanheim
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -04:00
+date: 2010-12-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +25,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196467
         segments: 
         - 2
-        - 0
-        - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
+        - 2
+        version: "2.2"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +39,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        version: "0.9"
   type: :development
   version_requirements: *id002
 description: Log statements along with their name easily.  Mixin a logger everywhere when you need it.
@@ -62,7 +55,7 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
+- .rvmrc
 - .treasure_map.rb
 - CHANGELOG
 - LICENSE
@@ -84,8 +77,8 @@ homepage: http://github.com/relevance/log_buddy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -93,7 +86,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -102,7 +94,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,7 +0,0 @@
-.tm_last_run_ruby
-*.log
-doc/*
-pkg/*
-coverage
-TAGS
-coverage/