Add support for vagrant cloud, Fixes #1

Author: frapposelli

lib/vagrant-vcenter/action/build_vm.rb

@@ -22,11 +22,19 @@ def call(env)
           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

lib/vagrant-vcenter/action/connect_vcenter.rb

@@ -20,7 +20,7 @@ def call(env)
 
             @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(

lib/vagrant-vcenter/action/inventory_check.rb

@@ -26,7 +26,14 @@ def vcenter_upload_box(env)
           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 @@ def vcenter_upload_box(env)
 
           @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 @@ def vcenter_upload_box(env)
                             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,28 +98,36 @@ def vcenter_check_inventory(env)
           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}")
 
           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...')