vagrant-save 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7010292589cb6518cd03465ce38d51046da2d3ac
-  data.tar.gz: 8344af243ce9131dc4c6e0385d8a0318b408a345
+  metadata.gz: 42ff5bfda3de74ddd3d9ffe0b0904512acf86592
+  data.tar.gz: 839db02248a34e55080b454477d3419ec4458e29
 SHA512:
-  metadata.gz: d9286f323ff4c4bfe6e7ea0a7345dc00713d43f37632071304262bb80f7a2f7505b702723d4fba0a2e0dcfa211b8694e26e173de1b0b2e63ff7e7996676b0510
-  data.tar.gz: 07fedfbc0e783917f02b9e2a7f824def950d6abc7a0db7aa2d9e4a71a3d7e2b29358e50d8049a7fad6b69772dea4fae53eadabd571bc6cd99e9c27008eb849ce
+  metadata.gz: dd5b662c604e5202c2b53f3a1c2f7dc1daaaeeaf01f0356aab9296f1f40581b840b8ca20a7724247cc6ca9c3059638393602e066f0c9e94a7aa9ee54a3e653d6
+  data.tar.gz: 0f953acedac4e051360ff279ad91239d3891914eb723baa4f5280f4d7d65fd991ff64f72cb94d15284228a36c9b82be5b9318ed33a0d51993f2aef9cf43a6cce

data/Gemfile

@@ -1,11 +1,11 @@
-source 'https://rubygems.org'
-
-group :development do
-	  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
-end
-
-gem 'vagrant-export', '>= 0.2.3', git: 'https://github.com/trenker/vagrant-export.git'
-
-group :plugins do
-	  gem 'vagrant-save', path: '.'
-end
+source 'https://rubygems.org'
+
+group :development do
+	  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+end
+
+gem 'vagrant-export', '>= 0.3.4', git: 'https://github.com/trenker/vagrant-export.git'
+
+group :plugins do
+	  gem 'vagrant-save', path: '.'
+end

data/README.md

@@ -1,73 +1,73 @@
-# vagrant-save
-
-This is a simple plugin to export boxes into .box files using [vagrant-export](https://github.com/trenker/vagrant-export) and pushes that file to a  [boxserver](https://github.com/trenker/boxserver) instance.
-
-## Installation
-
-Like with any other vagrant plugin:
-
-```bash
-vagrant plugin install vagrant-save
-```
-
-## Usage
-
-Have a [boxserver](https://github.com/trenker/boxserver) instance running and set the property `config.vm.box_server_url` to its address in your vagrant file. So your `Vagrantfile` contains the following statements:
-
-```ruby
-Vagrant.configure("2") do |config|
-  # This must be set
-  config.vm.box_server_url = "http://localhost:8001"
-end
-```
-
-Then just run
-
-```bash
-vagrant save
-```
-
-to release a new version of your box.
-
-By default, it increases the bugfix version number by one. So an installed 1.0.0 becomes 1.0.1. You can specify the version yourself using the parameter `-v|--version`, like this:
-
-```bash
-vagrant save -v 1.2.0
-```
-
-The parameter must always have all three digits and must be greater than the installed version.
-
-You may want to clean up the boxserver by deleting old versions. The `-k|--keep` parameter sets how many versions to keep. The versions are sorted in descending order, older than the newest X will be deleted:
-
-```bash
-# Keeping the last six versions
-vagrant save -k 6
-
-# Keeping all versions
-# Does not need to be written, as it is the default setting
-vagrant save -k 0
-```
-
-## License
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Georg Großberger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+# vagrant-save
+
+This is a simple plugin to export boxes into .box files using [vagrant-export](https://github.com/trenker/vagrant-export) and pushes that file to a  [boxserver](https://github.com/trenker/boxserver) instance.
+
+## Installation
+
+Like with any other vagrant plugin:
+
+```bash
+vagrant plugin install vagrant-save
+```
+
+## Usage
+
+Have a [boxserver](https://github.com/trenker/boxserver) instance running and set the property `config.vm.box_server_url` to its address in your vagrant file. So your `Vagrantfile` contains the following statements:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # This must be set
+  config.vm.box_server_url = "http://localhost:8001"
+end
+```
+
+Then just run
+
+```bash
+vagrant save
+```
+
+to release a new version of your box.
+
+By default, it increases the bugfix version number by one. So an installed 1.0.0 becomes 1.0.1. You can specify the version yourself using the parameter `-v|--version`, like this:
+
+```bash
+vagrant save -v 1.2.0
+```
+
+The parameter must always have all three digits and must be greater than the installed version.
+
+You may want to clean up the boxserver by deleting old versions. The `-k|--keep` parameter sets how many versions to keep. The versions are sorted in descending order, older than the newest X will be deleted:
+
+```bash
+# Keeping the last six versions
+vagrant save -k 6
+
+# Keeping all versions
+# Does not need to be written, as it is the default setting
+vagrant save -k 0
+```
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Georg Großberger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/vagrant-save/command.rb

@@ -45,7 +45,6 @@ module VagrantPlugins
         require 'vagrant-export/exporter'
         require_relative 'uploader'
 
-        ex = VagrantPlugins::Export::Exporter.new(@env, @logger)
         up = Uploader.new(@env, @logger)
 
         with_target_vms argv, reverse: true do |machine|
@@ -67,9 +66,19 @@ module VagrantPlugins
             end
           end
 
-          file = ex.handle(machine, false, false)
+          ex = VagrantPlugins::Export::Exporter.new(machine, @env, @logger)
+          file = ex.target_file
+
+          unless File.file?(file)
+            ex.handle(false, false)
+          end
+
           provider_name = up.send(machine, file, version)
 
+          data = @env.machine_index.get(machine.index_uuid)
+          data.extra_data['version'] = version
+          @env.machine_index.set(data)
+
           @env.boxes.add(
             file,
             machine.box.name,

data/lib/vagrant-save/uploader.rb

@@ -50,8 +50,29 @@ module VagrantPlugins
         @logger.debug("Sending file to #{post_url}")
 
         File.open(file) do |f|
-          body = {'box' => f}
-          res = client.post(post_url, body)
+          body = {:box => f}
+          connection = client.post_async(post_url, body)
+          i = 0
+
+          while true
+            break if connection.finished?
+
+            @env.ui.info('.', new_line: false)
+            i++
+
+            if i > 40
+              @env.ui.clear_line
+              i = 0
+            end
+
+            sleep 1
+          end
+
+          if i > 0
+            @env.ui.clear_line
+          end
+
+          res = connection.pop
         end
 
         raise VagrantPlugins::Save::Errors::UploadFailed unless res.http_header.status_code == 200

data/lib/vagrant-save/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Save
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-save
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-export
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Export boxes to a boxserver