do 0.2.0.f → 0.2.0.g

data/lib/do/server.rb

@@ -140,11 +140,11 @@ module DO
       sftp.upload!(from, to, options) do |event, uploader, *args|
         case event
         when :put
-          DO_LOGGER.print("\r" << DO_LOGGER_FORMAT % [user, name, "writing: #{to} (#{args[1] * 100 / args[0].size}%)"]); DO_LOGGER.flush
+          DO_LOGGER.print("\r" + DO_LOGGER_FORMAT % [user, name, "writing: #{args[0].local} (#{(args[1].to_f * 100 / args[0].size.to_f).to_i}%)"]); DO_LOGGER.flush
         when :finish
-          DO_LOGGER.puts("\r" << DO_LOGGER_FORMAT % [user, name, "writing: #{to} (100%)"]); DO_LOGGER.flush
-        when :mkdir
-          log "creating directory #{args[0]}"
+          DO_LOGGER.puts("\r" + DO_LOGGER_FORMAT % [user, name, "writing: #{to} (100%)"]); DO_LOGGER.flush
+        # when :mkdir
+        #   log "creating directory #{args[0]}"
         end
       end
     end
@@ -164,11 +164,12 @@ module DO
       sftp.download!(from, to, options) do |event, downloader, *args|
         case event
         when :get
-          DO_LOGGER.print("\r" << DO_LOGGER_FORMAT % [user, name, "sending: #{from} (#{args[1] * 100 / args[0].size}%)"]); DO_LOGGER.flush
+          size = args[0].size ? args[0].size : sftp.stat!(from).size
+          DO_LOGGER.print("\r" + DO_LOGGER_FORMAT % [user, name, "sending: #{args[0].remote} (#{(args[1].to_f * 100 / size.to_f).to_i}%)"]); DO_LOGGER.flush
         when :finish
-          DO_LOGGER.puts("\r" << DO_LOGGER_FORMAT % [user, name, "sending: #{from} (100%)"]); DO_LOGGER.flush
-        when :mkdir
-          log "creating directory #{args[0]}"
+          DO_LOGGER.puts("\r" + DO_LOGGER_FORMAT % [user, name, "sending: #{from} (100%)"]); DO_LOGGER.flush
+        # when :mkdir
+        #   log "creating directory #{args[0]}"
         end
       end
     end

data/lib/do/version.rb

@@ -1,3 +1,3 @@
 module DO
-  VERSION = '0.2.0.f' unless defined?(DO::VERSION)
+  VERSION = '0.2.0.g' unless defined?(DO::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: do
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 52
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
-  - f
-  version: 0.2.0.f
+  - g
+  version: 0.2.0.g
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-27 00:00:00 +01:00
+date: 2012-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency