vmc 0.3.13.beta.4 → 0.3.13.beta.5

data/lib/cli/commands/apps.rb

@@ -219,7 +219,7 @@ module VMC::Cli::Command
       app_services = app[:services]
       services_apps_hash = provisioned_services_apps_hash
       app_services.each { |service|
-        del_service = force && no_prompt ? 'Y' : 'N'
+        del_service = force && no_prompt
         unless no_prompt || force
           del_service = ask(
             "Provisioned service [#{service}] detected, would you like to delete it?",
@@ -629,18 +629,23 @@ module VMC::Cli::Command
 
         end
 
+        # If no resource needs to be sent, add an empty file to ensure we have
+        # a multi-part request that is expected by nginx fronting the CC.
+        if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+          Dir.chdir(explode_dir) do
+            File.new(".__empty__", "w")
+          end
+        end
         # Perform Packing of the upload bits here.
-        unless VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
-          display '  Packing application: ', false
-          VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
-          display 'OK'.green
+        display '  Packing application: ', false
+        VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
+        display 'OK'.green
 
-          upload_size = File.size(upload_file);
-          if upload_size > 1024*1024
-            upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
-          elsif upload_size > 0
-            upload_size  = (upload_size/1024.0).round.to_s + 'K'
-          end
+        upload_size = File.size(upload_file);
+        if upload_size > 1024*1024
+          upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
+        elsif upload_size > 0
+          upload_size  = (upload_size/1024.0).round.to_s + 'K'
         else
           upload_size = '0K'
         end
@@ -648,11 +653,9 @@ module VMC::Cli::Command
         upload_str = "  Uploading (#{upload_size}): "
         display upload_str, false
 
-        unless VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
-          FileWithPercentOutput.display_str = upload_str
-          FileWithPercentOutput.upload_size = File.size(upload_file);
-          file = FileWithPercentOutput.open(upload_file, 'rb')
-        end
+        FileWithPercentOutput.display_str = upload_str
+        FileWithPercentOutput.upload_size = File.size(upload_file);
+        file = FileWithPercentOutput.open(upload_file, 'rb')
 
         client.upload_app(appname, file, appcloud_resources)
         display 'OK'.green if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.13.beta.4'
+    VERSION = '0.3.13.beta.5'
   end
 end

data/lib/vmc/client.rb

@@ -369,7 +369,7 @@ class VMC::Client
 
     req = {
       :method => method, :url => "#{@target}#{path}",
-      :payload => payload, :headers => headers
+      :payload => payload, :headers => headers, :multipart => true
     }
     status, body, response_headers = perform_http_request(req)
 

metadata

@@ -2,7 +2,7 @@
 name: vmc
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.3.13.beta.4
+  version: 0.3.13.beta.5
 platform: ruby
 authors: 
 - VMware
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 -07:00
+date: 2011-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency