ztk 1.5.2 → 1.5.3

data/lib/ztk/command.rb

@@ -145,6 +145,8 @@ module ZTK
               end
 
               output += data
+
+              options.on_progress.nil? or options.on_progress.call
             end
             break if reader_writer_map.keys.all?{ |reader| reader.eof? }
           end

data/lib/ztk/ssh/download.rb

@@ -25,23 +25,27 @@ module ZTK
       #   remote = File.expand_path(File.join(ENV["HOME"], ".ssh", "id_rsa.pub"))
       #   ssh.download(remote, local)
       def download(remote, local, options={})
-        config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
-        config.ui.logger.info { "download(#{remote.inspect}, #{local.inspect})" }
         options = {:recursive => ::File.directory?(local) }.merge(options)
+        options = OpenStruct.new(config.send(:table).merge(options))
+
+        options.ui.logger.debug { "config=#{config.send(:table).inspect}" }
+        options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
+        options.ui.logger.info { "download(#{remote.inspect}, #{local.inspect})" }
 
         ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => method(:on_retry)) do
-          sftp.download!(remote.to_s, local.to_s, options) do |event, downloader, *args|
+          sftp.download!(remote.to_s, local.to_s, options.send(:table)) do |event, downloader, *args|
             case event
             when :open
-              config.ui.logger.debug { "download(#{args[0].remote} -> #{args[0].local})" }
+              options.ui.logger.debug { "download(#{args[0].remote} -> #{args[0].local})" }
             when :close
-              config.ui.logger.debug { "close(#{args[0].local})" }
+              options.ui.logger.debug { "close(#{args[0].local})" }
             when :mkdir
-              config.ui.logger.debug { "mkdir(#{args[0]})" }
+              options.ui.logger.debug { "mkdir(#{args[0]})" }
             when :get
-              config.ui.logger.debug { "get(#{args[0].remote}, size #{args[2].size} bytes, offset #{args[1]})" }
+              options.ui.logger.debug { "get(#{args[0].remote}, size #{args[2].size} bytes, offset #{args[1]})" }
+              options.on_progress.nil? or options.on_progress.call
             when :finish
-              config.ui.logger.debug { "finish" }
+              options.ui.logger.debug { "finish" }
             end
           end
         end

data/lib/ztk/ssh/exec.rb

@@ -36,7 +36,7 @@ module ZTK
       def exec(command, options={})
         options = OpenStruct.new(config.send(:table).merge(options))
 
-        options.ui.logger.debug { "config=#{options.send(:table).inspect}" }
+        options.ui.logger.debug { "config=#{config.send(:table).inspect}" }
         options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
         options.ui.logger.info { "exec(#{command.inspect})" }
 
@@ -78,6 +78,8 @@ module ZTK
 
                     options.ui.stdout.print(data) unless options.silence
                     output += data
+
+                    options.on_progress.nil? or options.on_progress.call
                   end
 
                   ch.on_extended_data do |c, type, data|
@@ -90,6 +92,8 @@ module ZTK
 
                     options.ui.stderr.print(data) unless options.silence
                     output += data
+
+                    options.on_progress.nil? or options.on_progress.call
                   end
 
                   ch.on_request("exit-status") do |c, data|

data/lib/ztk/ssh/upload.rb

@@ -20,23 +20,27 @@ module ZTK
       # @param [String] local The local file/path you wish to upload from.
       # @param [String] remote The remote file/path you with to upload to.
       # @return [Boolean] True if successful.
-      def upload(local, remote)
-        config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
+      def upload(local, remote, options={})
+        options = OpenStruct.new(config.send(:table).merge(options))
+
+        options.ui.logger.debug { "config=#{config.send(:table).inspect}" }
+        options.ui.logger.debug { "options=#{options.send(:table).inspect}" }
         config.ui.logger.info { "upload(#{local.inspect}, #{remote.inspect})" }
 
         ZTK::RescueRetry.try(:tries => 3, :on => EOFError, :on_retry => method(:on_retry)) do
           sftp.upload!(local.to_s, remote.to_s) do |event, uploader, *args|
             case event
             when :open
-              config.ui.logger.debug { "upload(#{args[0].local} -> #{args[0].remote})" }
+              options.ui.logger.debug { "upload(#{args[0].local} -> #{args[0].remote})" }
             when :close
-              config.ui.logger.debug { "close(#{args[0].remote})" }
+              options.ui.logger.debug { "close(#{args[0].remote})" }
             when :mkdir
-              config.ui.logger.debug { "mkdir(#{args[0]})" }
+              options.ui.logger.debug { "mkdir(#{args[0]})" }
             when :put
-              config.ui.logger.debug { "put(#{args[0].remote}, size #{args[2].size} bytes, offset #{args[1]})" }
+              options.ui.logger.debug { "put(#{args[0].remote}, size #{args[2].size} bytes, offset #{args[1]})" }
+              options.on_progress.nil? or options.on_progress.call
             when :finish
-              config.ui.logger.debug { "finish" }
+              options.ui.logger.debug { "finish" }
             end
           end
         end

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1328731926470654880
+      hash: -2701900535427889660
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1328731926470654880
+      hash: -2701900535427889660
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25