logging-rails 0.3.0 → 0.4.0

data/.gitignore

@@ -0,0 +1 @@
+tmp/

data/History.txt

@@ -1,3 +1,12 @@
+== 0.4.0 / 2012-04-04
+
+Enhancements
+- Compatibility with Ruby 1.8.7 [issue #2]
+- Showing logging configuration is now optional
+
+Bug Fixes
+- Update "logging" depedency to any 1.X gem release
+
 == 0.3.0 / 2011-09-19
 
 Enhancements

data/README.md

@@ -63,8 +63,9 @@ Logging.logger['UserController'].level = :debug
 ```
 
 When using the logging railtie, a small display of the current logging
-configuration will be displayed when the Rails logger is in the debug mode.
-A description of the display can be found [here](https://github.com/TwP/logging/blob/master/lib/logging.rb#L400).
+configuration will be displayed when Rails is in development mode
+(environment). A description of the display can be found
+[here](https://github.com/TwP/logging/blob/master/lib/logging.rb#L400).
 
 ```
 root  ............................................  *debug      -T
@@ -79,11 +80,11 @@ root  ............................................  *debug      -T
 ```
 
 This is useful for understanding more complex logging configurations. It can
-be annoying in day-to-day usage. The soluation is to set the Rails logger to
-```:info``` or higher.
+be annoying in day-to-day usage. To disable, set the ```show_log_configuration```
+setting to false in the environment specific configuration file.
 
 ```ruby
-Logging.logger['Rails'].level = :info
+config.show_log_configuration = false
 ```
 
 Author
@@ -100,7 +101,7 @@ License
 
 The MIT License
 
-Copyright © 2011 by Tim Pease
+Copyright © 2011-2012 by Tim Pease
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -15,6 +15,6 @@ Bones {
 
   use_gmail
 
-  depend_on 'logging', '~> 1.6.1'
+  depend_on 'logging', '~> 1.6'
 }
 

data/lib/logging/rails/generators/install_generator.rb

@@ -14,6 +14,12 @@ module Logging::Rails
         insert_into_file 'config/environments/development.rb', comment % 'config.log_to = %w[stdout file]', :before => %r/^end\s*$/
         insert_into_file 'config/environments/production.rb', comment % 'config.log_to = %w[file]', :before => %r/^end\s*$/
       end
+
+      def insert_show_log_configuration
+        comment = "\n  # Show the logging configuration on STDOUT\n  config.show_log_configuration = %s\n"
+        insert_into_file 'config/environments/development.rb', comment % 'true', :before => %r/^end\s*$/
+        insert_into_file 'config/environments/production.rb', comment % 'false', :before => %r/^end\s*$/
+      end
     end
   end
 end

data/lib/logging/rails/generators/templates/logging.rb.erb

@@ -97,9 +97,9 @@ Logging::Rails.configure do |config|
   #
   # The rolling file appender uses shared file locks to ensure that only one
   # process will roll the log file. Each process writing to the file must have
-  # its own open file descriptor for flock to function properly. Reopening the
-  # file descriptors afte forking ensure that each worker has a unique file
-  # descriptor.
+  # its own open file descriptor for `flock` to function properly. Reopening
+  # the file descriptors after forking ensures that each worker has a unique
+  # file descriptor.
   #
   if defined?(PhusionPassenger)
     PhusionPassenger.on_event(:starting_worker_process) do |forked|

data/lib/logging/rails/mixin.rb

@@ -12,11 +12,13 @@ module Logging::Rails
   #
   module Mixin
 
+    LOGGER_METHOD = RUBY_VERSION < '1.9' ? 'logger' : :logger
+
     # This method is called when the module is included into a class. It will
     # extend the including class so it also has a class-level `logger` method.
     #
     def self.included( other )
-      other.__send__(:remove_method, :logger) if other.instance_methods.include? :logger
+      other.__send__(:remove_method, LOGGER_METHOD.to_sym) if other.instance_methods.include? LOGGER_METHOD
       other.extend self
     end
 
@@ -26,7 +28,7 @@ module Logging::Rails
     #
     def self.extended( other )
       eigenclass = class << other; self; end
-      eigenclass.__send__(:remove_method, :logger) if eigenclass.instance_methods.include? :logger
+      eigenclass.__send__(:remove_method, LOGGER_METHOD.to_sym) if eigenclass.instance_methods.include? LOGGER_METHOD
     end
 
     # Returns the logger instance.

data/lib/logging/rails/railtie.rb

@@ -12,6 +12,7 @@ module Logging::Rails
 
     config.before_configuration do
       config.log_to = %w[file]
+      config.show_log_configuration = false
     end
 
     initializer 'logging.configure', :before => 'initialize_logger' do |app|
@@ -44,8 +45,10 @@ module Logging::Rails
       ::Rails.cache.logger = ::Logging::Logger[::Rails.cache]
     end
 
-    config.after_initialize do
-      ::Logging.show_configuration if ::Logging::Logger[::Rails].debug?
+    config.after_initialize do |app|
+      if app.config.show_log_configuration and (STDIN.tty? or defined?(Rails::Console))
+        ::Logging.show_configuration(STDERR)
+      end
     end
 
   end  # Railtie

data/version.txt

@@ -1 +1 @@
-0.3.0
+0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logging-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2012-04-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2154977120 !ruby/object:Gem::Requirement
+  requirement: &2165063980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2154977120
+  version_requirements: *2165063980
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &2154976480 !ruby/object:Gem::Requirement
+  requirement: &2165062780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
   type: :development
   prerelease: false
-  version_requirements: *2154976480
+  version_requirements: *2165062780
 description: ! 'A Railtie for for integrating the [Logging](https://github.com/TwP/logging)
 
   framework into your Rails 3 application.'
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - lib/logging/rails/generators/USAGE
 - lib/logging/rails/generators/templates/logging.rb.erb
 files:
+- .gitignore
 - History.txt
 - README.md
 - Rakefile
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logging-rails
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Railtie for for integrating the [Logging](https://github.