ztk 1.0.0 → 1.0.1

data/lib/ztk/command.rb

@@ -64,14 +64,14 @@ module ZTK
     #   puts cmd.exec("hostname -f").inspect
     #
     def exec(command, options={})
-      options = OpenStruct.new({ :exit_code => 0, :silence => false }.merge(options))
+      options = OpenStruct.new({ :exit_code => 0, :silence => false }.merge(config.send(:table)).merge(options))
 
-      config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
-      config.ui.logger.debug { "options=#{options.send(:table).inspect}" }
-      config.ui.logger.info { "command(#{command.inspect})" }
+      options.ui.logger.debug { "config=#{options.send(:table).inspect}" }
+      options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
+      options.ui.logger.info { "command(#{command.inspect})" }
 
-      if config.replace_current_process
-        config.ui.logger.fatal { "REPLACING CURRENT PROCESS - GOODBYE!" }
+      if options.replace_current_process
+        options.ui.logger.fatal { "REPLACING CURRENT PROCESS - GOODBYE!" }
         Kernel.exec(command)
       end
 
@@ -102,14 +102,14 @@ module ZTK
       child_stderr_writer.close
 
       reader_writer_key = {parent_stdout_reader => :stdout, parent_stderr_reader => :stderr}
-      reader_writer_map = {parent_stdout_reader => @config.ui.stdout, parent_stderr_reader => @config.ui.stderr}
+      reader_writer_map = {parent_stdout_reader => options.ui.stdout, parent_stderr_reader => options.ui.stderr}
 
       direct_log(:debug) { log_header("COMMAND") }
       direct_log(:debug) { "#{command}\n" }
       direct_log(:debug) { log_header("STARTED") }
 
       begin
-        Timeout.timeout(config.timeout) do
+        Timeout.timeout(options.timeout) do
           loop do
             pipes = IO.select(reader_writer_map.keys, [], reader_writer_map.keys).first
             pipes.each do |pipe|
@@ -143,7 +143,7 @@ module ZTK
         end
       rescue Timeout::Error => e
         direct_log(:debug) { log_header("TIMEOUT") }
-        log_and_raise(CommandError, "Process timed out after #{config.timeout} seconds!")
+        log_and_raise(CommandError, "Process timed out after #{options.timeout} seconds!")
       end
 
       Process.waitpid(pid)
@@ -153,9 +153,9 @@ module ZTK
       parent_stdout_reader.close
       parent_stderr_reader.close
 
-      config.ui.logger.debug { "exit_code(#{exit_code})" }
+      options.ui.logger.debug { "exit_code(#{exit_code})" }
 
-      if !config.ignore_exit_status && (exit_code != options.exit_code)
+      if !options.ignore_exit_status && (exit_code != options.exit_code)
         log_and_raise(CommandError, "exec(#{command.inspect}, #{options.inspect}) failed! [#{exit_code}]")
       end
       OpenStruct.new(:output => output, :exit_code => exit_code)

data/lib/ztk/ssh.rb

@@ -203,11 +203,11 @@ module ZTK
     #   end
     #   puts ssh.exec("hostname -f").inspect
     def exec(command, options={})
-      options = OpenStruct.new({ :exit_code => 0, :silence => false }.merge(options))
+      options = OpenStruct.new({ :exit_code => 0, :silence => false }.merge(config.send(:table)).merge(options))
 
-      config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
-      config.ui.logger.debug { "options=#{options.send(:table).inspect}" }
-      config.ui.logger.info { "exec(#{command.inspect})" }
+      options.ui.logger.debug { "config=#{options.send(:table).inspect}" }
+      options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
+      options.ui.logger.info { "exec(#{command.inspect})" }
 
       output = ""
       exit_code = -1
@@ -216,12 +216,12 @@ module ZTK
       stderr_header = false
 
       begin
-        Timeout.timeout(config.timeout) do
+        Timeout.timeout(options.timeout) do
           ZTK::RescueRetry.try(:tries => 3, :on => EOFError) do
-            @ssh = Net::SSH.start(config.host_name, config.user, ssh_options)
+            @ssh = Net::SSH.start(options.host_name, options.user, ssh_options)
 
             channel = ssh.open_channel do |chan|
-              config.ui.logger.debug { "Channel opened." }
+              options.ui.logger.debug { "Channel opened." }
 
               direct_log(:debug) { log_header("COMMAND") }
               direct_log(:debug) { "#{command}\n" }
@@ -238,7 +238,7 @@ module ZTK
                   end
                   direct_log(:debug) { data }
 
-                  config.ui.stdout.print(data) unless options.silence
+                  options.ui.stdout.print(data) unless options.silence
                   output += data
                 end
 
@@ -250,7 +250,7 @@ module ZTK
                   end
                   direct_log(:warn) { data }
 
-                  config.ui.stderr.print(data) unless options.silence
+                  options.ui.stderr.print(data) unless options.silence
                   output += data
                 end
 
@@ -263,7 +263,7 @@ module ZTK
                 end
 
                 ch.on_open_failed do |c, code, desc|
-                  config.ui.logger.fatal { "Open failed! (#{code.inspect} - #{desc.inspect})" }
+                  options.ui.logger.fatal { "Open failed! (#{code.inspect} - #{desc.inspect})" }
                 end
 
               end
@@ -271,13 +271,13 @@ module ZTK
             channel.wait
 
             direct_log(:debug) { log_header("CLOSED") }
-            config.ui.logger.debug { "Channel closed." }
+            options.ui.logger.debug { "Channel closed." }
           end
         end
 
       rescue Timeout::Error => e
         direct_log(:debug) { log_header("TIMEOUT") }
-        log_and_raise(SSHError, "Session timed out after #{config.timeout} seconds!")
+        log_and_raise(SSHError, "Session timed out after #{options.timeout} seconds!")
       end
 
       message = [
@@ -285,9 +285,9 @@ module ZTK
         (exit_signal.nil? ? nil : "exit_signal=#{exit_signal} (#{EXIT_SIGNALS[exit_signal]})")
       ].compact.join(", ")
 
-      config.ui.logger.debug { message }
+      options.ui.logger.debug { message }
 
-      if !config.ignore_exit_status && (exit_code != options.exit_code)
+      if !options.ignore_exit_status && (exit_code != options.exit_code)
         log_and_raise(SSHError, message)
       end
       OpenStruct.new(:output => output, :exit_code => exit_code, :exit_signal => exit_signal)

data/lib/ztk/ui.rb

@@ -27,7 +27,10 @@ module ZTK
   # @author Zachary Patten <zachary@jovelabs.net>
   class UIError < Error; end
 
-  # ZTK UI Wrapper Class
+  # ZTK UI Class
+  # 
+  # This class encapsulates a STDOUT, STDERR, STDIN
+  # and logging device.
   #
   # @author Zachary Patten <zachary@jovelabs.net>
   class UI < ZTK::Base

data/lib/ztk/version.rb

@@ -21,6 +21,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3551649041852268044
+      hash: 4264063468850380802
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3551649041852268044
+      hash: 4264063468850380802
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24