vagrant-save 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb13818ccbe5e7ade3859be370d60880fb5e2a83
-  data.tar.gz: 1ef13aa7f48ade51586ecc325045758f3d1ed2ce
+  metadata.gz: 5540fc991600353117fac991a4377e267d9b772c
+  data.tar.gz: 9f2c4d86870c8169864e111ec81d3bc9c4a17659
 SHA512:
-  metadata.gz: ca619292dbd0b54460f7c78ccb672b5ed2d7faf352074d671cb1dac9a0dec8eb3f01a5af87ce6d3b56047e081ef9637f04f916c3c0bc82bafc05f71d535c890b
-  data.tar.gz: 1837c22bf7856b89bdb6c14338d7b32e55c9825360160e746e458ff285cdbc2158d05fed993af62f1f5c1c24937f01247cb594ef08e17d399ef8204f0fddb10f
+  metadata.gz: 0d862bea58a04973a5a32d0ddf2d0d287c40f503f7cdfb876029ba3834dee2d42eeb7064e11e5615d6f4d77d69a6cd6d010cee9281d2c310b0418861e54d7a3c
+  data.tar.gz: 2109dbe663cb5d30bae8e4f1cef47e7f326dd1adc5959ddd989b9c82d675a9e31d4bb699bdb03eda865952b970d6226231e3f233b9325d16d642c0528fd7b170

data/lib/vagrant-save/command.rb

@@ -86,6 +86,8 @@ module VagrantPlugins
           @env.machine_index.set(data)
           @env.machine_index.release(data)
 
+          machine.ui.info("Adding new version to local store")
+
           @env.boxes.add(
             file,
             machine.box.name,

data/lib/vagrant-save/uploader.rb

@@ -55,26 +55,34 @@ module VagrantPlugins
 
         File.open(file) do |f|
 
-          uri = URI.parse(post_url)
+          uri       = URI.parse(post_url)
           full_size = f.size
+          full      = format_bytes(full_size.to_f)
 
           http = Net::HTTP.new(uri.host, uri.port)
+
           http.open_timeout = 10000
           http.read_timeout = 10000
 
           req = Net::HTTP::Post.new(uri.path)
           req.set_form({"box" => f}, 'multipart/form-data')
 
-          previous_percent = ""
+          previous_info = ""
 
           Net::HTTP::UploadProgress.new(req) do |progress|
-            frac = progress.upload_size.to_f / full_size.to_f
-            percent = (frac * 100).round.to_s + "%"
+             if progress.upload_size.to_f >= full_size.to_f
+              info = "Upload complete, commiting new box"
+            else
+              frac    = progress.upload_size.to_f / full_size.to_f
+              percent = (frac * 100).round.to_s + "%"
+              part    = format_bytes(progress.upload_size.to_f)
+              info = "#{percent} (#{part} / #{full})"
+            end
 
-            if percent != previous_percent
-              previous_percent = percent
+            if info != previous_info
+              previous_info = info
               @env.ui.clear_line
-              @env.ui.report_progress(progress.upload_size.to_f, full_size.to_f)
+              @env.ui.info(info, new_line: false)
             end
           end
           res = http.request(req)
@@ -89,12 +97,22 @@ module VagrantPlugins
         provider
       end
 
+      def format_bytes(num)
+        units = ["Byte", "KB", "MB", "GB", "TB"]
+        index = (Math.log(num) / Math.log(2)).to_i / 10
+        bytes = num / ( 1024 ** index )
+        bytes = bytes.round(2).to_s.gsub(/\.0+$/, "")
+
+        "#{bytes} #{units[index]}"
+      end
+
       # @param [Vagrant::Machine] machine
       # @param [int] keep
       # @return int
       def clean(machine, keep)
 
         client = HTTPClient.new
+
         client.connect_timeout = 10000
         client.send_timeout    = 10000
         client.receive_timeout = 10000
@@ -104,18 +122,27 @@ module VagrantPlugins
         @logger.debug("Load versions from #{data_url}")
 
         res = client.get(data_url)
-        data = JSON.parse(res.http_body)
-        saved_versions = data['versions'].map{ |v| v.version}
 
-        @logger.debug("Received #{saved_versions.length} versions")
+        @logger.debug("Got response #{res.inspect}")
+
+        data = JSON.parse(res.body)
+
+        @logger.debug("Traverse versions in #{data.inspect}")
+
+        saved_versions = data['versions'].map{ |v|
+          @logger.debug("Received version #{v.inspect}")
+          v['version']
+        }
+
+        @logger.debug("Got #{saved_versions.length} versions: #{saved_versions.inspect}")
 
         if saved_versions.length > keep
           machine.ui.info('Cleaning up old versions')
 
-          saved_versions = saved_versions.sort.reverse
-          saved_versions.slice(keep, saved_versions.length).each { |v|
+          saved_versions.sort.reverse.slice(keep, saved_versions.length).each { |v|
             delete_url = data_url + '/' + v
 
+            machine.ui.info("Deleting version #{v}")
             @logger.debug("Sending delete #{delete_url}")
 
             client.delete(delete_url)

data/lib/vagrant-save/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Save
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-save
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-export