ztk 0.1.0 → 0.1.1

data/lib/ztk/base.rb

@@ -89,6 +89,16 @@ module ZTK
       end
     end
 
+    def direct_log(log_level, &blocK)
+      @config.logger.nil? and raise BaseError, "You must supply a logger for direct logging support!"
+
+      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)
+      end
+    end
+
   end
 
 end

data/lib/ztk/ssh.rb

@@ -109,6 +109,12 @@ module ZTK
       }.merge(config))
     end
 
+    def inspect
+      user_host = "#{@config.user}@#{@config.host_name}"
+      port = (@config.port ? ":#{@config.port}" : nil)
+      [user_host, port].compact.join
+    end
+
     # Starts an SSH session.  Can also be used to get the Net::SSH object.
     #
     # Primarily used internally.
@@ -182,13 +188,13 @@ module ZTK
           raise SSHError, "Could not execute '#{command}'." unless success
 
           ch.on_data do |c, data|
-            log(:debug) { data.chomp.strip }
+            direct_log(:debug) { "[#{self.inspect}] #{data}" }
             @config.stdout.print(data) unless options.silence
             output += data.chomp.strip
           end
 
           ch.on_extended_data do |c, type, data|
-            log(:debug) { data.chomp.strip }
+            direct_log(:debug) { "[#{self.inspect}] #{data}" }
             @config.stderr.print(data) unless options.silence
             output += data.chomp.strip
           end

data/lib/ztk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -207,12 +207,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4401933246613250209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4401933246613250209
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -230,3 +236,4 @@ test_files:
 - spec/ztk/ssh_spec.rb
 - spec/ztk/tcp_socket_check_spec.rb
 - spec/ztk/template_spec.rb
+has_rdoc: