ztk 1.6.24 → 1.6.25

data/lib/ztk/command/exec.rb

@@ -71,7 +71,7 @@ module ZTK
 
         direct_log(:info) { log_header("COMMAND") }
         direct_log(:info) { "#{command.inspect}\n" }
-        direct_log(:info) { log_header("STARTED") }
+        direct_log(:info) { log_header("STARTED", "-") }
 
         begin
           Timeout.timeout(options.timeout) do
@@ -88,7 +88,7 @@ module ZTK
                 case reader_writer_key[pipe]
                 when :stdout then
                   if !stdout_header
-                    direct_log(:info) { log_header("STDOUT") }
+                    direct_log(:info) { log_header("STDOUT", "-") }
                     stdout_header = true
                     stderr_header = false
                   end
@@ -97,7 +97,7 @@ module ZTK
 
                 when :stderr then
                   if !stderr_header
-                    direct_log(:warn) { log_header("STDERR") }
+                    direct_log(:warn) { log_header("STDERR", "-") }
                     stderr_header = true
                     stdout_header = false
                   end

data/lib/ztk/command/private.rb

@@ -13,10 +13,10 @@ module ZTK
 
       # Formats a header suitable for writing to the direct logger when logging
       # sessions.
-      def log_header(what)
-        count = 12
-        sep = ("=" * count)
-        header = [sep, "[ #{what} ]", sep, "[ #{tag} ]", sep, "[ #{what} ]", sep].join
+      def log_header(what, char="=")
+        count = 16
+        sep = (char * count)
+        header = [sep, "[ #{tag} >>> #{what} ]", sep].join
         "#{header}\n"
       end
 

data/lib/ztk/ssh/exec.rb

@@ -63,14 +63,14 @@ module ZTK
 
                 direct_log(:info) { log_header("COMMAND") }
                 direct_log(:info) { "#{command}\n" }
-                direct_log(:info) { log_header("OPENED") }
+                direct_log(:info) { log_header("OPENED", "-") }
 
                 chan.exec(command) do |ch, success|
                   success or log_and_raise(SSHError, "Could not execute '#{command}'.")
 
                   ch.on_data do |c, data|
                     if !stdout_header
-                      direct_log(:info) { log_header("STDOUT") }
+                      direct_log(:info) { log_header("STDOUT", "-") }
                       stdout_header = true
                       stderr_header = false
                     end
@@ -84,7 +84,7 @@ module ZTK
 
                   ch.on_extended_data do |c, type, data|
                     if !stderr_header
-                      direct_log(:warn) { log_header("STDERR") }
+                      direct_log(:warn) { log_header("STDERR", "-") }
                       stderr_header = true
                       stdout_header = false
                     end

data/lib/ztk/ssh/private.rb

@@ -40,24 +40,25 @@ module ZTK
       def tag
         tags = Array.new
 
+        user_host = "#{config.user}@#{config.host_name}"
+        port = (config.port ? ":#{config.port}" : nil)
+        tags << [user_host, port].compact.join
+
         if config.proxy_host_name
+          tags << " via "
+
           proxy_user_host = "#{config.proxy_user}@#{config.proxy_host_name}"
           proxy_port = (config.proxy_port ? ":#{config.proxy_port}" : nil)
           tags << [proxy_user_host, proxy_port].compact.join
-          tags << " >>> "
         end
 
-        user_host = "#{config.user}@#{config.host_name}"
-        port = (config.port ? ":#{config.port}" : nil)
-        tags << [user_host, port].compact.join
-
         tags.join.strip
       end
 
-      def log_header(what)
-        count = 12
-        sep = ("=" * count)
-        header = [sep, "[ #{what} ]", sep, "[ #{tag} ]", sep, "[ #{what} ]", sep].join
+      def log_header(what, char='=')
+        count = 16
+        sep = (char * count)
+        header = [sep, "[ #{tag} >>> #{what} ]", sep].join
         "#{header}\n"
       end
 

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.24"
+  VERSION = "1.6.25"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.24
+  version: 1.6.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2990163974537273160
+      hash: 1433051494902520817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2990163974537273160
+      hash: 1433051494902520817
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25