slf4r 0.4.1 → 0.4.2

data/lib/generators/slf4r/log4j/log4j_generator.rb

@@ -5,15 +5,14 @@ class Slf4r::Log4jGenerator < Rails::Generators::Base
     source = File.expand_path('../../templates', __FILE__)
     initializer "log4j.rb", File.read(File.join(source, "log4j.rb"))
     initializer "log4j.properties", File.read(File.join(source, "log4j.properties"))
+    gem 'slf4r', :require => 'slf4r/java_logger'
 
-    gemfile = File.read('Gemfile')
+    file_name = 'Mavenfile'
     jar_line = "org.slf4j.slf4j-log4j12"
-    unless gemfile =~ /#{jar_line}/
-      File.open('Gemfile', 'a') do |f|
-        f.puts
-        f.puts "if defined? MAVEN"
-        f.puts "  jar '#{jar_line}', '1.6.1'"
-        f.puts "end"
+    mavenfile = File.exists?(file_name) ? File.read(file_name) : ''
+    unless mavenfile =~ /#{jar_line}/
+      File.open(file_name, 'a') do |f|
+        f.puts "jar '#{jar_line}', '1.6.1'"
       end
     end
   end

data/lib/generators/slf4r/logging/logging_generator.rb

@@ -4,6 +4,7 @@ class Slf4r::LoggingGenerator < Rails::Generators::Base
   def setup
     source = File.expand_path('../../templates', __FILE__)
     initializer "logging.rb", File.read(File.join(source, "logging.rb"))
+    gem 'slf4r', :require => 'slf4r/logging_logger'
     gem "logging"
   end
 end

data/lib/slf4r/slf4r_railtie.rb

@@ -1,12 +1,14 @@
 class Slf4rRailtie < Rails::Railtie
 
-  config.before_configuration do |app|
-    #if defined?(Slf4r)
-    #  require 'slf4r/ruby_logger' unless defined?(::Slf4r::LoggerFacade)
-    #end
+  initializer "set_servlet_logger", :after => :initialize_logger do |app|
     if defined?(Slf4r::LoggerFacade)
-      @logger = (Rails.logger = setup_logger(Rails))
-      app.config.logger = @logger
+      @logger = Slf4r::LoggerFacade.new("Rails::Setup")
+      @logger.info {
+        l = @logger.instance_variable_get('@logger'.to_sym)
+        logger_name = l.respond_to?(:java_class) ? l.java_class : l.class
+        "setup slf4r logger #{logger_name}"
+      }
+      app.config.logger = Rails.logger = setup_logger(Rails)
       app.config.action_controller.logger = setup_logger(ActionController)
       app.config.active_record.logger = setup_logger(ActiveRecord)
       app.config.action_view.logger = setup_logger(ActionView) if app.config.action_view.respond_to? :logger=
@@ -17,22 +19,17 @@ class Slf4rRailtie < Rails::Railtie
               else
                 @logger.instance_variable_get(:@logger).class 
               end
-      
-    end
-  end
-
-  config.after_initialize do |app|
-    unless defined?(Slf4r::LoggerFacade)
+    else
       require 'slf4r/wrapped_logger'
-      Slf4r::LoggerFacade4WrappedLogger.logger = Rails.logger
-      puts "setup slf4r logger wrapper"
+      l = Slf4r::LoggerFacade4WrappedLogger.logger = Rails.logger
+      l.info "setup slf4r logger wrapper"
     end
   end
 
   private
   def self.setup_logger(category)
     l = Slf4r::LoggerFacade.new((category == Rails ? "" : "Rails::") + category.to_s)
-    (@logger || l).info("setup logger for '#{l.name}")
+    @logger.info("setup logger for '#{l.name}'") if @logger
     l
   end
 end

data/lib/slf4r/version.rb

@@ -1,3 +1,3 @@
 module Slf4r
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 4
-    - 1
-  version: 0.4.1
+    - 2
+  version: 0.4.2
 platform: ruby
 authors: 
   - Kristian Meier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +05:30
+date: 2011-03-21 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -87,6 +87,22 @@ dependencies:
             version: 3.0.1
     type: :development
     version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: ruby-maven
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 8
+              - 3
+              - 0
+              - 2
+            version: 0.8.3.0.2
+    type: :development
+    version_requirements: *id006
 description: Slf4r provides a uniform interface for instantiating und using of a logger
 email: 
   - m.kristian@web.de
@@ -101,7 +117,6 @@ files:
   - MIT-LICENSE
   - History.txt
   - README.rdoc
-  - Rakefile
   - lib/slf4r.rb
   - lib/logging_adapter.rb
   - lib/ruby_logger_adapter.rb

data/Rakefile

@@ -1,42 +0,0 @@
-# -*- ruby -*-
-
-require 'rubygems'
-
-require 'spec'
-require 'spec/rake/spectask'
-
-BUILD_DIR = 'target'
-
-desc 'clean up'
-task :clean do
-  FileUtils.rm_rf(BUILD_DIR)
-  FileUtils.rm_rf('tmp')
-end
-
-desc 'package as a gem.'
-task :package do
-  require 'fileutils'
-  gemspec = Dir['*.gemspec'].first
-  Kernel.system("#{RUBY} -S gem build #{gemspec}")
-  FileUtils.mkdir_p(BUILD_DIR)
-  gem = Dir['*.gem'].first
-  FileUtils.mv(gem, File.join(BUILD_DIR,"#{gem}"))
-  puts File.join(BUILD_DIR,"#{gem}")
-end
-
-desc 'Install the package as a gem.'
-task :install => [:package] do
-  gem = Dir[File.join(BUILD_DIR, '*.gem')].first
-  extra = ENV['GEM_HOME'].nil? && ENV['GEM_PATH'].nil? ? "--user-install" : ""
-  Kernel.system("#{RUBY} -S gem install --local #{gem} --no-ri --no-rdoc #{extra}")
-end
-
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  if File.exists?('spec/spec.opts')
-    t.spec_opts << '--options' << 'spec/spec.opts'
-  end
-  t.spec_files = Dir.glob('./spec/**/*_spec.rb')
-end
-
-# vim: syntax=Ruby