skates 0.2.2 → 0.2.3

data/lib/skates/runner.rb

@@ -11,17 +11,7 @@ module Skates
       config_file = File.open('config/config.yaml')
       Skates.config = YAML.load(config_file)[Skates.environment]
       
-      # Add an outputter to the logger
-      log_file = Log4r::RollingFileOutputter.new("#{Skates.environment}", :filename => "log/#{Skates.environment}.log", :trunc => false)
-      case Skates.environment
-      when "production"
-        log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
-      when "development"
-        log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
-      else
-        log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
-      end
-      Skates.logger.add(log_file)
+      Skates.reopen_logs
       
       # Requiring all models, stanza, controllers
       ['app/models/*.rb', 'app/stanzas/*.rb', 'app/controllers/*_controller.rb'].each do |dir|

data/lib/skates.rb

@@ -80,11 +80,31 @@ module Skates
   # Returns a shared logger for this component.
   def self.logger
     unless self.class_variable_defined?("@@logger")
-      @@logger = Log4r::Logger.new("Skates")
-      @@logger.add(Log4r::Outputter.stdout) if Skates.environment == "development"
+      reopen_logs
     end
     @@logger
   end
+  
+  ##
+  # Re-opens the logs
+  # In "development" environment, the log will be on stdout
+  def self.reopen_logs
+    # Open a new logger
+    logger = Log4r::Logger.new("Skates") 
+    logger.add(Log4r::Outputter.stdout) if Skates.environment == "development"
+    log_file = Log4r::RollingFileOutputter.new("#{Skates.environment}", :filename => "log/#{Skates.environment}.log", :trunc => false)
+    case Skates.environment
+    when "production"
+      log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
+    when "development"
+      log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
+    else
+      log_file.formatter = Log4r::PatternFormatter.new(:pattern => "%d (#{Process.pid}) [%l] :: %m", :date_pattern => "%d/%m %H:%M")      
+    end
+    logger.add(log_file)
+    # Set up the variable.
+    @@logger = logger
+  end
 
   ##
   # Set the configuration for this component.

data/spec/lib/skates/runner_spec.rb

@@ -17,9 +17,7 @@ describe Skates::Runner do
     end
 
     it "should add the environment log file as an outputter to skates's default log" do
-      @logger = Log4r::RollingFileOutputter.new("#{Skates.environment}", :filename => "log/#{Skates.environment}.log", :trunc => false)
-      Log4r::RollingFileOutputter.should_receive(:new).with("test", :filename => "log/test.log", :trunc => false).and_return(@logger)
-      Skates.logger.should_receive(:add).with(@logger)
+      Skates.should_receive(:reopen_logs)  
       Skates::Runner.prepare("test")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - julien Genestoux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -08:00
+date: 2009-11-11 00:00:00 -08:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency