sambala 0.9.3 → 0.9.4

data/lib/sambala.rb

@@ -46,15 +46,13 @@
 # :title:Sambala
 
 class Sambala
-	require 'logger'
   require 'pty'
   require 'expect'
   require 'rubygems'
+	require 'globalog'
   require 'abundance'
-  
-  require 'sambala_gardener'
+  require File.join( File.dirname( File.expand_path(__FILE__)), 'sambala_gardener')
   include Gardener
-	@@log_level = Logger::WARN; @@log_output = STDERR
   
   # The +new+ class method initializes Sambala.
   # === Parameters
@@ -71,7 +69,7 @@ class Sambala
   #                       :password =>  'eggman', 
   #                       :threads  =>  2 )
   def initialize(options={:domain => '', :host => '', :share => '', :user => '', :password => '', :threads => 1})
-    init_logger
+    $log_sambala = GlobaLog.logger(STDERR,:warn)
 		begin
       options[:threads] = 4 if options[:threads] > 4
       options[:init_timeout] = options[:threads]
@@ -327,34 +325,7 @@ class Sambala
   #   samba.close
   def close
     result = @gardener.close
-		# $log_sambala.close
     result.values.map { |queue| queue.empty? }.uniq.size == 1 ? true : false
   end
-
-	def Sambala::log_output=(out)
-		@@log_output = out
-	end
-	
-	def Sambala::log_level=(level)
-		@@log_level = case level
-		when :debug
-			Logger::DEBUG
-		when :info
-			Logger::INFO
-		when :warn
-			Logger::WARN
-		when :error
-			Logger::ERROR
-		when :fatal
-			Logger::FATAL
-		end
-	end
-
-	private
-	
-	def init_logger
-		$log_sambala = Logger.new(@@log_output)
-		$log_sambala.level = @@log_level
-	end
   
 end

data/test/tc_sambala_main.rb

@@ -1,7 +1,7 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'logger'
+require 'rubygems'
+require 'globalog'
 require 'test/unit'
-require 'sambala'
+require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'sambala')
 
 TESTFILE = 'sambala_test'
 TESTDIR = 'sambala_test_dir'
@@ -17,16 +17,10 @@ WELCOME = <<TITLE
 TITLE
 THREADS = 4
 
-if ARGV[0].nil? 
-	LOG_LEVEL = :warn
-else
-	LOG_LEVEL = ARGV[0].to_sym
-end
-
 class TestSambalaMain < Test::Unit::TestCase
   
   def setup
-		setup_logger(STDERR,LOG_LEVEL)
+		@log_test = GlobaLog.logger(STDERR,:info)
     check_smbclient_presence
     get_samba_param_from_input
     init_sambala
@@ -67,25 +61,6 @@ class TestSambalaMain < Test::Unit::TestCase
   
   private
 
-	def setup_logger(out,level)
-		Sambala::log_level = level
-		@log_test = Logger.new(out)
-		case level
-		when :debug
-			@log_test.level = Logger::DEBUG
-		when :info
-			@log_test.level = Logger::INFO
-		when :warn
-			@log_test.level = Logger::WARN
-		when :error
-			@log_test.level = Logger::ERROR
-		when :fatal
-			@log_test.level = Logger::FATAL
-		else
-			@log_test.level = Logger::UNKNOWN
-		end
-	end
-
 	def put_marker
 		result = @samba.put(:from => 'test/' + File.basename(__FILE__), :to => File.basename(__FILE__))
 		assert_equal(true, result[0], "Putting initial path marker failed: #{result[1]}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sambala
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -05:00
+date: 2009-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.4
+        version: 1.3.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: globalog
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.3
     version: 
 description: 
 email: lp@spiralix.org