bin/tl in testlab-1.15.1 vs bin/tl in testlab-1.16.0
- old
+ new
@@ -80,35 +80,34 @@
desc 'Quiet mode'
default_value false
switch [:q, :quiet]
-desc 'Path to Labfile: ${REPO}/Labfile'
+desc 'Path to Labfile'
arg_name 'path/to/file'
-# default_value File.join(Dir.pwd, 'Labfile')
flag [:l, :labfile]
-desc 'Path to Repository directory: ${PWD}'
+desc 'Path to Repository directory'
arg_name 'path/to/directory'
-default_value Dir.pwd
flag [:r, :repo]
-desc 'Path to Configuration directory: ${REPO}/.testlab-$(hostname -s)'
+desc 'Path to Configuration directory'
arg_name 'path/to/directory'
-# default_value File.join(Dir.pwd, ".testlab-#{TestLab.hostname}")
flag [:c, :config]
+desc 'Path to Log file'
+default_value STDOUT
+arg_name 'path/to/log_file'
+flag [:L, :log_file]
+
pre do |global,command,options,args|
@testlab_start_time = Time.now.utc
(global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
- log_file = File.join(global[:repo], "testlab-#{TestLab.hostname}.log")
- @logger = ZTK::Logger.new(log_file)
-
@ui = ZTK::UI.new(
- :logger => @logger,
+ :logger => ZTK::Logger.new(global[:log_file]),
:verbose => global[:verbose],
:quiet => global[:quiet]
)
@ui.logger.debug { "global(#{global.inspect})" }
@@ -120,12 +119,10 @@
:labfile_path => global[:labfile],
:config_dir => global[:config],
:repo_dir => global[:repo]
)
- TestLab::Utility.log_header(@testlab).each { |line| @logger.info { line } }
-
@testlab.boot
if !@ui.quiet?
message = format_message("TestLab v#{TestLab::VERSION} Loaded".black.bold)
@ui.stdout.puts(message)
@@ -160,12 +157,12 @@
false
else
testlab_run_time = (Time.now.utc - @testlab_start_time)
- @logger.fatal { exception.inspect }
+ @ui.logger.fatal { exception.inspect }
exception.backtrace.each do |line|
- @logger.logdev.write("#{line}\n")
+ @ui.logger.logdev.write("#{line}\n")
end
message = format_message("TestLab v#{TestLab::VERSION} Aborted (%0.4f seconds)".black.bold % testlab_run_time)
@ui.stderr.puts(message)
@ui.logger.info { message }