vagrant-save 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61d2c1869c2781c59cce9b501e55fc56ee2dca6
-  data.tar.gz: 0b6b807477ce3b01e6e133c1153e25331b81aa2c
+  metadata.gz: e747df3cbda252cef807ebcad1089cd2b6aa0fad
+  data.tar.gz: 2181ff62dd1ebea7177cfb512cf970a663199997
 SHA512:
-  metadata.gz: 3e9cf1802217aeccfae0f99107cee0a8115699ed1241b1530670ed9c57c593ac9ab949385b38251e5a14803005bc299e9ead422fa3fe088cc40d153cec115008
-  data.tar.gz: 30a5948f0055017eceb7d11723da3c4b93d5c99192d65a8e47c7e1f74fb971415af0a87591949e3e5a052cf5bd8af3289c855f184ab235fe5e2762bf13b88b2a
+  metadata.gz: e8a6179385eafd7ab945ecaa0ce16a35ff6fcb12f87155e1e1d0faec76b662f1bb329d971ad231d37ede6c877c27cee438bfbd82f307ac45d346b6f2321b916a
+  data.tar.gz: 03397a1fe3e97ccb71b9fd8331e99bb6fbe15a158e837cf3c4df99fc792e54d3c19d0f81078ab9e0098bae77b0348462accc66a64c4ce352e9eac1e1b1c22eed

data/README.md

@@ -22,23 +22,24 @@ vagrant save
 
 to release a new version of your box.
 
-Without any further arguments, vagrant-save will delete old versions, keeping only the last three. You can override this by setting the `-c|--clean` option.
+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
-# Keeping the last six versions
-vagrant save -c 6
-
-# Keeping all versions
-vagrant save -c 0
+vagrant save -v 1.2.0
 ```
 
-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:
+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
-vagrant save -v 1.2.0
-```
+# Keeping the last six versions
+vagrant save -k 6
 
-The parameter must always have all three digits and must be greater than the installed version
+# Keeping all versions
+# Does not need to be written, as it is the default setting
+vagrant save -k 0
+```
 
 ## License
 

data/Vagrantfile

@@ -1,5 +1,5 @@
 
 Vagrant.configure("2") do |config|
+  # This must be set
   config.vm.box_server_url = "http://localhost:8001"
-  config.vm.box = "base/typo3"
 end

data/lib/vagrant-save/command.rb

@@ -16,15 +16,19 @@ module VagrantPlugins
       def execute
         options = {}
         options[:version] = nil
-        options[:clean] = 3
+        options[:keep] = 0
 
         opts = OptionParser.new do |o|
           o.banner = 'Usage: vagrant save [version]'
           o.separator ''
 
-          o.on('-c', '--clean', 'Set the version of the uploaded box') do |c|
+          o.on('-v', '--version', 'Set the version of the uploaded box. Defaults to next bugfix version') do |c|
             options[:clean] = c.to_i
           end
+
+          o.on('-k', '--keep', 'Number of versions to keep, older will be removed. Must be >= 1. Defaults to 0.') do |c|
+            options[:keep] = c.to_i
+          end
         end
 
         argv = parse_options(opts)
@@ -69,8 +73,8 @@ module VagrantPlugins
 
           FileUtils.remove(file)
 
-          if options[:clean] && options[:clean] > 1
-            up.clean(machine, options[:clean])
+          if options[:keep] && options[:keep] > 1
+            up.clean(machine, options[:keep])
           end
 
         end

data/lib/vagrant-save/plugin.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
 
       description <<-EOF
       Uses vagrant-export to create a.box file from the current machine and
-      saves it to a boxserver using a HTTP PUT request.
+      saves it to a boxserver using a HTTP POST request.
       EOF
 
       command 'save' do

data/lib/vagrant-save/uploader.rb

@@ -24,15 +24,21 @@ module VagrantPlugins
 
         @env.ui.info('Uploading now')
 
+        @logger.debug("Preparing to send file #{file}")
+
         provider = machine.provider_name.to_s
         ping_url = make_url(machine)
         post_url = ping_url + '/' + version + '/' + provider
 
+        @logger.debug("Pinging #{ping_url}")
+
         client = HTTPClient.new
         res = client.options(ping_url)
 
         raise VagrantPlugins::Save::Errors::CannotContactBoxServer unless res.http_header.status_code == 200
 
+        @logger.debug("Sending file to #{post_url}")
+
         File.open(file) do |f|
           body = {'box' => f}
           res = client.post(post_url, body)
@@ -53,16 +59,24 @@ module VagrantPlugins
 
         data_url = make_url(machine)
 
+        @logger.debug("Load versions from #{data_url}")
+
         res = client.get(data_url)
         data = JSON.parse(res.http_body)
 
         client = HTTPClient.new
         saved_versions = data['versions'].map{ |v| v.version}
 
+        @logger.debug("Received #{saved_versions.length} versions")
+
         if saved_versions.length > keep
           saved_versions = saved_versions.sort.reverse
           saved_versions.slice(keep, saved_versions.length).each { |v|
-            client.delete(data_url + '/' + v)
+            delete_url = data_url + '/' + v
+
+            @logger.debug("Sending delete #{delete_url}")
+
+            client.delete(delete_url)
           }
         end
 

data/lib/vagrant-save/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module Save
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-save
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Georg Großberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-export