vagrant-vcloud 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c4c78e1a1282b1aac96e39cfcea24b36847340
-  data.tar.gz: afc6fc6fa406254848db0d871b5f014b0d72f193
+  metadata.gz: fd8a383b915dc8939efd48bde407f13c3be6d104
+  data.tar.gz: f5dd1be500a3399db255258d351e58c7c5d20c30
 SHA512:
-  metadata.gz: 6d53ac5b55cd8060e0d73c5168d56ca21793cadcef767bdf0abde2ecd25091eec362a0d6eec4500cbff64e0d16ea77391ba9d5e8759c139a708502b86633bb92
-  data.tar.gz: 29fb9185c93f55efdcd1bf787dc3c67e898231370477e0fed5969509598305d1c289186f77de60e24dc808dfd8902464ad868bf536a3a0be946cf96567043bed
+  metadata.gz: 44f686d7604fff5fb6ba410c0366c55a17464cb23bf30c84f22a697bbe5517e4c3c7e579015ded3cd11622e2b3212c18e5d19a216404031f0c7863d64e69d979
+  data.tar.gz: 40fe2aa6f7e68ef8756bf92c960d99e89ff6fee58bb80d8ade0e719afb82febd871fcf95a7abf54d869ccdd13fb4a53d83865f88919cf425412e9cd272b0b1fb

data/README.md

@@ -164,5 +164,3 @@ What is still missing:
 -	Error checking is absymal.
 -	Some spaghetti code here and there.
 -	Bugs, bugs and BUGS!.
-
-If you're a developer and want to lend us a hand, head over to our `develop` branch and send us PRs!

data/example_box/README.md

@@ -9,5 +9,3 @@ BOX package should contain:
 - `<boxname>.mf` -- OVF manifest file containing file hashes.
 - `<boxname>-disk-<#>.vmdk` -- Associated VMDK files.
 - `Vagrantfile`-- vagrant-vcloud default Vagrantfile
-
-A [task is open](https://github.com/frapposelli/vagrant-vcloud/issues/12) for creating a veewee plugin to facilitate Box creation

data/integration/.gitignore

@@ -0,0 +1,2 @@
+.vagrant/
+!Vagrantfile

data/integration/Dockerfile

@@ -0,0 +1,34 @@
+FROM ubuntu
+
+ARG VAGRANT_VERSION=1.9.1
+
+ENV	\
+  BOX_WINDOWS=https://github.com/plossys/vagrant-vcloud/raw/my/helper/dummy-windows.box \
+  BOX_LINUX=https://github.com/plossys/vagrant-vcloud/raw/my/helper/dummy-linux.box
+
+RUN apt-get update -y && \
+    apt-get install -y build-essential liblzma-dev zlib1g-dev git openssh-client rsync curl && \
+    ln -sf bash /bin/sh && \
+    curl -L https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb > /tmp/vagrant_x86_64.deb && \
+    dpkg -i /tmp/vagrant_x86_64.deb && \
+    rm -f /tmp/vagrant_x86_64.deb && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    vagrant plugin list && \
+    ln -s /user/Vagrantfile /root/.vagrant.d/Vagrantfile && \
+    vagrant box add windows_2016 ${BOX_WINDOWS} && \
+    vagrant box add ubuntu1404 ${BOX_LINUX}
+
+WORKDIR /plugin
+COPY . /plugin
+
+RUN /opt/vagrant/embedded/bin/gem build vagrant-vcloud.gemspec && \
+    vagrant --version && \
+    vagrant plugin install ./vagrant-vcloud*.gem && \
+    vagrant plugin list
+
+WORKDIR /work
+
+VOLUME ["/work", "/user"]
+
+ENTRYPOINT ["vagrant"]

data/integration/README.md

@@ -0,0 +1,34 @@
+# integration
+
+Easily run some integration tests with several versions of Vagrant in a Docker container.
+
+## Build vagrant base images
+
+To build the vagrant base images just run
+
+```
+./build-images.sh
+```
+
+This also tests if the plugin is installable in the latest three minor versions of Vagrant.
+
+Afterwards you have some Docker images with specific Vagrant versions:
+
+```
+$ docker images | grep vagrant
+vagrant                     1.7.4               4bd54f063310        About an hour ago   598.9 MB
+vagrant                     1.8.7               9d70aa570e14        About an hour ago   594.1 MB
+vagrant                     1.9.1               446c0fad9f55        About an hour ago   609.8 MB
+```
+
+## Run a test
+
+In this folder there is a `Vagrantfile` with two VM's in a vApp. Spinning up that vApp you will test if rsync works and if adding a VM to a vApp works.
+
+You can use all commands of Vagrant with that wrapper script `test.sh`. As first argument you have to specify the Docker image name, eg. `vagrant:1.9.1`
+
+```
+./test.sh vagrant:1.7.4 up
+```
+
+If you change some code you have to rebuild the base images at the moment.

data/integration/Vagrantfile

@@ -0,0 +1,33 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$script=<<EOF
+echo "Hello from `hostname`"
+echo "Listing of /vagrant"
+ls -l /vagrant
+EOF
+
+Vagrant.configure("2") do |config|
+  if Vagrant.has_plugin?("vagrant-vcloud")
+    config.vm.provider :vcloud do |vcloud|
+      vcloud.vapp_prefix = "integrationtest"
+      vcloud.ip_subnet = "172.16.32.0/255.255.255.0"
+    end
+    config.vm.provider :vcloud do |cloud, override|
+      override.vm.usable_port_range = 2200..2999
+    end
+  end
+
+  config.vm.define :"tst" do |cfg|
+    cfg.vm.box = "ubuntu1404"
+    cfg.vm.hostname = "tst"
+    cfg.vm.provision "shell", inline: $script
+  end
+
+  config.vm.define :"tst2" do |cfg|
+    cfg.vm.box = "ubuntu1404"
+    cfg.vm.hostname = "tst2"
+    cfg.vm.provision "shell", inline: $script
+  end
+
+end

data/integration/build-images.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+MY_PATH="`dirname \"$0\"`"              # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd  )`"  # absolutized and normalized
+cd $MY_PATH/..
+docker build -t vagrant:1.9.1 --build-arg VAGRANT_VERSION=1.9.1 -f integration/Dockerfile .
+docker build -t vagrant:1.8.7 --build-arg VAGRANT_VERSION=1.8.7 -f integration/Dockerfile .
+docker build -t vagrant:1.7.4 --build-arg VAGRANT_VERSION=1.7.4 -f integration/Dockerfile .

data/integration/test.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [[ $1 == '--help' || $1 == '' ]]; then
+  echo "A helper to test plugin sources with several Vagrant versions."
+  echo "Usage: $0 <image> <command>"
+  echo "Examples:"
+  echo "$0 vagrant:1.7.4 up"
+  echo "$0 vagrant:1.8.7 up"
+  echo "$0 vagrant:1.9.1 up"
+  echo "$0 vagrant:1.9.1 destroy -f"
+  exit 0
+fi
+
+image=$1
+shift
+
+docker run --rm -it \
+  -v "$(pwd):/work" \
+  -v ~/.vagrant.d/Vagrantfile:/user/Vagrantfile \
+  "$image" "$@"

data/lib/vagrant-vcloud/driver/meta.rb

@@ -50,7 +50,8 @@ module VagrantPlugins
             '5.1' => Version_5_1,
             '5.5' => Version_5_1, # Binding vCloud 5.5 API on our current 5.1 implementation
             '5.6' => Version_5_1, # Binding vCHS API on our current 5.1 implementation
-            '5.7' => Version_5_1  # Binding vCHS API on our current 5.1 implementation
+            '5.7' => Version_5_1, # Binding vCHS API on our current 5.1 implementation
+            '9.0' => Version_5_1  # Binding vCHS API on our current 5.1 implementation
           }
 
           if @version.start_with?('0.9') ||

data/lib/vagrant-vcloud/driver/version_5_1.rb

@@ -1002,8 +1002,7 @@ module VagrantPlugins
           )
 
           vapp_id = URI(headers['Location']).path.gsub('/api/vApp/vapp-', '')
-
-          task = response.css("Task [operationName='vdcRecomposeVapp']").first
+          task = response.css("Task[operationName='vdcRecomposeVapp']").first
           task_id = URI(task['href']).path.gsub('/api/task/', '')
 
           { :vapp_id => vapp_id, :task_id => task_id }

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = '0.4.6'
+    VERSION = '0.4.7'
   end
 end

data/vagrant-vcloud.gemspec

@@ -12,20 +12,16 @@ Gem::Specification.new do |s|
   s.summary = 'VMware vCloud Director® provider'
   s.description = 'Enables Vagrant to manage machines with VMware vCloud Director®.'
 
-  s.add_runtime_dependency 'i18n', '~> 0.6.4'
-  s.add_runtime_dependency 'log4r', '~> 1.1.10'
-  s.add_runtime_dependency 'nokogiri', '~> 1.6'
-  s.add_runtime_dependency 'httpclient', '~> 2.3.4.1'
-  s.add_runtime_dependency 'ruby-progressbar', '~> 1.1.1'
-  s.add_runtime_dependency 'netaddr', '~> 1.5.0'
+  s.add_runtime_dependency 'ruby-progressbar', '~> 1.1'
+  s.add_runtime_dependency 'netaddr', '~> 1.5'
   # Adding awesome_print because it's just awesome to read XML
-  s.add_runtime_dependency 'awesome_print', '~> 1.2.0'
-  s.add_runtime_dependency 'terminal-table', '~> 1.4.5'
+  s.add_runtime_dependency 'awesome_print', '~> 1.2'
+  s.add_runtime_dependency 'terminal-table', '~> 1.4'
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec-core', '~> 2.12.2'
-  s.add_development_dependency 'rspec-expectations', '~> 2.12.1'
-  s.add_development_dependency 'rspec-mocks', '~> 2.12.1'
+  s.add_development_dependency 'rake', '~> 12.0'
+  s.add_development_dependency 'rspec-core', '~> 2.12'
+  s.add_development_dependency 'rspec-expectations', '~> 2.12'
+  s.add_development_dependency 'rspec-mocks', '~> 2.12'
 
   s.files = `git ls-files`.split($/)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,176 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-- !ruby/object:Gem::Dependency
-  name: log4r
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.10
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.4.1
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '2.12'
 description: Enables Vagrant to manage machines with VMware vCloud Director®.
 email:
 - fabio@rapposelli.org
@@ -196,6 +140,12 @@ files:
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/metadata.json
+- integration/.gitignore
+- integration/Dockerfile
+- integration/README.md
+- integration/Vagrantfile
+- integration/build-images.sh
+- integration/test.sh
 - lib/vagrant-vcloud.rb
 - lib/vagrant-vcloud/action.rb
 - lib/vagrant-vcloud/action/announce_ssh_exec.rb
@@ -264,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: VMware vCloud Director® provider