vagrant-save 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 007a980eca6b2c8182d0829d8692e480f3c1870f
-  data.tar.gz: beed37e3e9a953459cb8c5b1b2e581fc9e6b6111
+  metadata.gz: 8d12fce680eb7b11dda3896b21a1cc5ba81dffac
+  data.tar.gz: 746385237c987123812fbd4bd4482e5f5bcc8939
 SHA512:
-  metadata.gz: 3a278375e5ea335f681be8357c5224a2c19ce2ea76427701ec4c6df51bae5bc7b4c6031c633953e585cc3b13fdeae22a550f103249eb4426ac6e444cf47fe5d3
-  data.tar.gz: 28c4fdabbb7f2050e30b5faca685a2ee7ac95200688bc5589dfc13a6b01a0774dedfa49e6511808ff4ee1f694a5e85e778a8dd7270855921dcf31893c3cf87bc
+  metadata.gz: a28ab6622188fc8cdf8f96f042dbe29db3bfeafbef6e06e4932837650d50a8c397dc088ca85869365f5d8816b84a62192885d35cd980f1694d25a754400668bc
+  data.tar.gz: c088bdbb47eca3e0e42a27a45f0812195fdcba92fecb9d983c5308f184661c8ed9a028dd1053acdd4aa3ffcc5b11b92c6f785246438fae8086993efd01749e7a

data/.gitignore

@@ -1,20 +1,20 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-Gemfile.lock
-/.idea
-/.vagrant
-*.gem
-*.box
-Vagrantfile
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+Gemfile.lock
+/.idea
+/.vagrant
+*.gem
+*.box
+Vagrantfile

data/Gemfile

@@ -1,11 +1,12 @@
-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
+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'
+gem 'net-http-uploadprogress', '>= 2.0.0'
+
+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

@@ -1,109 +1,109 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-require_relative 'errors'
-
-module VagrantPlugins
-  module Save
-    class Command < Vagrant.plugin('2', :command)
-
-      def self.synopsis
-        'exports a box file with additional actions taken'
-      end
-
-      def execute
-        options = {}
-        options[:version] = nil
-        options[:keep] = 0
-
-        opts = OptionParser.new do |o|
-          o.banner = 'Usage: vagrant save [-v|--version VERSION] [-k|--keep COUNT]'
-          o.separator ''
-
-          o.on('-v', '--version', 'Set the version of the uploaded box. Defaults to next bugfix version') do |v|
-            options[:version] = v.to_s
-          end
-
-          o.on('-k', '--keep', 'Number of versions to keep, older will be removed. Must be >= 1. Defaults to 0.') do |v|
-            options[:keep] = v.to_i
-          end
-        end
-
-        argv = parse_options(opts)
-        return 1 unless argv
-
-        target_version = options[:version]
-
-        unless target_version == nil
-          unless /^[0-9]+\.[0-9]+\.[0-9]+$/ =~ target_version
-            raise VagrantPlugins::Save::Errors::NoValidVersion
-          end
-        end
-
-        require 'vagrant-export/exporter'
-        require_relative 'uploader'
-
-        up = Uploader.new(@env, @logger)
-
-        with_target_vms argv, reverse: true do |machine|
-
-          if machine.state.short_description == 'not created'
-            raise MachineNotCreated
-          end
-
-          if target_version
-            version = target_version
-
-            if Gem::Version.new(machine.box.version.to_s) <= Gem::Version.new(version)
-              raise VagrantPlugins::Save::Errors::InvalidVersion
-            end
-
-          else
-            version_parts = machine.box.version.to_s
-            if /^[0-9]+\.[0-9]+\.[0-9]+$/ =~ version_parts
-              version_parts = version_parts.split('.')
-              version = version_parts[0] + '.' + version_parts[1] + '.' + (version_parts[2].to_i + 1).to_s
-            else
-              version = '1.0.0'
-            end
-          end
-
-          ex = VagrantPlugins::Export::Exporter.new(@env, @logger, machine)
-          file = ex.target_box
-          box_created = false
-
-          unless File.file?(file)
-            box_created = true
-            ex.handle(false, false)
-          end
-
-          provider_name = up.send(machine, file, version)
-
-          data = @env.machine_index.get(machine.index_uuid)
-          data.extra_data['box']['version'] = version
-          @env.machine_index.set(data)
-          @env.machine_index.release(data)
-
-          @env.boxes.add(
-            file,
-            machine.box.name,
-            version,
-            force: true,
-            metadata_url: up.make_url(machine),
-            providers: provider_name
-          )
-
-          FileUtils.remove(file) if box_created
-
-          if options[:keep] && options[:keep] > 1
-              up.clean(machine, options[:keep])
-          end
-
-        end
-        0
-      end
-    end
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+require_relative 'errors'
+
+module VagrantPlugins
+  module Save
+    class Command < Vagrant.plugin('2', :command)
+
+      def self.synopsis
+        'exports a box file with additional actions taken'
+      end
+
+      def execute
+        options = {}
+        options[:version] = nil
+        options[:keep] = 0
+
+        opts = OptionParser.new do |o|
+          o.banner = 'Usage: vagrant save [-v|--version VERSION] [-k|--keep COUNT]'
+          o.separator ''
+
+          o.on('-v', '--version', 'Set the version of the uploaded box. Defaults to next bugfix version') do |v|
+            options[:version] = v.to_s
+          end
+
+          o.on('-k', '--keep', 'Number of versions to keep, older will be removed. Must be >= 1. Defaults to 0.') do |v|
+            options[:keep] = v.to_i
+          end
+        end
+
+        argv = parse_options(opts)
+        return 1 unless argv
+
+        target_version = options[:version]
+
+        unless target_version == nil
+          unless /^[0-9]+\.[0-9]+\.[0-9]+$/ =~ target_version
+            raise VagrantPlugins::Save::Errors::NoValidVersion
+          end
+        end
+
+        require 'vagrant-export/exporter'
+        require_relative 'uploader'
+
+        up = Uploader.new(@env, @logger)
+
+        with_target_vms argv, reverse: true do |machine|
+
+          if machine.state.short_description == 'not created'
+            raise VagrantPlugins::Save::Errors::MachineNotCreated
+          end
+
+          if target_version
+            version = target_version
+
+            if Gem::Version.new(machine.box.version.to_s) <= Gem::Version.new(version)
+              raise VagrantPlugins::Save::Errors::InvalidVersion
+            end
+
+          else
+            version_parts = machine.box.version.to_s
+            if /^[0-9]+\.[0-9]+\.[0-9]+$/ =~ version_parts
+              version_parts = version_parts.split('.')
+              version = version_parts[0] + '.' + version_parts[1] + '.' + (version_parts[2].to_i + 1).to_s
+            else
+              version = '1.0.0'
+            end
+          end
+
+          ex = VagrantPlugins::Export::Exporter.new(@env, @logger, machine)
+          file = ex.target_box
+          box_created = false
+
+          unless File.file?(file)
+            box_created = true
+            ex.handle(false, false)
+          end
+
+          provider_name = up.send(machine, file, version)
+
+          data = @env.machine_index.get(machine.index_uuid)
+          data.extra_data['box']['version'] = version
+          @env.machine_index.set(data)
+          @env.machine_index.release(data)
+
+          @env.boxes.add(
+            file,
+            machine.box.name,
+            version,
+            force: true,
+            metadata_url: up.make_url(machine),
+            providers: provider_name
+          )
+
+          FileUtils.remove(file) if box_created
+
+          if options[:keep] && options[:keep] > 1
+              up.clean(machine, options[:keep])
+          end
+
+        end
+        0
+      end
+    end
+  end
+end

data/lib/vagrant-save/uploader.rb

@@ -1,130 +1,137 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-require 'httpclient'
-
-module VagrantPlugins
-  module Save
-    class Uploader
-
-      # @param [Vagrant::Environment] env
-      # @param [Log4r::Logger] logger
-      def initialize(env, logger)
-        @env = env
-        @logger = logger
-      end
-
-      # @param [Vagrant::Machine] machine
-      # @param [string] file
-      # @param [string] version
-      # @return int
-      def send(machine, file, version)
-
-        machine.ui.info('Uploading now')
-
-        @logger.debug("Preparing to send file #{file}")
-
-        provider = machine.provider_name.to_s
-
-        if provider =~ /vmware/
-          provider = 'vmware_desktop'
-        end
-
-        ping_url = make_url(machine)
-        post_url = ping_url + '/' + version + '/' + provider
-
-        @logger.debug("Pinging #{ping_url}")
-
-        client = HTTPClient.new
-
-        client.connect_timeout = 10000
-        client.send_timeout    = 10000
-        client.receive_timeout = 10000
-
-        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}
-          connection = client.post_async(post_url, body)
-          i = 0
-
-          while true
-            break if connection.finished?
-
-            if i > 40
-              @env.ui.clear_line
-              i = 0
-            end
-
-            @env.ui.info('.', new_line: false)
-            i += 1
-
-            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
-
-        machine.ui.info('Upload successful')
-
-        provider
-      end
-
-      # @param [Vagrant::Machine] machine
-      # @param [int] keep
-      # @return int
-      def clean(machine, keep)
-        machine.ui.info('Cleaning up old versions')
-
-        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|
-            delete_url = data_url + '/' + v
-
-            @logger.debug("Sending delete #{delete_url}")
-
-            client.delete(delete_url)
-          }
-        end
-
-        0
-      end
-
-      # @param [Vagrant::Machine] machine
-      # @return string
-      def make_url(machine)
-        name = machine.box.name.gsub(/_+/, '/')
-        base_url = Vagrant.server_url(machine.config.vm.box_server_url).to_s
-
-        raise Vagrant::Errors::BoxServerNotSet unless base_url
-
-        base_url + '/' + name
-      end
-
-    end
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+require 'httpclient'
+require 'net/http/uploadprogress'
+require 'uri'
+
+module VagrantPlugins
+  module Save
+    class Uploader
+
+      # @param [Vagrant::Environment] env
+      # @param [Log4r::Logger] logger
+      def initialize(env, logger)
+        @env = env
+        @logger = logger
+      end
+
+      # @param [Vagrant::Machine] machine
+      # @param [string] file
+      # @param [string] version
+      # @return int
+      def send(machine, file, version)
+
+        machine.ui.info('Uploading now')
+
+        @logger.debug("Preparing to send file #{file}")
+
+        provider = machine.provider_name.to_s
+
+        if provider =~ /vmware/
+          provider = 'vmware_desktop'
+        end
+
+        ping_url = make_url(machine)
+        post_url = ping_url + '/' + version + '/' + provider
+
+        @logger.debug("Pinging #{ping_url}")
+
+        client = HTTPClient.new
+
+        client.connect_timeout = 10000
+        client.send_timeout    = 10000
+        client.receive_timeout = 10000
+
+        res = client.options(ping_url)
+
+        raise VagrantPlugins::Save::Errors::CannotContactBoxServer unless res.http_header.status_code == 200
+
+        @logger.debug("Sending file to #{post_url}")
+
+        @env.ui.info('Uploading', new_line: false)
+
+        File.open(file) do |f|
+
+          uri = URI.parse(post_url)
+          full_size = f.size
+
+          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 = ""
+
+          Net::HTTP::UploadProgress.new(req) do |progress|
+            frac = progress.upload_size.to_f / full_size.to_f
+            percent = (frac * 100).round.to_s + "%"
+
+            if percent != previous_percent
+              previous_percent = percent
+              @env.ui.clear_line
+              @env.ui.info(percent, new_line: false)
+            end
+          end
+          res = http.request(req)
+        end
+
+        @env.ui.clear_line
+
+        raise VagrantPlugins::Save::Errors::UploadFailed unless res.code == '200'
+
+        machine.ui.info('Upload successful')
+
+        provider
+      end
+
+      # @param [Vagrant::Machine] machine
+      # @param [int] keep
+      # @return int
+      def clean(machine, keep)
+        machine.ui.info('Cleaning up old versions')
+
+        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|
+            delete_url = data_url + '/' + v
+
+            @logger.debug("Sending delete #{delete_url}")
+
+            client.delete(delete_url)
+          }
+        end
+
+        0
+      end
+
+      # @param [Vagrant::Machine] machine
+      # @return string
+      def make_url(machine)
+        name = machine.box.name.gsub(/_+/, '/')
+        base_url = Vagrant.server_url(machine.config.vm.box_server_url).to_s
+
+        raise Vagrant::Errors::BoxServerNotSet unless base_url
+
+        base_url + '/' + name
+      end
+
+    end
+  end
+end

data/lib/vagrant-save/version.rb

@@ -1,10 +1,10 @@
-#                                                                       #
-# This is free software; you can redistribute it and/or modify it under #
-# the terms of the MIT- / X11 - License                                 #
-#                                                                       #
-
-module VagrantPlugins
-  module Save
-    VERSION = '0.2.9'
-  end
-end
+#                                                                       #
+# This is free software; you can redistribute it and/or modify it under #
+# the terms of the MIT- / X11 - License                                 #
+#                                                                       #
+
+module VagrantPlugins
+  module Save
+    VERSION = '0.2.10'
+  end
+end

data/vagrant-save.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |g|
   g.files         = unignored_files
   g.require_path  = 'lib'
   g.add_dependency 'vagrant-export', '>= 0.3.4'
+  g.add_dependency 'net-http-uploadprogress', '>= 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-save
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Georg Grossberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-export
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
+- !ruby/object:Gem::Dependency
+  name: net-http-uploadprogress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Export boxes to a boxserver on a remote machine using HTTP/PUT
 email: contact@grossberger-ge.org
 executables: []
@@ -60,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Export boxes to a boxserver