ztk 0.2.1 → 0.2.2

data/lib/ztk/base.rb

@@ -94,8 +94,12 @@ module ZTK
 
       if !block_given?
         raise BaseError, "You must supply a block to the log method!"
-      elsif (@config.logger.level == ZTK::Logger.const_get(log_level.to_s.upcase))
-        @config.logger and @config.logger.instance_variable_get(:@logdev).instance_variable_get(:@dev).write(yield)
+      elsif (@config.logger.level <= ZTK::Logger.const_get(log_level.to_s.upcase))
+        if @config.logger.respond_to?(:logdev)
+          @config.logger.logdev.write(yield)
+        else
+          @config.logger.instance_variable_get(:@logdev).instance_variable_get(:@dev).write(yield)
+        end
       end
     end
 

data/lib/ztk/command.rb

@@ -64,6 +64,14 @@ module ZTK
     #   cmd = ZTK::Command.new
     #   puts cmd.exec("hostname -f").inspect
     def exec(command, options={})
+
+      def log_header(tag)
+        count = 8
+        sep = ("=" * count)
+        header = [sep, "[ #{tag} ]", sep, "[ #{self.inspect} ]", sep, "[ #{tag} ]", sep].join
+        "#{header}\n"
+      end
+
       options = OpenStruct.new({ :exit_code => 0, :silence => false }.merge(options))
       log(:debug) { "options(#{options.inspect})" }
       log(:debug) { "command(#{command.inspect})" }
@@ -94,7 +102,7 @@ module ZTK
       reader_writer_key = {parent_stdout_reader => :stdout, parent_stderr_reader => :stderr}
       reader_writer_map = {parent_stdout_reader => @config.stdout, parent_stderr_reader => @config.stderr}
 
-      direct_log(:debug) { "===[STARTED]===[STARTED]===[#{self.inspect}]===[STARTED]===[STARTED]===\n" }
+      direct_log(:debug) { log_header("STARTED") }
       loop do
         break if reader_writer_map.keys.all?{ |reader| reader.eof? }
 
@@ -106,26 +114,27 @@ module ZTK
           case reader_writer_key[socket]
           when :stdout then
             if !stdout_header
-              direct_log(:debug) { "===[STDOUT]===[STDOUT]===[#{self.inspect}]===[STDOUT]===[STDOUT]===\n" }
+              direct_log(:debug) { log_header("STDOUT") }
               stdout_header = true
               stderr_header = false
             end
             reader_writer_map[socket].write(data) unless options.silence
+            direct_log(:debug) { data }
 
           when :stderr then
             if !stderr_header
-              direct_log(:debug) { "===[STDERR]===[STDERR]===[#{self.inspect}]===[STDERR]===[STDERR]===\n" }
+              direct_log(:warn) { log_header("STDERR") }
               stderr_header = true
               stdout_header = false
             end
             reader_writer_map[socket].write(data) unless options.silence
+            direct_log(:warn) { data }
           end
 
-          direct_log(:debug) { data }
           output += data
         end
       end
-      direct_log(:debug) { "===[FINISHED]===[FINISHED]===[#{self.inspect}]===[FINISHED]===[FINISHED]===\n" }
+      direct_log(:debug) { log_header("STOPPED") }
 
       Process.waitpid(pid)
 

data/lib/ztk/ssh.rb

@@ -175,6 +175,14 @@ module ZTK
     #   end
     #   puts ssh.exec("hostname -f").inspect
     def exec(command, options={})
+
+      def log_header(tag)
+        count = 8
+        sep = ("=" * count)
+        header = [sep, "[ #{tag} ]", sep, "[ #{self.inspect} ]", sep, "[ #{tag} ]", sep].join
+        "#{header}\n"
+      end
+
       log(:debug) { "config(#{@config.inspect})" }
       log(:info) { "exec(#{command.inspect}, #{options.inspect})" }
 
@@ -190,14 +198,14 @@ module ZTK
 
         channel = ssh.open_channel do |chan|
           log(:debug) { "Channel opened." }
-          direct_log(:debug) { "===[OPENED]===[OPENED]===[#{self.inspect}]===[OPENED]===[OPENED]===\n" }
+          direct_log(:debug) { log_header("OPENED") }
 
           chan.exec(command) do |ch, success|
             raise SSHError, "Could not execute '#{command}'." unless success
 
             ch.on_data do |c, data|
               if !stdout_header
-                direct_log(:debug) { "===[STDOUT]===[STDOUT]===[#{self.inspect}]===[STDOUT]===[STDOUT]===\n" }
+                direct_log(:debug) { log_header("STDOUT") }
                 stdout_header = true
                 stderr_header = false
               end
@@ -209,11 +217,11 @@ module ZTK
 
             ch.on_extended_data do |c, type, data|
               if !stderr_header
-                direct_log(:debug) { "===[STDERR]===[STDERR]===[#{self.inspect}]===[STDERR]===[STDERR]===\n" }
+                direct_log(:warn) { log_header("STDERR") }
                 stderr_header = true
                 stdout_header = false
               end
-              direct_log(:debug) { data }
+              direct_log(:warn) { data }
 
               @config.stderr.print(data) unless options.silence
               output += data
@@ -227,7 +235,7 @@ module ZTK
         end
         channel.wait
 
-        direct_log(:debug) { "===[CLOSED]===[CLOSED]===[#{self.inspect}]===[CLOSED]===[CLOSED]===\n" }
+        direct_log(:debug) { log_header("CLOSED") }
         log(:debug) { "Channel closed." }
       end
 

data/lib/ztk/version.rb

@@ -19,5 +19,5 @@
 ################################################################################
 
 module ZTK
-  VERSION = "0.2.1" unless const_defined?(:VERSION)
+  VERSION = "0.2.2" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -212,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2277072188839223318
+      hash: -3237864687113483412
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2277072188839223318
+      hash: -3237864687113483412
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24