sambala 0.9.3 → 0.9.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/sambala.rb +3 -32
- data/test/tc_sambala_main.rb +4 -29
- metadata +13 -3
data/lib/sambala.rb
CHANGED
@@ -46,15 +46,13 @@
|
|
46
46
|
# :title:Sambala
|
47
47
|
|
48
48
|
class Sambala
|
49
|
-
require 'logger'
|
50
49
|
require 'pty'
|
51
50
|
require 'expect'
|
52
51
|
require 'rubygems'
|
52
|
+
require 'globalog'
|
53
53
|
require 'abundance'
|
54
|
-
|
55
|
-
require 'sambala_gardener'
|
54
|
+
require File.join( File.dirname( File.expand_path(__FILE__)), 'sambala_gardener')
|
56
55
|
include Gardener
|
57
|
-
@@log_level = Logger::WARN; @@log_output = STDERR
|
58
56
|
|
59
57
|
# The +new+ class method initializes Sambala.
|
60
58
|
# === Parameters
|
@@ -71,7 +69,7 @@ class Sambala
|
|
71
69
|
# :password => 'eggman',
|
72
70
|
# :threads => 2 )
|
73
71
|
def initialize(options={:domain => '', :host => '', :share => '', :user => '', :password => '', :threads => 1})
|
74
|
-
|
72
|
+
$log_sambala = GlobaLog.logger(STDERR,:warn)
|
75
73
|
begin
|
76
74
|
options[:threads] = 4 if options[:threads] > 4
|
77
75
|
options[:init_timeout] = options[:threads]
|
@@ -327,34 +325,7 @@ class Sambala
|
|
327
325
|
# samba.close
|
328
326
|
def close
|
329
327
|
result = @gardener.close
|
330
|
-
# $log_sambala.close
|
331
328
|
result.values.map { |queue| queue.empty? }.uniq.size == 1 ? true : false
|
332
329
|
end
|
333
|
-
|
334
|
-
def Sambala::log_output=(out)
|
335
|
-
@@log_output = out
|
336
|
-
end
|
337
|
-
|
338
|
-
def Sambala::log_level=(level)
|
339
|
-
@@log_level = case level
|
340
|
-
when :debug
|
341
|
-
Logger::DEBUG
|
342
|
-
when :info
|
343
|
-
Logger::INFO
|
344
|
-
when :warn
|
345
|
-
Logger::WARN
|
346
|
-
when :error
|
347
|
-
Logger::ERROR
|
348
|
-
when :fatal
|
349
|
-
Logger::FATAL
|
350
|
-
end
|
351
|
-
end
|
352
|
-
|
353
|
-
private
|
354
|
-
|
355
|
-
def init_logger
|
356
|
-
$log_sambala = Logger.new(@@log_output)
|
357
|
-
$log_sambala.level = @@log_level
|
358
|
-
end
|
359
330
|
|
360
331
|
end
|
data/test/tc_sambala_main.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
|
2
|
-
require '
|
1
|
+
require 'rubygems'
|
2
|
+
require 'globalog'
|
3
3
|
require 'test/unit'
|
4
|
-
require 'sambala'
|
4
|
+
require File.join( File.dirname( File.expand_path(__FILE__)), '..', 'lib', 'sambala')
|
5
5
|
|
6
6
|
TESTFILE = 'sambala_test'
|
7
7
|
TESTDIR = 'sambala_test_dir'
|
@@ -17,16 +17,10 @@ WELCOME = <<TITLE
|
|
17
17
|
TITLE
|
18
18
|
THREADS = 4
|
19
19
|
|
20
|
-
if ARGV[0].nil?
|
21
|
-
LOG_LEVEL = :warn
|
22
|
-
else
|
23
|
-
LOG_LEVEL = ARGV[0].to_sym
|
24
|
-
end
|
25
|
-
|
26
20
|
class TestSambalaMain < Test::Unit::TestCase
|
27
21
|
|
28
22
|
def setup
|
29
|
-
|
23
|
+
@log_test = GlobaLog.logger(STDERR,:info)
|
30
24
|
check_smbclient_presence
|
31
25
|
get_samba_param_from_input
|
32
26
|
init_sambala
|
@@ -67,25 +61,6 @@ class TestSambalaMain < Test::Unit::TestCase
|
|
67
61
|
|
68
62
|
private
|
69
63
|
|
70
|
-
def setup_logger(out,level)
|
71
|
-
Sambala::log_level = level
|
72
|
-
@log_test = Logger.new(out)
|
73
|
-
case level
|
74
|
-
when :debug
|
75
|
-
@log_test.level = Logger::DEBUG
|
76
|
-
when :info
|
77
|
-
@log_test.level = Logger::INFO
|
78
|
-
when :warn
|
79
|
-
@log_test.level = Logger::WARN
|
80
|
-
when :error
|
81
|
-
@log_test.level = Logger::ERROR
|
82
|
-
when :fatal
|
83
|
-
@log_test.level = Logger::FATAL
|
84
|
-
else
|
85
|
-
@log_test.level = Logger::UNKNOWN
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
64
|
def put_marker
|
90
65
|
result = @samba.put(:from => 'test/' + File.basename(__FILE__), :to => File.basename(__FILE__))
|
91
66
|
assert_equal(true, result[0], "Putting initial path marker failed: #{result[1]}")
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sambala
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Louis-Philippe Perron
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-02-
|
12
|
+
date: 2009-02-27 00:00:00 -05:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -20,7 +20,17 @@ dependencies:
|
|
20
20
|
requirements:
|
21
21
|
- - ">="
|
22
22
|
- !ruby/object:Gem::Version
|
23
|
-
version: 1.3.
|
23
|
+
version: 1.3.5
|
24
|
+
version:
|
25
|
+
- !ruby/object:Gem::Dependency
|
26
|
+
name: globalog
|
27
|
+
type: :runtime
|
28
|
+
version_requirement:
|
29
|
+
version_requirements: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - ">="
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: 0.1.3
|
24
34
|
version:
|
25
35
|
description:
|
26
36
|
email: lp@spiralix.org
|