Merge branch 'release/v0.5.1'

frapposelli · Sep 26, 2014 · e47540b · e47540b
2 parents c9eb100 + db6869f
commit e47540b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,7 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# Vagrant specifics
+Vagrantfile*
+vagrant*deb
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [Vagrant](http://www.vagrantup.com) provider for [VMware vCloud Air®](http://vcloud.vmware.com)
 =============
 
-[Version 0.5.0](../../releases/tag/v0.5.0) has been released!
+[Version 0.5.1](../../releases/tag/v0.5.1) has been released!
 -------------
 
 ## Version 0.5.0 doesn't work with Vagrant 1.6.5+, another version is coming, please use Vagrant 1.6.3 in the meantime

diff --git a/lib/vagrant-vcloudair/action/build_vapp.rb b/lib/vagrant-vcloudair/action/build_vapp.rb
@@ -24,11 +24,14 @@ def call(env)
             dns_address2 = '8.8.4.4'
           else
             dns_address1 = NetAddr::CIDR.create(cfg.ip_dns.shift).base
-            dns_address2 = NetAddr::CIDR.create(cfg.ip_dns.shift).base
+            unless cfg.ip_dns.empty?
+              dns_address2 = NetAddr::CIDR.create(cfg.ip_dns.shift).base
+            end
           end
 
           if !cfg.ip_subnet.nil?
             @logger.debug("Input address: #{cfg.ip_subnet}")
+            cidr = NetAddr::CIDR.create(cfg.ip_subnet)
 
             range_addresses = cidr.range(0)
 

diff --git a/lib/vagrant-vcloudair/action/resume.rb b/lib/vagrant-vcloudair/action/resume.rb
@@ -13,7 +13,7 @@ def call(env)
 
           vm_id = env[:machine].id
 
-          env[:ui].info(I18n.t(vagrant_vcloudair.vm.poweron_vm))
+          env[:ui].info(I18n.t('vagrant_vcloudair.vm.poweron_vm'))
           task_id = cnx.poweron_vm(vm_id)
           cnx.wait_task_completion(task_id)
 

diff --git a/lib/vagrant-vcloudair/version.rb b/lib/vagrant-vcloudair/version.rb
@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloudAir
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end
diff --git a/locales/en.yml b/locales/en.yml
@@ -19,7 +19,7 @@ en:
       create_catalog: |-
         Catalog [%{catalog_name}] successfully created.
       create_catalog_ask: |-
-        Would you like to create the [#{cfg.catalog_name}] catalog?
+        Would you like to create the [%{cfg.catalog_name}] catalog?
         Choice (yes/no): 
       catalog_not_created: |-
         Catalog not created, exiting...

diff --git a/vagrant-vcloudair.gemspec b/vagrant-vcloudair.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'i18n', '~> 0.6.4'
   s.add_runtime_dependency 'log4r', '~> 1.1.10'
-  s.add_runtime_dependency 'nokogiri', '~> 1.5.5'
+  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'