vagrant-vcenter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f190d95ac55ca75fe0c142093303e9ddadec651f
-  data.tar.gz: 9ca4acd548c2cfd7d9d30049daddba701a683ed4
+  metadata.gz: cbc68c8b0dd49dd5af92c1aed4ddd88a470c486d
+  data.tar.gz: 938d2e5c277559decb8e5f2507dad4a2620465a2
 SHA512:
-  metadata.gz: 360703f5547238533291f5f608fc27fc1363aa1de72d53aa98820b4cf8eff43ee8c7017f7080005555b782692cf182a3a60d1bf96d64ae78fb4b1c74f755bbb1
-  data.tar.gz: 527b43a8073220b8466be2c57bad4398e09e43331e0adbf6cbc8d52f27c6beea25bff6e086ae6b50d27e93ab2f8b440e05ca7c25d0d437c45e36ec355a5524f3
+  metadata.gz: d9278d845e8cf8953691975a0d1519be4f12a5ffee67f5f071b2e1d05fcd119cfca25ad6ad12109d641ff22b239f21e7eb088642064549ac5e1b4efe2eb792dd
+  data.tar.gz: aff96e740e4bd02074e1d58c48bfd227872b4fd8a30bd2e80b501dfe10957f130f40d0febb6dd38d9c4a61e9c7a4c1ca209df6945afd827f747768db3a068213

data/README.md

@@ -1,13 +1,18 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCenter®
 =============
 
-[Version 0.1.0](../../releases/tag/v0.1.0) has been released!
+[Version 0.1.1](../../releases/tag/v0.1.1) has been released!
 -------------
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
 
 Right now a [Precise32](http://vagrant.gosddc.com/boxes/precise32-vcenter.box) is available for use, or you can roll your own as you please, make sure to install VMware tools in it.
 
+Changes in [version 0.1.1](../../releases/tag/v0.1.1) include:
+
+- Support for ```vagrant share``` [Fixes [#2](../../issues/2)]
+- Support for [Vagrant Cloud](http://vagrantcloud.com) boxes [Fixes [#1](../../issues/1)]
+
 Install
 -------------
 
@@ -17,6 +22,12 @@ Latest version can be easily installed by running the following command:
 
 Vagrant will download all the required gems during the installation process.
 
+If you already have the plugin installed you can use:
+
+```vagrant plugin upgrade vagrant-vcenter```
+
+To perform an upgrade to the latest version.
+
 After the install has completed a ```vagrant up --provider=vcenter``` will trigger the newly installed provider.
 
 Configuration

data/lib/vagrant-vcenter/action/build_vm.rb

@@ -22,11 +22,19 @@ module VagrantPlugins
           dc = config.vcenter_cnx.serviceInstance.find_datacenter(
             config.datacenter_name) or abort 'datacenter not found'
 
+          if env[:machine].box.name.to_s.include? '/'
+            box_file = env[:machine].box.name.rpartition('/').last.to_s
+            box_name = env[:machine].box.name.to_s.gsub(/\//, '-')
+          else
+            box_file = env[:machine].box.name.to_s
+            box_name = box_file
+          end
+
           if config.template_folder_name.nil?
-            box_to_search = env[:machine].box.name.to_s
+            box_to_search = box_name
           else
             box_to_search = config.template_folder_name + '/' +
-                            env[:machine].box.name.to_s
+                            box_name
           end
 
           # FIXME: Raise a correct exception

data/lib/vagrant-vcenter/action/connect_vcenter.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
 
             @logger.debug("config.hostname: #{config.hostname}")
             @logger.debug("config.username: #{config.username}")
-            @logger.debug("config.password: #{config.password}")
+            @logger.debug('config.password: <hidden>')
 
             # FIXME: fix the insecure flag, catch the exception
             config.vcenter_cnx = RbVmomi::VIM.connect(

data/lib/vagrant-vcenter/action/inventory_check.rb

@@ -26,7 +26,14 @@ module VagrantPlugins
           config = env[:machine].provider_config
 
           box_dir = env[:machine].box.directory.to_s
-          box_file = env[:machine].box.name.to_s
+
+          if env[:machine].box.name.to_s.include? '/'
+            box_file = env[:machine].box.name.rpartition('/').last.to_s
+            box_name = env[:machine].box.name.to_s.gsub(/\//, '-')
+          else
+            box_file = env[:machine].box.name.to_s
+            box_name = box_file
+          end
 
           box_ovf = "file://#{box_dir}/#{box_file}.ovf"
 
@@ -35,7 +42,7 @@ module VagrantPlugins
 
           @logger.debug("OVF File: #{box_ovf}")
 
-          env[:ui].info("Adding [#{env[:machine].box.name.to_s}]")
+          env[:ui].info("Adding [#{box_name}]")
 
           # FIXME: Raise a correct exception
           dc = config.vcenter_cnx.serviceInstance.find_datacenter(
@@ -51,7 +58,7 @@ module VagrantPlugins
                             config.template_folder_name,
                             RbVmomi::VIM::Folder)
 
-          template_name = box_file
+          template_name = box_name
 
           # FIXME: Raise a correct exception
           datastore = dc.find_datastore(
@@ -91,11 +98,19 @@ module VagrantPlugins
           dc = config.vcenter_cnx.serviceInstance.find_datacenter(
                config.datacenter_name) or fail 'datacenter not found'
 
+          if env[:machine].box.name.to_s.include? '/'
+            box_file = env[:machine].box.name.rpartition('/').last.to_s
+            box_name = env[:machine].box.name.to_s.gsub(/\//, '-')
+          else
+            box_file = env[:machine].box.name.to_s
+            box_name = box_file
+          end
+
           if config.template_folder_name.nil?
-            box_to_search = env[:machine].box.name.to_s
+            box_to_search = box_name
           else
             box_to_search = config.template_folder_name +
-                            '/' + env[:machine].box.name.to_s
+                            '/' + box_name
           end
 
           @logger.debug("This is the box we're looking for: #{box_to_search}")
@@ -103,16 +118,16 @@ module VagrantPlugins
           config.template_id = dc.find_vm(box_to_search)
 
           if config.template_id.nil?
-            env[:ui].warn("Template [#{env[:machine].box.name.to_s}] " +
+            env[:ui].warn("Template [#{box_name}] " +
                           'does not exist!')
 
             user_input = env[:ui].ask(
-              "Would you like to upload the [#{env[:machine].box.name.to_s}]" +
+              "Would you like to upload the [#{box_name}]" +
               " box?\nChoice (yes/no): "
             )
 
             if user_input.downcase == 'yes' || user_input.downcase == 'y'
-              env[:ui].info("Uploading [#{env[:machine].box.name.to_s}]...")
+              env[:ui].info("Uploading [#{box_name}]...")
               vcenter_upload_box(env)
             else
               env[:ui].error('Template not uploaded, exiting...')

data/lib/vagrant-vcenter/cap/public_address.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module VCenter
+    module Cap
+      module PublicAddress
+        def self.public_address(machine)
+          # Initial try for vagrant share feature.
+          # It seems ssh_info[:port] is given automatically.
+          # I think this feature was built planning that the port forwarding
+          # and networking was done on the vagrant machine, which isn't the
+          # case in vagrant-vcloud
+
+          ssh_info = machine.ssh_info
+          ssh_info[:host]
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vcenter/plugin.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
   module VCenter
     # Initialize Vagrant Plugin
     class Plugin < Vagrant.plugin('2')
-      name 'vCenter'
+      name 'VMware vCenter Provider'
       description 'Allows Vagrant to manage machines with VMware vCenter (R)'
 
       config(:vcenter, :provider) do
@@ -29,6 +29,12 @@ module VagrantPlugins
         Provider
       end
 
+      # Add vagrant share support
+      provider_capability('vcenter', 'public_address') do
+        require_relative 'cap/public_address'
+        Cap::PublicAddress
+      end
+
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml',
                                            VCenter.source_root)

data/lib/vagrant-vcenter/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Set version for vagrant-vcenter gem.
   module VCenter
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcenter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Fabio Rapposelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-rbvmomi
@@ -159,6 +159,7 @@ files:
 - lib/vagrant-vcenter/action/resume.rb
 - lib/vagrant-vcenter/action/suspend.rb
 - lib/vagrant-vcenter/action/sync_folders.rb
+- lib/vagrant-vcenter/cap/public_address.rb
 - lib/vagrant-vcenter/config.rb
 - lib/vagrant-vcenter/errors.rb
 - lib/vagrant-vcenter/plugin.rb