globalog 0.1.3 → 0.1.4

data/lib/globalog.rb

@@ -62,6 +62,7 @@ require 'logger'
 class GlobaLog < Logger
 	require File.join( File.dirname( File.expand_path(__FILE__)), 'globalog_args')
 	require File.join( File.dirname( File.expand_path(__FILE__)), 'globalog_hijack')
+	require File.join( File.dirname( File.expand_path(__FILE__)), 'globalog_runsync')
 	
 	# The GlobaLog.logger acts as a constructor method for the logger.
 	# === Parameters

data/lib/globalog_args.rb

@@ -7,8 +7,8 @@ class GlobaLog
 	module Args
 		
 		def Args.are(args,override=false)
-			$logger_args ||= Hash.new
-			if override == true
+			$logger_args ||= Hash.new; $logger_args[:opts] = true unless args[:opts].nil?
+			if $logger_args[:opts].nil? and override == true
 				$logger_args[:log_level] = args[:log_level].to_sym unless args[:log_level].nil?
 				$logger_args[:log_output] = args[:log_output] unless args[:log_output].nil?
 				$logger_args[:log_opts] = args[:log_opts] unless args[:log_opts].nil?

data/lib/globalog_hijack.rb

@@ -10,17 +10,21 @@ class GlobaLog
 		
 		def initialize
 			super()
-			self[:log_level] = nil
-			self[:log_output] = nil
-			opts = OptionParser.new do |opts|
-				opts.on('-L','--log-level [STRING]','sets the Test Log Level') do |string|
-					self[:log_level] = string.to_sym
-				end
-				opts.on('-O','--log-output [I/O]','sets the Test Log output') do |io|
-					self[:log_output] = io
+			unless $keep_argv.empty?
+				self[:opts] = nil
+				self[:log_level] = nil
+				self[:log_output] = nil
+				self[:opts] = true 
+				opts = OptionParser.new do |opts|
+					opts.on('-L','--log-level [STRING]','sets the Test Log Level') do |string|
+						self[:log_level] = string.to_sym
+					end
+					opts.on('-O','--log-output [I/O]','sets the Test Log output') do |io|
+						self[:log_output] = io
+					end
 				end
+				opts.parse!($keep_argv)
 			end
-			opts.parse!($keep_argv)
 		end
 
 		def self.keep_wanted_argv
@@ -42,10 +46,9 @@ class GlobaLog
 			end
 			$keep_argv ||= keep
 		end
-
-		self.keep_wanted_argv
+		
+		Hijack.keep_wanted_argv
 		Args.are(self.new)
-
 	end
 	
-end
+end

data/lib/globalog_runsync.rb

@@ -0,0 +1,38 @@
+# Author:: lp (mailto:lp@spiralix.org)
+# Copyright:: 2009 Louis-Philippe Perron - Released under the terms of the MIT license
+class GlobaLog
+	
+	def debug(arg,&block)
+		sync_level(:debug) { super(arg,&block) }
+	end
+	
+	def info(arg,&block)
+		sync_level(:info) { super(arg,&block) }
+	end
+	
+	def warn(arg,&block)
+		sync_level(:warn) { super(arg,&block) }
+	end
+	
+	def error(arg,&block)
+		sync_level(:error) { super(arg,&block) }
+	end
+	
+	def fatal(arg,&block)
+		sync_level(:fatal) { super(arg,&block) }
+	end
+	
+	def unknown(arg,&block)
+		sync_level(:unknown) { super(arg,&block) }
+	end
+	
+	private
+	
+	def sync_level(level)
+		self.level = Args::log_level
+		if Args.sym_to_level(level) >= Args::log_level
+			yield
+		end
+	end
+	
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: globalog
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -05:00
+date: 2009-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - lib/globalog.rb
 - lib/globalog_args.rb
 - lib/globalog_hijack.rb
+- lib/globalog_runsync.rb
 - test/external_helper.rb
 - test/tc_globalog_main.rb
 has_rdoc: true